Преглед изворни кода

修复 获取作物种植档案信息农事记录与生长周期对不上的问题

zhaiyifei пре 11 месеци
родитељ
комит
2ca23c9dea

+ 2 - 4
src/main/java/com/yunfeiyun/agmp/fms/service/impl/FmsPlanServiceImpl.java

@@ -270,12 +270,13 @@ public class FmsPlanServiceImpl implements IFmsPlanService {
         Date endDate = DateUtil.offsetDay(DateUtils.parseDate(dateStart),totalPeriodDays);
         String rcdStartDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, startDate);
         String rcdEndDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, endDate);
+
         FmsTaskrcdListReqVo fmsTaskrcdListReqVo = new FmsTaskrcdListReqVo();
         fmsTaskrcdListReqVo.setPlanId(fmsPlan.getPlanId());
         fmsTaskrcdListReqVo.setStartDate(rcdStartDate);
         fmsTaskrcdListReqVo.setEndDate(rcdEndDate);
-
         List<FmsTaskrcdVo> fmsTaskrcdVos = fmsTaskrcdService.selectFmsPlanTaskrcdList(fmsTaskrcdListReqVo);
+
         Map<Integer, List<FmsTaskrcdVo>> fmsPeriodTaskMap = new HashMap<>();
         for(FmsTaskrcdVo fmsTaskrcdVo : fmsTaskrcdVos) {
             String taskrcdCompletedate = fmsTaskrcdVo.getTaskrcdCompletedate();
@@ -288,12 +289,9 @@ public class FmsPlanServiceImpl implements IFmsPlanService {
             }
         }
 
-        Map<Integer, JSONObject> fmsPeriodMap = new HashMap<>();
         for(Map.Entry<Integer, List<FmsTaskrcdVo>> entry: fmsPeriodTaskMap.entrySet()){
-            Integer key = entry.getKey();
             List<FmsTaskrcdVo> taskVos = entry.getValue();
             taskVos.sort(Comparator.comparing(FmsTaskrcdVo::getTaskrcdCompletedate).reversed());
-            fmsPeriodMap.put(key,fmsPeriodTreeMap.get(key));
         }
 
         FmsPlanDocumentResVo fmsPlanDocumentResVo = new FmsPlanDocumentResVo();