From b02beccf4567068cb47a3f1181a00039456c872d Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期三, 06 八月 2025 15:37:20 +0800
Subject: [PATCH] 用户修改姓名和电话同步修改uaid

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java |   43 ++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java
index 59edb03..d2a566d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java
@@ -8,9 +8,13 @@
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.domain.MemoBook;
 import com.ruoyi.domain.ZProperty;
 import com.ruoyi.domain.ZfEconomy;
+import com.ruoyi.service.MemoBookService;
+import com.ruoyi.service.ZPropertyDownloadService;
 import com.ruoyi.service.ZPropertyService;
+import com.ruoyi.service.ZPropertyShareService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -39,6 +43,15 @@
     @Autowired
     private ZPropertyService zPropertyService;
 
+    @Autowired
+    private ZPropertyDownloadService zPropertyDownloadService;
+
+    @Autowired
+    private ZPropertyShareService zPropertyShareService;
+
+    @Autowired
+    private MemoBookService memoBookService;
+
     /**
      * 鏌ヨ鎵�鏈夎褰�
      */
@@ -47,6 +60,11 @@
         Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
         Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
         return zPropertyService.selectDataList(zProperty,pageNum,pageSize);
+    }
+
+    @GetMapping("/type")
+    public AjaxResult listType(){
+        return zPropertyService.listType();
     }
 
     /**
@@ -60,7 +78,7 @@
     /**
      * 妯℃澘
      */
-    @GetMapping("/model")
+    @PostMapping("/model")
     public void getModel(HttpServletResponse response){
         ZProperty zProperty = new ZProperty();
         List<ZProperty> emptyList = Collections.singletonList(zProperty);
@@ -73,8 +91,18 @@
      */
 //    @PreAuthorize("@ss.hasPermi('system:property:export')")
     @Log(title = "涓汉璐骇璁板綍", businessType = BusinessType.EXPORT)
-    @PostMapping("/export/{ids}")
-    public void export(HttpServletResponse response,@PathVariable Long[] ids)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response)
+    {
+        List<ZProperty> list = zPropertyService.selectByCondition();
+        log.info("瀵煎嚭璁板綍涓�:{}",list);
+        ExcelUtil<ZProperty> util = new ExcelUtil<>(ZProperty.class);
+        util.exportExcel(response, list, "涓汉璐骇璁板綍鏁版嵁");
+    }
+
+    @Log(title = "涓汉璐骇璁板綍", businessType = BusinessType.EXPORT)
+    @PostMapping("/export1/{ids}")
+    public void export1(HttpServletResponse response,@PathVariable Long[] ids)
     {
         List<ZProperty> list = zPropertyService.selectByIds(ids);
         log.info("瀵煎嚭璁板綍涓�:{}",list);
@@ -122,6 +150,15 @@
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
+        for (Long id: ids) {
+            List<MemoBook> memoBookService1 =  memoBookService.selectByIdAFid(id,2026L);
+            if (memoBookService1.size() != 0 && !memoBookService.removeByIds(memoBookService1))
+                return AjaxResult.error();
+        }
+
+        if (! (zPropertyDownloadService.deleteData(ids) && zPropertyShareService.deleteByContentId(ids)  ) ){
+            return AjaxResult.error();
+        }
         return toAjax(zPropertyService.removeByIds(Arrays.asList(ids)));
     }
 

--
Gitblit v1.9.1