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

src/main/java/com/yunfeiyun/agmp/fms/controller/FmsTaskController.java

@@ -281,7 +281,7 @@ public class FmsTaskController extends BaseController
 
         FmsTask fmsTask = new FmsTask();
         BeanUtils.copyProperties(reqVo, fmsTask);
-        fmsTask.setTid(fmsTask.getLandId());
+        fmsTask.setTid(SecurityUtils.getTid());
         fmsTask.setTaskId(fmsTask.getId());
         fmsTask.setTaskCreator(loginUser.getUserId());
         fmsTask.setTaskAuditor(loginUser.getUserId());

src/main/java/com/yunfeiyun/agmp/fms/mapper/FmsTaskMapper.java

@@ -1,15 +1,14 @@
 package com.yunfeiyun.agmp.fms.mapper;
 
-import java.util.List;
-import java.util.Map;
-
 import com.yunfeiyun.agmp.fms.domain.FmsTask;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsTaskListReqVo;
 import com.yunfeiyun.agmp.fms.domain.reqvo.SelectOfTssStatReqVo;
 import com.yunfeiyun.agmp.fms.domain.resvo.*;
 import com.yunfeiyun.agmp.fms.domain.vo.FmsTaskExcelVo;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.security.core.parameters.P;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 农事任务Mapper接口
@@ -42,7 +41,8 @@ public interface FmsTaskMapper
      * @param taskId 农事任务主键
      * @return 农事任务
      */
-    public FmsTaskResVo getInfoByTaskId(@Param("taskId") String taskId, @Param("tid") String tid);
+    public FmsTaskResVo selectInfoByTaskId(@Param("taskId") String taskId, @Param("tid") String tid);
+
     /**
      * 查询农事任务详情(种植规划档案查询)
      *
@@ -117,7 +117,7 @@ public interface FmsTaskMapper
     public List<FmsTaskMessageResVo> selectTaskListOfTaskStatus(@Param("landId") String landId,@Param("taskManager")String taskManager, @Param("tid") String tid);
     
     /** 溯源统计页面使用：成本占比（农资，农机，人工费用） */
-    public Map<String,Object> selectSumTaskrcdMoney(SelectOfTssStatReqVo reqVo);
+    public Map<String,Object>  selectSumTaskrcdMoney(SelectOfTssStatReqVo reqVo);
     public List<Map<String,Object>> selectSumTaskrcdMoneyByLandId(SelectOfTssStatReqVo reqVo);
     public List<Map<String,Object>> selectSumTaskrcdMoneyByBlockId(SelectOfTssStatReqVo reqVo);
 

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

@@ -1,22 +1,16 @@
 package com.yunfeiyun.agmp.fms.service;
 
-import java.util.List;
-import java.util.Map;
-
-import com.yunfeiyun.agmp.fms.domain.FmsTask;
-import com.yunfeiyun.agmp.fms.domain.FmsTaskasset;
-import com.yunfeiyun.agmp.fms.domain.FmsTaskmachine;
-import com.yunfeiyun.agmp.fms.domain.FmsTaskpick;
-import com.yunfeiyun.agmp.fms.domain.FmsTaskrcd;
-import com.yunfeiyun.agmp.fms.domain.FmsWarn;
+import com.yunfeiyun.agmp.fms.domain.*;
 import com.yunfeiyun.agmp.fms.domain.reqvo.AddFmsTaskRecordReqVo;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsTaskListReqVo;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsTaskStopReqVo;
 import com.yunfeiyun.agmp.fms.domain.reqvo.SelectOfTssStatReqVo;
 import com.yunfeiyun.agmp.fms.domain.resvo.*;
 import com.yunfeiyun.agmp.fms.domain.vo.FmsTaskExcelVo;
+import org.apache.ibatis.annotations.Param;
 
-import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 农事任务Service接口
@@ -151,4 +145,12 @@ public interface IFmsTaskService
     List<FmsTaskExcelVo> selectFmsTaskExcelVoList(FmsTaskListReqVo reqVo);
 
     void updateFmsTaskRecord(AddFmsTaskRecordReqVo reqVo);
+
+    /**
+     * 查询农事任务详情
+     *
+     * @param taskId 农事任务主键
+     * @return 农事任务
+     */
+    public FmsTaskResVo selectInfoByTaskId(@Param("taskId") String taskId, @Param("tid") String tid);
 }

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

