新增 农事任务，农事任务记录管理迁移SAAS平台

src/main/java/com/yunfeiyun/agmp/fms/service/IFmsTaskpickService.java

@@ -102,4 +102,6 @@ public interface IFmsTaskpickService
     public int deleteFmsTaskpickByTaskpickId(String taskpickId, String tid);
 
     List<FmsTaskpickExcelVo> selectFmsTaskpickExcelVoList(FmsTaskPickListReqVo fmsTaskPickListReqVo);
+
+    public FmsTaskpick selectFmsTaskpickByTaskId(String taskId, String tid);
 }

src/main/java/com/yunfeiyun/agmp/fms/service/impl/FmsTaskServiceImpl.java

@@ -24,6 +24,7 @@ import com.yunfeiyun.agmp.fms.domain.resvo.*;
 import com.yunfeiyun.agmp.fms.domain.vo.FmsTaskExcelVo;
 import com.yunfeiyun.agmp.fms.mapper.*;
 import com.yunfeiyun.agmp.fms.service.IFmsTaskService;
+import com.yunfeiyun.agmp.fms.service.IFmsTaskpickService;
 import com.yunfeiyun.agmp.fms.service.IFmsTaskrcdService;
 import com.yunfeiyun.agmp.fms.service.IFmsWarnService;
 import com.yunfeiyun.agmp.fms.util.DataAuthUtil;
@@ -77,6 +78,9 @@ public class FmsTaskServiceImpl implements IFmsTaskService
     @Autowired
     private IFmsTaskrcdService fmsTaskrcdService;
 
