From 6a0bbcc258fbc887afdb96922ae24843ca6ca27a Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Tue, 9 Sep 2025 18:05:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=9B=B4=E6=96=B0=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TResourceOperationController.java         | 14 ++------------
 .../impl/TResourceOperationServiceImpl.java   | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceOperationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceOperationController.java
index 18a8556..6db9ddd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceOperationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceOperationController.java
@@ -187,12 +187,7 @@ public class TResourceOperationController extends BaseController
         if(dept.getOrgCode().length() < 12){
             return error("非村、组级行政区划，不允许添加地块！");
         }
-        TResourceLand tResourceLand = tResourceLandService.selectTResourceLandByDkbm(tResourceOperation.getDkbm());
-        if(tResourceLand != null){
-            tResourceLand.setDkbm(tResourceOperation.getDkbm());
-            tResourceLand.setSurveyStatus(tResourceOperation.getSurveyStatus());
-            tResourceLandService.updateTResourceLand(tResourceLand);
-        }
+
         tResourceOperation.setImportCode(dept.getImportCode());
         return toAjax(tResourceOperationService.insertTResourceOperation(tResourceOperation));
     }
@@ -205,12 +200,7 @@ public class TResourceOperationController extends BaseController
     @PostMapping("/update")
     public AjaxResult edit(@RequestBody TResourceOperation tResourceOperation)
     {
-        TResourceLand tResourceLand = tResourceLandService.selectTResourceLandByDkbm(tResourceOperation.getDkbm());
-        if(tResourceLand != null){
-            tResourceLand.setDkbm(tResourceOperation.getDkbm());
-            tResourceLand.setSurveyStatus(tResourceOperation.getSurveyStatus());
-            tResourceLandService.updateTResourceLand(tResourceLand);
-        }
+
         return toAjax(tResourceOperationService.updateTResourceOperation(tResourceOperation));
     }
 
diff --git a/ruoyi-business/src/main/java/com/ruoyi/resource/service/impl/TResourceOperationServiceImpl.java b/ruoyi-business/src/main/java/com/ruoyi/resource/service/impl/TResourceOperationServiceImpl.java
index 840d45d..1d7d91c 100644
--- a/ruoyi-business/src/main/java/com/ruoyi/resource/service/impl/TResourceOperationServiceImpl.java
+++ b/ruoyi-business/src/main/java/com/ruoyi/resource/service/impl/TResourceOperationServiceImpl.java
@@ -3,7 +3,9 @@ package com.ruoyi.resource.service.impl;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.resource.domain.TResourceLand;
 import com.ruoyi.resource.domain.TResourceOperation;
+import com.ruoyi.resource.mapper.TResourceLandMapper;
 import com.ruoyi.resource.mapper.TResourceOperationMapper;
 import com.ruoyi.resource.service.ITResourceOperationService;
 import org.apache.commons.collections4.ListUtils;
@@ -28,6 +30,9 @@ public class TResourceOperationServiceImpl implements ITResourceOperationService
     @Autowired
     private TResourceOperationMapper tResourceOperationMapper;
 
+    @Autowired
+    private TResourceLandMapper tResourceLandMapper;
+
     /**
      * 查询地块经营
      *
@@ -139,8 +144,15 @@ public class TResourceOperationServiceImpl implements ITResourceOperationService
      * @return 结果
      */
     @Override
+    @Transactional
     public int insertTResourceOperation(TResourceOperation tResourceOperation)
     {
+        TResourceLand tResourceLand = tResourceLandMapper.selectTResourceLandByDkbm(tResourceOperation.getDkbm());
+        if(tResourceLand != null){
+            tResourceLand.setSurveyStatus(tResourceOperation.getSurveyStatus());
+            tResourceLandMapper.updateTResourceLand(tResourceLand);
+        }
+
         tResourceOperation.setCreateTime(DateUtils.getNowDate());
         return tResourceOperationMapper.insertTResourceOperation(tResourceOperation);
     }
@@ -168,8 +180,15 @@ public class TResourceOperationServiceImpl implements ITResourceOperationService
      * @return 结果
      */
     @Override
+    @Transactional
     public int updateTResourceOperation(TResourceOperation tResourceOperation)
     {
+        TResourceLand tResourceLand = tResourceLandMapper.selectTResourceLandByDkbm(tResourceOperation.getDkbm());
+        if(tResourceLand != null){
+            tResourceLand.setSurveyStatus(tResourceOperation.getSurveyStatus());
+            tResourceLandMapper.updateTResourceLand(tResourceLand);
+        }
+        
         tResourceOperation.setUpdateTime(DateUtils.getNowDate());
         return tResourceOperationMapper.updateTResourceOperation(tResourceOperation);
     }