@@ -123,7 +123,7 @@ public class FmsTaskServiceImpl implements IFmsTaskService
 
     @Override
     public FmsTaskResVo getInfoByTaskId(String taskId, String tid) {
-        FmsTaskResVo fmsTaskResVo = fmsTaskMapper.getInfoByTaskId(taskId,tid);
+        FmsTaskResVo fmsTaskResVo = selectInfoByTaskId(taskId,tid);
         SysUser sysUser = sysUserMapper.selectBaseUserById(fmsTaskResVo.getTaskManager());
         if(null != sysUser){
             fmsTaskResVo.setTaskManagername(sysUser.getUserName());
@@ -219,7 +219,7 @@ public class FmsTaskServiceImpl implements IFmsTaskService
     @Override
     public int insertFmsTask(FmsTask fmsTask, FmsTaskpick fmsTaskpick, FmsWarn fmsWarn) {
         fmsTask.setTid(fmsTask.getLandId());
-        int i = fmsTaskMapper.insertFmsTask(fmsTask);
+        int i = insertFmsTask(fmsTask);
         if (fmsTaskpick != null) {
             fmsTaskpickService.insertFmsTaskpick(fmsTaskpick);
         }
@@ -236,7 +236,7 @@ public class FmsTaskServiceImpl implements IFmsTaskService
                              FmsTaskpick fmsTaskpick,  FmsWarn fmsWarn,
                              List<FmsTaskasset> fmsTaskassets, List<FmsTaskmachine> fmsTaskmachines) {
         fmsTask.setTid(fmsTask.getLandId());
-        int i = fmsTaskMapper.insertFmsTask(fmsTask);
+        int i = insertFmsTask(fmsTask);
         if (fmsTaskpick != null) {
             fmsTaskpickService.insertFmsTaskpick(fmsTaskpick);
         }
@@ -289,8 +289,7 @@ public class FmsTaskServiceImpl implements IFmsTaskService
     @Transactional
     @Override
     public int insertFmsTaskPick(FmsTask fmsTask, FmsTaskpick fmsTaskpick) {
-        fmsTask.setTid(fmsTask.getLandId());
-        int i = fmsTaskMapper.insertFmsTask(fmsTask);
+        int i = insertFmsTask(fmsTask);
         fmsTaskpickService.insertFmsTaskpick(fmsTaskpick);
         return i;
     }
@@ -299,9 +298,7 @@ public class FmsTaskServiceImpl implements IFmsTaskService
     @Transactional
     @Override
     public int insertFmsTaskWarn(FmsTask fmsTask, FmsWarn fmsWarn) {
-        fmsTask.setTid(fmsTask.getLandId());
-        fmsWarn.setTid(fmsTask.getLandId());
-        int i = fmsTaskMapper.insertFmsTask(fmsTask);
+        int i = insertFmsTask(fmsTask);
         fmsWarnService.insertFmsWarn(fmsWarn);
         return i;
     }
@@ -314,6 +311,7 @@ public class FmsTaskServiceImpl implements IFmsTaskService
      */
     @Override
     public int updateFmsTask(FmsTask fmsTask) {
+        fmsTask.setTid(SecurityUtils.getTid());
         return fmsTaskMapper.updateFmsTask(fmsTask);
     }
 
@@ -359,13 +357,13 @@ public class FmsTaskServiceImpl implements IFmsTaskService
 
     @Override
     public int stop(FmsTaskStopReqVo fmsTaskStopReqVo) {
-        FmsTask fmsTask = fmsTaskMapper.selectFmsTaskByTaskId(fmsTaskStopReqVo.getTaskId(),SecurityUtils.getTid());
+        FmsTask fmsTask = selectFmsTaskByTaskId(fmsTaskStopReqVo.getTaskId(),SecurityUtils.getTid());
         if(ObjectUtils.isEmpty(fmsTask)){
             throw new BizException(ErrorCode.FMS_TASK_TASK_NO_EXIST);
         }
         fmsTask.setTaskCompletereason(fmsTaskStopReqVo.getTaskCompletereason());
         fmsTask.setTaskStatus(TaskStatus.STOP.getCode());
-        return fmsTaskMapper.updateFmsTask(fmsTask);
+        return updateFmsTask(fmsTask);
     }
     @Override
     public void appendTaskMessage(Map<String, FmsMessageResVo> fmsMessageResVoMap) {
@@ -408,36 +406,43 @@ public class FmsTaskServiceImpl implements IFmsTaskService
     
     @Override
     public Map<String,Object> selectSumTaskrcdMoney(SelectOfTssStatReqVo reqVo) {
+        reqVo.setTid(SecurityUtils.getTid());
     	return fmsTaskMapper.selectSumTaskrcdMoney(reqVo);
     }
 
     @Override
     public List<Map<String,Object>> selectSumTaskrcdMoneyByLandId(SelectOfTssStatReqVo reqVo) {
+        reqVo.setTid(SecurityUtils.getTid());
         return fmsTaskMapper.selectSumTaskrcdMoneyByLandId(reqVo);
     }
 
     @Override
     public List<Map<String,Object>> selectSumTaskrcdMoneyByBlockId(SelectOfTssStatReqVo reqVo) {
+        reqVo.setTid(SecurityUtils.getTid());
         return fmsTaskMapper.selectSumTaskrcdMoneyByBlockId(reqVo);
     }
 
     @Override
     public List<SpmPayOfTssStatResVo> selectPayByNz(SelectOfTssStatReqVo reqVo) {
+        reqVo.setTid(SecurityUtils.getTid());
     	return fmsTaskMapper.selectPayByNz(reqVo);
     }
     
     @Override
     public List<SpmPayOfTssStatResVo> selectPayByNj(SelectOfTssStatReqVo reqVo) {
+        reqVo.setTid(SecurityUtils.getTid());
     	return fmsTaskMapper.selectPayByNj(reqVo);
     }
     
     @Override
     public List<SpmPayOfTssStatResVo> selectPayByRg(SelectOfTssStatReqVo reqVo) {
+        reqVo.setTid(SecurityUtils.getTid());
     	return fmsTaskMapper.selectPayByRg(reqVo);
     }
     
     @Override
     public Map<String, Map<String, Object>> selectPayMonthByNz(SelectOfTssStatReqVo reqVo) {
+        reqVo.setTid(SecurityUtils.getTid());
     	List<Map<String, Object>> gooodsCsList = fmsTaskMapper.selectPayMonthByNz(reqVo);
 		Map<String, Map<String, Object>> gooodsCsMap = null;
 		if (gooodsCsList != null) {
@@ -451,6 +456,7 @@ public class FmsTaskServiceImpl implements IFmsTaskService
 
     @Override
     public List<FmsTaskExcelVo> selectFmsTaskExcelVoList(FmsTaskListReqVo reqVo) {
+        reqVo.setTid(SecurityUtils.getTid());
         return fmsTaskMapper.selectFmsTaskExcelVoList(reqVo);
     }
 
@@ -515,8 +521,21 @@ public class FmsTaskServiceImpl implements IFmsTaskService
         resManager.updateRes(reqVo.getResIds(),fmsTaskrcd.getTaskrcdId());
     }
 
+    /**
+     * 查询农事任务详情
+     *
+     * @param taskId 农事任务主键
+     * @param tid
+     * @return 农事任务
+     */
+    @Override
+    public FmsTaskResVo selectInfoByTaskId(String taskId, String tid) {
+        return fmsTaskMapper.selectInfoByTaskId(taskId,tid);
+    }
+
     @Override
     public Map<String, Map<String, Object>> selectPayMonthByRg(SelectOfTssStatReqVo reqVo) {
+        reqVo.setTid(SecurityUtils.getTid());
     	List<Map<String, Object>> gooodsCsList = fmsTaskMapper.selectPayMonthByRg(reqVo);
 		Map<String, Map<String, Object>> gooodsCsMap = null;
 		if (gooodsCsList != null) {
@@ -530,6 +549,7 @@ public class FmsTaskServiceImpl implements IFmsTaskService
     
     @Override
     public Map<String, Map<String, Object>> selectPayMonthByNj(SelectOfTssStatReqVo reqVo) {
+        reqVo.setTid(SecurityUtils.getTid());
     	List<Map<String, Object>> gooodsCsList = fmsTaskMapper.selectPayMonthByNj(reqVo);
 		Map<String, Map<String, Object>> gooodsCsMap = null;
 		if (gooodsCsList != null) {

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

@@ -19,15 +19,16 @@ import com.yunfeiyun.agmp.common.web.system.domain.reqVo.PtsMessageListReqVo;
 import com.yunfeiyun.agmp.common.web.system.mapper.SysResMapper;
 import com.yunfeiyun.agmp.common.web.system.mapper.SysUserMapper;
 import com.yunfeiyun.agmp.fms.domain.*;
-import com.yunfeiyun.agmp.fms.domain.resvo.*;
-import com.yunfeiyun.agmp.fms.mapper.*;
 import com.yunfeiyun.agmp.fms.domain.dto.FmsTaskrcdByTaskrcdIdDto;
 import com.yunfeiyun.agmp.fms.domain.dto.FmsTaskrcdListDto;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsTaskrcdAuditReqVo;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsTaskrcdListReqVo;
+import com.yunfeiyun.agmp.fms.domain.resvo.*;
 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.mapper.*;
+import com.yunfeiyun.agmp.fms.service.IFmsTaskService;
 import com.yunfeiyun.agmp.fms.service.IFmsTaskpickService;
 import com.yunfeiyun.agmp.fms.service.IFmsTaskrcdService;
 import org.springframework.beans.BeanUtils;
@@ -35,6 +36,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
+
 import javax.annotation.Resource;
 import java.util.*;
 
@@ -75,6 +77,9 @@ public class FmsTaskrcdServiceImpl implements IFmsTaskrcdService
     @Autowired
     private IFmsTaskpickService fmsTaskpickService;
 
+    @Autowired
+    private IFmsTaskService fmsTaskService;
+
     /**
      * 根据农事任务记录id查询农事记录信息
      *
@@ -221,7 +226,7 @@ public class FmsTaskrcdServiceImpl implements IFmsTaskrcdService
      */
     @Override
     public FmsTaskrcdInfoResVo getFmsTaskrcdByTaskId(String taskId, String tid) {
-        FmsTaskResVo fmsTaskResVo = this.fmsTaskMapper.getInfoByTaskId(taskId,tid);
+        FmsTaskResVo fmsTaskResVo = fmsTaskService.selectInfoByTaskId(taskId,tid);
         if (ObjectUtils.isEmpty(fmsTaskResVo)){
             //  农事任务不存在
             throw new BizException(ErrorCode.FMS_TASK_TASK_NO_EXIST);
@@ -267,7 +272,7 @@ public class FmsTaskrcdServiceImpl implements IFmsTaskrcdService
     @Transactional(rollbackFor = Exception.class)
     public int insertFmsTaskrcd(FmsTaskrcdVo fmsTaskrcdVo) {
         String taskId = fmsTaskrcdVo.getTaskId();
-        FmsTask fmsTask = this.fmsTaskMapper.selectFmsTaskByTaskId(taskId,SecurityUtils.getTid());
+        FmsTask fmsTask = fmsTaskService.selectFmsTaskByTaskId(taskId,SecurityUtils.getTid());
         if (ObjectUtils.isEmpty(fmsTask)){
             //  农事任务不存在
             throw new BizException(ErrorCode.FMS_TASK_TASK_NO_EXIST);
@@ -343,7 +348,7 @@ public class FmsTaskrcdServiceImpl implements IFmsTaskrcdService
         FmsTask newFmsTask = new FmsTask();
         newFmsTask.setTaskId(fmsTask.getTaskId());
         newFmsTask.setTaskStatus(TaskStatus.UNAUDITED.getCode());
-        int resultCode = this.fmsTaskMapper.updateFmsTask(newFmsTask);
+        int resultCode = fmsTaskService.updateFmsTask(newFmsTask);
         if(resultCode != 0){
             FmsBlock fmsBlock = fmsBlockMapper.selectFmsBlockByBlockId(fmsTask.getBlockId(),SecurityUtils.getTid());
             FmsLand fmsLand = fmsLandMapper.selectFmsLandByLandId(fmsTask.getLandId(),SecurityUtils.getTid());
@@ -443,7 +448,7 @@ public class FmsTaskrcdServiceImpl implements IFmsTaskrcdService
             // 农事任务提交记录重复审核
             throw new BizException(ErrorCode.FMS_TASK_RCD_REPEATED_AUDIT);
         }
-        FmsTask fmsTask = fmsTaskMapper.selectFmsTaskByTaskId(fmsTaskrcd.getTaskId(),SecurityUtils.getTid());
+        FmsTask fmsTask = fmsTaskService.selectFmsTaskByTaskId(fmsTaskrcd.getTaskId(),SecurityUtils.getTid());
         if(ObjectUtils.isEmpty(fmsTask)){
             // 农事任务不存在
             throw new BizException(ErrorCode.FMS_TASK_TASK_NO_EXIST);
@@ -470,8 +475,7 @@ public class FmsTaskrcdServiceImpl implements IFmsTaskrcdService
             //采收任务
             pickTaskAudit(fmsTaskrcd);
         }
-        fmsTaskMapper.updateFmsTask(fmsTask);
-        int i = fmsTaskMapper.updateFmsTask(fmsTask);
+        int i = fmsTaskService.updateFmsTask(fmsTask);
         /* 消息通知 */
         if (i > 0 ) {
             String title = "";