Merge remote-tracking branch 'origin/master'

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

@@ -48,6 +48,14 @@ public interface IFmsTaskassetService
      */
     public List<FmsTaskAssetUsageResVo> selectFmsTaskAssetByRcdId(String taskrcdId, String tid);
 
+    /**
+     * 查询农资使用记录
+     *
+     * @param taskrcdId 记录标识
+     * @return 农资使用记录集合
+     */
+    public List<FmsTaskAssetUsageResVo> selectFmsTaskAssetByRcdId(String[] taskrcdId, String tid);
+
     public List<FmsTaskAssetUsageResVo> selectFmsTaskAssetStat(FmsTaskListReqVo reqVo);
 
     /**

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

@@ -37,6 +37,14 @@ public interface IFmsTaskmachineService
      */
     public List<FmsTaskmachineResVo> selectFmsTaskmachineByRcdId(String taskrcdId, String tid);
 
+    /**
+     * 查询农事任务农具列表
+     *
+     * @param taskrcdId 记录标识
+     * @return 农事任务农具集合
+     */
+    public List<FmsTaskmachineResVo> selectFmsTaskmachineByRcdId(String[] taskrcdIds, String tid);
+
     public List<FmsTaskmachineResVo> selectFmsTaskmachineStat(FmsTaskListReqVo reqVo);
     /**
      * 新增农事任务农具

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

@@ -1,5 +1,7 @@
 package com.yunfeiyun.agmp.fms.service.impl;
 
+import com.yunfeiyun.agmp.common.constant.ErrorCode;
+import com.yunfeiyun.agmp.common.exception.BizException;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.common.web.system.domain.SysRes;
@@ -9,6 +11,7 @@ import com.yunfeiyun.agmp.fms.domain.FmsPeriod;
 import com.yunfeiyun.agmp.fms.mapper.FmsCropMapper;
 import com.yunfeiyun.agmp.fms.mapper.FmsPeriodMapper;
 import com.yunfeiyun.agmp.fms.domain.reqvo.AddPeriodListReqVo;
+import com.yunfeiyun.agmp.fms.service.IFmsCropService;
 import com.yunfeiyun.agmp.fms.service.IFmsPeriodService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -35,6 +38,9 @@ public class FmsPeriodServiceImpl implements IFmsPeriodService
     @Resource
     private FmsCropMapper fmsCropMapper;
 
+    @Autowired
+    private IFmsCropService fmsCropService;
+
     /**
      * 查询作物周期
      * 
@@ -64,6 +70,7 @@ public class FmsPeriodServiceImpl implements IFmsPeriodService
      */
     @Override
     public List<FmsPeriod> selectFmsPeriodList(FmsPeriod fmsPeriod) {
+        fmsPeriod.setTid(SecurityUtils.getTid());
         return fmsPeriodMapper.selectFmsPeriodList(fmsPeriod);
     }
 
