Переглянути джерело

修复农事任务添加租户标识填充错误的bug

liuyaowen 11 місяців тому
батько
коміт
4d376ba58b

+ 4 - 7
src/main/java/com/yunfeiyun/agmp/fms/service/impl/FmsTaskServiceImpl.java

@@ -211,14 +211,12 @@ public class FmsTaskServiceImpl implements IFmsTaskService
      */
     @Override
     public int insertFmsTask(FmsTask fmsTask) {
-        fmsTask.setTid(fmsTask.getLandId());
         return fmsTaskMapper.insertFmsTask(fmsTask);
     }
 
     @Transactional
     @Override
     public int insertFmsTask(FmsTask fmsTask, FmsTaskpick fmsTaskpick, FmsWarn fmsWarn) {
-        fmsTask.setTid(fmsTask.getLandId());
         int i = insertFmsTask(fmsTask);
         if (fmsTaskpick != null) {
             fmsTaskpickService.insertFmsTaskpick(fmsTaskpick);
@@ -235,24 +233,23 @@ public class FmsTaskServiceImpl implements IFmsTaskService
     public int insertFmsTask(List<String> resIdsStr, FmsTask fmsTask, FmsTaskrcd fmsTaskrcd,
                              FmsTaskpick fmsTaskpick,  FmsWarn fmsWarn,
                              List<FmsTaskasset> fmsTaskassets, List<FmsTaskmachine> fmsTaskmachines) {
-        fmsTask.setTid(fmsTask.getLandId());
         int i = insertFmsTask(fmsTask);
         if (fmsTaskpick != null) {
             fmsTaskpickService.insertFmsTaskpick(fmsTaskpick);
         }
         if (fmsWarn != null) {
-            fmsWarn.setTid(fmsTask.getLandId());
+            fmsWarn.setTid(fmsTask.getTid());
             fmsWarnService.insertFmsWarn(fmsWarn);
         }
         /* 增加农事提交记录,关联农资农具*/
         if (fmsTaskrcd != null) {
-            fmsTaskrcd.setTid(fmsTask.getLandId());
+            fmsTaskrcd.setTid(fmsTask.getTid());
             fmsTaskrcdService.insertFmsTaskrcd(fmsTaskrcd);
             if (fmsTaskassets != null && !fmsTaskassets.isEmpty()) {
                 fmsTaskassets.forEach(v -> {
                     v.setTaskrcdId(fmsTaskrcd.getTaskrcdId());
                     v.setTaskassetId(v.getId());
-                    v.setTid(fmsTask.getLandId());
+                    v.setTid(fmsTask.getTid());
                 });
 
                 fmsTaskassetMapper.insertFmsTaskassetBatch(fmsTaskassets);
@@ -261,7 +258,7 @@ public class FmsTaskServiceImpl implements IFmsTaskService
                 fmsTaskmachines.forEach(v -> {
                     v.setTaskrcdId(fmsTaskrcd.getTaskrcdId());
                     v.setTaskmachId(v.getId());
-                    v.setTid(fmsTask.getLandId());
+                    v.setTid(fmsTask.getTid());
                 });
                 fmsTaskmachineMapper.insertFmsTaskmachineBatch(fmsTaskmachines);
             }