+    @Autowired
+    private IFmsTaskpickService fmsTaskpickService;
+
     /**
      * 查询农事任务
      * 
@@ -217,8 +221,7 @@ public class FmsTaskServiceImpl implements IFmsTaskService
         fmsTask.setTid(fmsTask.getLandId());
         int i = fmsTaskMapper.insertFmsTask(fmsTask);
         if (fmsTaskpick != null) {
-            fmsTaskpick.setTid(fmsTask.getLandId());
-            fmsTaskpickMapper.insertFmsTaskpick(fmsTaskpick);
+            fmsTaskpickService.insertFmsTaskpick(fmsTaskpick);
         }
         if (fmsWarn != null) {
             fmsWarn.setTid(fmsTask.getLandId());
@@ -235,8 +238,7 @@ public class FmsTaskServiceImpl implements IFmsTaskService
         fmsTask.setTid(fmsTask.getLandId());
         int i = fmsTaskMapper.insertFmsTask(fmsTask);
         if (fmsTaskpick != null) {
-            fmsTaskpick.setTid(fmsTask.getLandId());
-            fmsTaskpickMapper.insertFmsTaskpick(fmsTaskpick);
+            fmsTaskpickService.insertFmsTaskpick(fmsTaskpick);
         }
         if (fmsWarn != null) {
             fmsWarn.setTid(fmsTask.getLandId());
@@ -289,8 +291,7 @@ public class FmsTaskServiceImpl implements IFmsTaskService
     public int insertFmsTaskPick(FmsTask fmsTask, FmsTaskpick fmsTaskpick) {
         fmsTask.setTid(fmsTask.getLandId());
         int i = fmsTaskMapper.insertFmsTask(fmsTask);
-        fmsTaskpick.setTid(fmsTask.getLandId());
-        fmsTaskpickMapper.insertFmsTaskpick(fmsTaskpick);
+        fmsTaskpickService.insertFmsTaskpick(fmsTaskpick);
         return i;
     }
 
@@ -335,9 +336,9 @@ public class FmsTaskServiceImpl implements IFmsTaskService
      */
     @Override
     public int deleteFmsTaskByTaskId(String taskId, String tid) {
-        FmsTaskpick fmsTaskpick = fmsTaskpickMapper.selectFmsTaskpickByTaskId(taskId,tid);
+        FmsTaskpick fmsTaskpick = fmsTaskpickService.selectFmsTaskpickByTaskId(taskId,tid);
         if(null != fmsTaskpick){
-            fmsTaskpickMapper.deleteFmsTaskpickByTaskpickId(fmsTaskpick.getTaskpickId(),tid);
+            fmsTaskpickService.deleteFmsTaskpickByTaskpickId(fmsTaskpick.getTaskpickId(),tid);
         }
         List<FmsTaskrcdListDto> fmsTaskrcdList = fmsTaskrcdService.selectFmsTaskrcdByTaskId(taskId,tid);
         if(!fmsTaskrcdList.isEmpty()){
@@ -464,14 +465,14 @@ public class FmsTaskServiceImpl implements IFmsTaskService
         this.updateFmsTask(fmsTask);
         if(fmsTask.getTaskType().equals(TaskType.PICK.getCode())){
             // 采收任务
-            FmsTaskpick fmsTaskpick = fmsTaskpickMapper.selectFmsTaskpickByTaskId(fmsTask.getTaskId(),fmsTask.getTid());
+            FmsTaskpick fmsTaskpick = fmsTaskpickService.selectFmsTaskpickByTaskId(fmsTask.getTaskId(),SecurityUtils.getTid());
             if(CommonEnums.PICK_CHANGE_STATUS_YES.getCode().equals(fmsTaskpick.getPickChangestatus())){
                 throw new BizException(ErrorCode.INVALID_PARAMETER.getCode(),"该采收记录已入库");
             }
             BeanUtils.copyProperties(reqVo,fmsTaskpick);
             fmsTaskpick.setPickWeight(reqVo.getTaskrcdWeight());
             fmsTaskpick.setPickDate(fmsTask.getTaskPlanenddate());
-            fmsTaskpickMapper.updateFmsTaskpick(fmsTaskpick);
+            fmsTaskpickService.updateFmsTaskpick(fmsTaskpick);
         }
         FmsTaskrcd fmsTaskrcd = fmsTaskrcdMapper.selectOneByTaskId(fmsTask.getTaskId(),SecurityUtils.getTid());
         if(null == fmsTaskrcd){

src/main/java/com/yunfeiyun/agmp/fms/service/impl/FmsTaskpickServiceImpl.java

@@ -1,17 +1,16 @@
 package com.yunfeiyun.agmp.fms.service.impl;
 
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
-import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.fms.domain.FmsCrop;
 import com.yunfeiyun.agmp.fms.domain.FmsTaskpick;
-import com.yunfeiyun.agmp.fms.domain.vo.FmsTaskpickExcelVo;
-import com.yunfeiyun.agmp.fms.mapper.FmsTaskpickMapper;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsPlanReqVo;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsTaskPickListReqVo;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsTaskPickStockDetailReqVo;
 import com.yunfeiyun.agmp.fms.domain.resvo.FmsTaskPickListResVo;
 import com.yunfeiyun.agmp.fms.domain.resvo.FmsTaskPickStockDetailResVo;
 import com.yunfeiyun.agmp.fms.domain.resvo.FmsTaskPickStockListResVo;
+import com.yunfeiyun.agmp.fms.domain.vo.FmsTaskpickExcelVo;
+import com.yunfeiyun.agmp.fms.mapper.FmsTaskpickMapper;
 import com.yunfeiyun.agmp.fms.service.IFmsTaskpickService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -68,21 +67,29 @@ public class FmsTaskpickServiceImpl implements IFmsTaskpickService
 
     @Override
     public List<FmsTaskPickStockListResVo> selectFmsTaskPickStockListStat(FmsTaskPickListReqVo reqVo) {
+        String tid = SecurityUtils.getTid();
+        reqVo.setTid(tid);
         return fmsTaskpickMapper.selectFmsTaskPickStockListStat(reqVo);
     }
 
     @Override
     public List<FmsTaskPickStockListResVo> selectSumPickWeightListGroupByCropName(FmsPlanReqVo reqVo) {
+        String tid = SecurityUtils.getTid();
+        reqVo.setTid(tid);
         return fmsTaskpickMapper.selectSumPickWeightListGroupByCropName(reqVo);
     }
 
     @Override
     public List<FmsTaskPickStockListResVo> selectSumPickWeightListGroupByLandId(FmsPlanReqVo reqVo) {
+        String tid = SecurityUtils.getTid();
+        reqVo.setTid(tid);
         return fmsTaskpickMapper.selectSumPickWeightListGroupByLandId(reqVo);
     }
 
     @Override
     public List<FmsTaskPickStockListResVo> selectSumPickWeightListGroupByBlockId(FmsPlanReqVo reqVo) {
+        String tid = SecurityUtils.getTid();
+        reqVo.setTid(tid);
         return fmsTaskpickMapper.selectSumPickWeightListGroupByBlockId(reqVo);
     }
 
@@ -110,9 +117,7 @@ public class FmsTaskpickServiceImpl implements IFmsTaskpickService
      */
     @Override
     public int insertFmsTaskpick(FmsTaskpick fmsTaskpick) {
-        if(StringUtils.isEmpty(fmsTaskpick.getTid())){
-            fmsTaskpick.setTid(SecurityUtils.getTid());
-        }
+        fmsTaskpick.setTid(SecurityUtils.getTid());
         return fmsTaskpickMapper.insertFmsTaskpick(fmsTaskpick);
     }
 
@@ -124,6 +129,7 @@ public class FmsTaskpickServiceImpl implements IFmsTaskpickService
      */
     @Override
     public int updateFmsTaskpick(FmsTaskpick fmsTaskpick) {
+        fmsTaskpick.setTid(SecurityUtils.getTid());
         return fmsTaskpickMapper.updateFmsTaskpick(fmsTaskpick);
     }
 
@@ -151,6 +157,13 @@ public class FmsTaskpickServiceImpl implements IFmsTaskpickService
 
     @Override
     public List<FmsTaskpickExcelVo> selectFmsTaskpickExcelVoList(FmsTaskPickListReqVo fmsTaskPickListReqVo) {
+        String tid = SecurityUtils.getTid();
+        fmsTaskPickListReqVo.setTid(tid);
         return fmsTaskpickMapper.selectFmsTaskpickExcelVoList(fmsTaskPickListReqVo);
     }
+
+    @Override
+    public FmsTaskpick selectFmsTaskpickByTaskId(String taskId, String tid) {
+        return fmsTaskpickMapper.selectFmsTaskpickByTaskId(taskId,tid);
+    }
 }

src/main/java/com/yunfeiyun/agmp/fms/service/impl/FmsTaskrcdServiceImpl.java

@@ -28,6 +28,7 @@ import com.yunfeiyun.agmp.fms.domain.reqvo.FmsTaskrcdListReqVo;
 import com.yunfeiyun.agmp.fms.domain.vo.FmsTaskassetVo;
 import com.yunfeiyun.agmp.fms.domain.vo.FmsTaskmachineVo;
 import com.yunfeiyun.agmp.fms.domain.vo.FmsTaskrcdVo;
+import com.yunfeiyun.agmp.fms.service.IFmsTaskpickService;
 import com.yunfeiyun.agmp.fms.service.IFmsTaskrcdService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,6 +72,9 @@ public class FmsTaskrcdServiceImpl implements IFmsTaskrcdService
     @Resource
     private SysUserMapper sysUserMapper;
 
+    @Autowired
+    private IFmsTaskpickService fmsTaskpickService;
+
     /**
      * 根据农事任务记录id查询农事记录信息
      *
@@ -600,7 +604,7 @@ public class FmsTaskrcdServiceImpl implements IFmsTaskrcdService
     }
 
     private void pickTaskAudit(FmsTaskrcd fmsTaskrcd) {
-        FmsTaskpick fmsTaskpick = fmsTaskpickMapper.selectFmsTaskpickByTaskId(fmsTaskrcd.getTaskId(),SecurityUtils.getTid());
+        FmsTaskpick fmsTaskpick = fmsTaskpickService.selectFmsTaskpickByTaskId(fmsTaskrcd.getTaskId(),SecurityUtils.getTid());
         if (ObjectUtils.isEmpty(fmsTaskpick)){
             // 采收任务不存在
             throw new BizException(ErrorCode.FMS_TASK_PICK_TASK_NO_EXIST);
@@ -608,7 +612,7 @@ public class FmsTaskrcdServiceImpl implements IFmsTaskrcdService
         fmsTaskpick.setPickWeight(fmsTaskrcd.getTaskrcdWeight());
         fmsTaskpick.setPickDate(fmsTaskrcd.getTaskrcdCompletedate());
         // 更新采收任务
-        fmsTaskpickMapper.updateFmsTaskpick(fmsTaskpick);
+        fmsTaskpickService.updateFmsTaskpick(fmsTaskpick);
     }