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