@@ -75,11 +82,13 @@ public class FmsPeriodServiceImpl implements IFmsPeriodService
      */
     @Override
     public int insertFmsPeriod(FmsPeriod fmsPeriod) {
-        FmsCrop fmsCrop = fmsCropMapper.selectFmsCropByCropId(fmsPeriod.getCropId(),SecurityUtils.getTid());
-        fmsPeriod.setPeriodId(fmsPeriod.getId());
-        if(StringUtils.isEmpty(fmsPeriod.getTid())){
-            fmsPeriod.setTid(fmsCrop.getTid());
+        String tid = SecurityUtils.getTid();
+        FmsCrop fmsCrop = fmsCropService.selectFmsCropByCropId(fmsPeriod.getCropId(),tid);
+        if(fmsCrop == null){
+            throw new BizException(ErrorCode.INVALID_PARAMETER.getCode(),"作物不存在，请先创建作物信息");
         }
+        fmsPeriod.setPeriodId(fmsPeriod.getId());
+        fmsPeriod.setTid(tid);
         return fmsPeriodMapper.insertFmsPeriod(fmsPeriod);
     }
 
@@ -89,7 +98,7 @@ public class FmsPeriodServiceImpl implements IFmsPeriodService
 
         //查询生命周期列表，删除过去的图片
         List<FmsPeriod> fmsPeriods = fmsPeriodMapper.selectFmsPeriodByCropId(reqVo.getCropId(), SecurityUtils.getTid());
-        FmsCrop fmsCrop = fmsCropMapper.selectFmsCropByCropId(reqVo.getCropId(),SecurityUtils.getTid());
+        FmsCrop fmsCrop = fmsCropService.selectFmsCropByCropId(reqVo.getCropId(),SecurityUtils.getTid());
         List<SysRes> sysResList = new ArrayList<>();
         String[] periodIds = new String[fmsPeriods.size()];
         for (int i = 0; i < fmsPeriods.size(); i++) {
@@ -110,14 +119,14 @@ public class FmsPeriodServiceImpl implements IFmsPeriodService
         //删除过去的生长周期，保存最新的
         fmsPeriodMapper.deleteFmsPeriodByCropId(reqVo.getCropId(),SecurityUtils.getTid());
 
-        if (reqVo.getList().size() > 0) {
+        if (!reqVo.getList().isEmpty()) {
             for (int i = 0; i < reqVo.getList().size(); i++) {
                 FmsPeriod fmsPeriod = reqVo.getList().get(i);
                 fmsPeriod.setCropId(reqVo.getCropId());
                 fmsPeriod.setPeriodId(fmsPeriod.getId());
                 fmsPeriod.setPeriodSeq(i + "");
                 fmsPeriod.setTid(fmsCrop.getTid());
-                fmsPeriodMapper.insertFmsPeriod(fmsPeriod);
+                insertFmsPeriod(fmsPeriod);
 
                 String resIdsStr = reqVo.getList().get(i).getResIds();
                 if (!StringUtils.isEmpty(resIdsStr)) {

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

@@ -19,9 +19,9 @@ import com.yunfeiyun.agmp.fms.domain.resvo.FmsPlanListOfTaskStatusResVo;
 import com.yunfeiyun.agmp.fms.domain.resvo.FmsPlanResVo;
 import com.yunfeiyun.agmp.fms.domain.vo.FmsTaskrcdVo;
 import com.yunfeiyun.agmp.fms.mapper.FmsBlockMapper;
-import com.yunfeiyun.agmp.fms.mapper.FmsCropMapper;
-import com.yunfeiyun.agmp.fms.mapper.FmsPeriodMapper;
 import com.yunfeiyun.agmp.fms.mapper.FmsPlanMapper;
+import com.yunfeiyun.agmp.fms.service.IFmsCropService;
+import com.yunfeiyun.agmp.fms.service.IFmsPeriodService;
 import com.yunfeiyun.agmp.fms.service.IFmsPlanService;
 import com.yunfeiyun.agmp.fms.service.IFmsTaskrcdService;
 import lombok.extern.slf4j.Slf4j;
@@ -47,12 +47,15 @@ public class FmsPlanServiceImpl implements IFmsPlanService {
     private FmsPlanMapper fmsPlanMapper;
     @Autowired
     private FmsBlockMapper fmsBlockMapper;
-    @Autowired
-    private FmsCropMapper fmsCropMapper;
-    @Resource
-    private FmsPeriodMapper fmsPeriodMapper;
     @Resource
     private IFmsTaskrcdService fmsTaskrcdService;
+
+    @Autowired
+    private IFmsPeriodService fmsPeriodService;
+
+    @Autowired
+    private IFmsCropService fmsCropService;
+
     /**
      * 查询种植计划
      * 
@@ -238,11 +241,11 @@ public class FmsPlanServiceImpl implements IFmsPlanService {
         FmsPlanResVo fmsPlan = selectFmsPlanByPlanId(planId,tid);
 
         BeanUtils.copyProperties(fmsPlan,fmsPlanDocumentResVo);
-        FmsCrop fmsCrop = fmsCropMapper.selectFmsCropByCropId(fmsPlan.getCropId(),tid);
+        FmsCrop fmsCrop = fmsCropService.selectFmsCropByCropId(fmsPlan.getCropId(),tid);
         fmsPlanDocumentResVo.setFmsCrop(fmsCrop);
         FmsPeriod fmsPeriodQuery = new FmsPeriod();
         fmsPeriodQuery.setCropId(fmsCrop.getCropId());
-        List<FmsPeriod> fmsPeriodList = fmsPeriodMapper.selectFmsPeriodList(fmsPeriodQuery);
+        List<FmsPeriod> fmsPeriodList = fmsPeriodService.selectFmsPeriodList(fmsPeriodQuery);
 
         FmsTaskrcdListReqVo fmsTaskrcdListReqVo = new FmsTaskrcdListReqVo();
         fmsTaskrcdListReqVo.setPlanId(fmsPlan.getPlanId());

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

@@ -23,10 +23,7 @@ import com.yunfeiyun.agmp.fms.domain.reqvo.SelectOfTssStatReqVo;
 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.service.*;
 import com.yunfeiyun.agmp.fms.util.DataAuthUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -81,6 +78,12 @@ public class FmsTaskServiceImpl implements IFmsTaskService
     @Autowired
     private IFmsTaskpickService fmsTaskpickService;
 
+    @Autowired
+    private IFmsTaskassetService fmsTaskassetService;
+
+    @Autowired
+    private IFmsTaskmachineService fmsTaskmachineService;
+
     /**
      * 查询农事任务
      * 
@@ -339,12 +342,12 @@ public class FmsTaskServiceImpl implements IFmsTaskService
         List<FmsTaskrcdListDto> fmsTaskrcdList = fmsTaskrcdService.selectFmsTaskrcdByTaskId(taskId,tid);
         if(!fmsTaskrcdList.isEmpty()){
             String[] fmsTaskRcdIds = fmsTaskrcdList.stream().map(FmsTaskrcdListDto::getTaskrcdId).toArray(String[]::new);
-            List<FmsTaskAssetUsageResVo> fmsTaskassets = fmsTaskassetMapper.selectFmsTaskAssetByRcdId(fmsTaskRcdIds,tid);
+            List<FmsTaskAssetUsageResVo> fmsTaskassets = fmsTaskassetService.selectFmsTaskAssetByRcdId(fmsTaskRcdIds,tid);
             String[] fmsTaskAssetIds = fmsTaskassets.stream().map(FmsTaskAssetUsageResVo::getTaskassetId).toArray(String[]::new);
             if(fmsTaskAssetIds.length != 0){
                 fmsTaskassetMapper.deleteFmsTaskassetByTaskassetIds(fmsTaskAssetIds,tid);
             }
-            List<FmsTaskmachineResVo> fmsTaskmachineList = fmsTaskmachineMapper.selectFmsTaskmachineByRcdId(fmsTaskRcdIds,tid);
+            List<FmsTaskmachineResVo> fmsTaskmachineList = fmsTaskmachineService.selectFmsTaskmachineByRcdId(fmsTaskRcdIds,tid);
             String[] fmsTaskmachineIds = fmsTaskmachineList.stream().map(FmsTaskmachineResVo::getTaskmachId).toArray(String[]::new);
             if(fmsTaskmachineIds.length != 0){
                 fmsTaskmachineMapper.deleteFmsTaskmachineByTaskmachIds(fmsTaskmachineIds,tid);

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

@@ -3,16 +3,15 @@ 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.FmsTaskasset;
-import com.yunfeiyun.agmp.fms.domain.vo.FmsTaskassetExcelVo;
-import com.yunfeiyun.agmp.fms.mapper.FmsTaskassetMapper;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsTaskAssetUsageReqVo;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsTaskListReqVo;
 import com.yunfeiyun.agmp.fms.domain.resvo.FmsTaskAssetUsageResVo;
+import com.yunfeiyun.agmp.fms.domain.vo.FmsTaskassetExcelVo;
+import com.yunfeiyun.agmp.fms.mapper.FmsTaskassetMapper;
 import com.yunfeiyun.agmp.fms.service.IFmsTaskassetService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -65,6 +64,18 @@ public class FmsTaskassetServiceImpl implements IFmsTaskassetService
         return fmsTaskassetMapper.selectFmsTaskAssetByRcdId(new String[]{taskrcdId},tid);
     }
 
+    /**
+     * 查询农资使用记录
+     *
+     * @param taskrcdId 记录标识
+     * @param tid
+     * @return 农资使用记录集合
+     */
+    @Override
+    public List<FmsTaskAssetUsageResVo> selectFmsTaskAssetByRcdId(String[] taskrcdId, String tid) {
+        return fmsTaskassetMapper.selectFmsTaskAssetByRcdId(taskrcdId,tid);
+    }
+
     @Override
     public List<FmsTaskAssetUsageResVo> selectFmsTaskAssetStat(FmsTaskListReqVo reqVo) {
         return fmsTaskassetMapper.selectFmsTaskAssetStat(reqVo);

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

@@ -51,6 +51,18 @@ public class FmsTaskmachineServiceImpl implements IFmsTaskmachineService
         return fmsTaskmachineMapper.selectFmsTaskmachineByRcdId(new String[]{taskrcdId},tid);
     }
 
+    /**
+     * 查询农事任务农具列表
+     *
+     * @param taskrcdIds
+     * @param tid
+     * @return 农事任务农具集合
+     */
+    @Override
+    public List<FmsTaskmachineResVo> selectFmsTaskmachineByRcdId(String[] taskrcdIds, String tid) {
+        return fmsTaskmachineMapper.selectFmsTaskmachineByRcdId(taskrcdIds,tid);
+    }
+
     @Override
     public List<FmsTaskmachineResVo> selectFmsTaskmachineStat(FmsTaskListReqVo reqVo) {
         return fmsTaskmachineMapper.selectFmsTaskmachineStat(reqVo);

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

@@ -28,9 +28,7 @@ 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 com.yunfeiyun.agmp.fms.service.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -68,8 +66,6 @@ public class FmsTaskrcdServiceImpl implements IFmsTaskrcdService
     @Resource
     private FmsLandMapper fmsLandMapper;
     @Resource
-    private FmsCropMapper fmsCropMapper;
-    @Resource
     private MessageUtil messageUtil;
     @Resource
     private SysUserMapper sysUserMapper;
@@ -80,6 +76,15 @@ public class FmsTaskrcdServiceImpl implements IFmsTaskrcdService
     @Autowired
     private IFmsTaskService fmsTaskService;
 
+    @Autowired
+    private IFmsCropService fmsCropService;
+
+    @Autowired
+    private IFmsTaskassetService fmsTaskassetService;
+
+    @Autowired
+    private IFmsTaskmachineService fmsTaskmachineService;
+
     /**
      * 根据农事任务记录id查询农事记录信息
      *
@@ -352,7 +357,7 @@ public class FmsTaskrcdServiceImpl implements IFmsTaskrcdService
         if(resultCode != 0){
             FmsBlock fmsBlock = fmsBlockMapper.selectFmsBlockByBlockId(fmsTask.getBlockId(),SecurityUtils.getTid());
             FmsLand fmsLand = fmsLandMapper.selectFmsLandByLandId(fmsTask.getLandId(),SecurityUtils.getTid());
-            FmsCrop fmsCrop = fmsCropMapper.selectFmsCropByCropId(fmsTask.getCropId(),SecurityUtils.getTid());
+            FmsCrop fmsCrop = fmsCropService.selectFmsCropByCropId(fmsTask.getCropId(),SecurityUtils.getTid());
             String context = "";
             if (fmsLand != null) {
                 context += fmsLand.getLandName() + "基地";
@@ -537,7 +542,8 @@ public class FmsTaskrcdServiceImpl implements IFmsTaskrcdService
 
     @Override
     public List<FmsTaskrcdVo> selectFmsPlanTaskrcdList(FmsTaskrcdListReqVo fmsTaskrcdListReqVo) {
-        List<FmsTaskrcdVo> fmsTaskrcdsList = fmsTaskrcdMapper.selectFmsPlanTaskrcdList(fmsTaskrcdListReqVo.getPlanId(),fmsTaskrcdListReqVo.getTid());
+        String tid = SecurityUtils.getTid();
+        List<FmsTaskrcdVo> fmsTaskrcdsList = fmsTaskrcdMapper.selectFmsPlanTaskrcdList(fmsTaskrcdListReqVo.getPlanId(), tid);
         String[] resBusId = new String[fmsTaskrcdsList.size()];
         Map<String,FmsTaskrcdVo> fmsTaskrcdVoMap = new HashMap<>();
         for(int i = 0;i<fmsTaskrcdsList.size();i++){
@@ -561,8 +567,8 @@ public class FmsTaskrcdServiceImpl implements IFmsTaskrcdService
                 }
 
             }
-            List<FmsTaskAssetUsageResVo> fmsTaskassetList = fmsTaskassetMapper.selectFmsTaskAssetByRcdId(resBusId,SecurityUtils.getTid());
-            List<FmsTaskmachineResVo> fmsTaskmachineList = fmsTaskmachineMapper.selectFmsTaskmachineByRcdId(resBusId,SecurityUtils.getTid());
+            List<FmsTaskAssetUsageResVo> fmsTaskassetList = fmsTaskassetService.selectFmsTaskAssetByRcdId(resBusId,SecurityUtils.getTid());
+            List<FmsTaskmachineResVo> fmsTaskmachineList = fmsTaskmachineService.selectFmsTaskmachineByRcdId(resBusId,SecurityUtils.getTid());
             for(FmsTaskAssetUsageResVo fmsTaskAssetUsageResVo : fmsTaskassetList){
                 FmsTaskrcdVo fmsTaskrcdVo = fmsTaskrcdVoMap.get(fmsTaskAssetUsageResVo.getTaskrcdId());
                 if(null != fmsTaskrcdVo){

src/main/resources/mapper/FmsPlanMapper.xml

@@ -155,7 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN FmsCrop c ON p.cropId = c.cropId
         LEFT JOIN FmsBlock fb on fb.blockId = p.blockId
         LEFT JOIN FmsLand fl on fl.landId = p.landId
-        where planId = #{planId}
+        where p.planId = #{planId}
         <if test="tid != null and tid !='' and tid != '-1'">and p.tid = #{tid}</if>
     </select>