diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformTaskPlanningEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformTaskPlanningEOController.java index 005fc3917..e63cfacc7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformTaskPlanningEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformTaskPlanningEOController.java @@ -79,7 +79,14 @@ public class PlatformTaskPlanningEOController extends JeroController queryList(String projectId) { - Map result = platformTaskPlanningEOService.queryList(projectId); + List platformTaskPlanningEOList = platformTaskPlanningEOService.queryList(projectId); + return Result.OK(platformTaskPlanningEOList); + } + @AutoLog(value = "平台件合规认证计划-编辑数据回显") + @ApiOperation(value="平台件合规认证计划-编辑数据回显", notes="平台件合规认证计划-编辑数据回显") + @GetMapping(value = "/queryListUpdate") + public Result queryListUpdate(String projectId) { + Map result = platformTaskPlanningEOService.queryListUpdate(projectId); return Result.OK(result); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformTaskPlanningEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformTaskPlanningEOService.java index 08873412b..475b182cf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformTaskPlanningEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformTaskPlanningEOService.java @@ -65,5 +65,12 @@ public interface IPlatformTaskPlanningEOService extends IService queryList(String projectId); + List queryList(String projectId); + + /** + * 平台件合规认证计划-编辑数据回显 + * @param projectId + * @return + */ + Map queryListUpdate(String projectId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java index fed2b22e6..8eb57ed93 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java @@ -62,12 +62,14 @@ public class PlatformTaskPlanningEOServiceImpl extends ServiceImpl queryList(String projectId) { + public List queryList(String projectId) { + SimpleDateFormat sdf = new SimpleDateFormat("yyy-MM-dd"); + Date date = null; + try { + date = sdf.parse(sdf.format(new Date())); + } catch (ParseException e) { + e.printStackTrace(); + } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PlatformTaskPlanningEO::getProjectId,projectId); + wrapper.isNotNull(PlatformTaskPlanningEO::getNodeTime); + wrapper.orderByAsc(PlatformTaskPlanningEO::getNodeTime); + List taskPlanningEOList = list(wrapper); + if(ObjectUtils.isNotEmpty(taskPlanningEOList)){ + for (PlatformTaskPlanningEO platformTaskPlanningEO : taskPlanningEOList) { + platformTaskPlanningEO.setName(platformTaskPlanningEO.getNodeName()); + platformTaskPlanningEO.setTime(platformTaskPlanningEO.getNodeTime()); + + if(ObjectUtils.isNotEmpty(platformTaskPlanningEO.getNodeTime())){ + if(platformTaskPlanningEO.getNodeTime().after(date)){ + platformTaskPlanningEO.setStatus(PlanStatusEnum.LESS_THAN_TIME.getValue()); + }else if(platformTaskPlanningEO.getNodeTime().before(date)){ + platformTaskPlanningEO.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue()); + }else{ + platformTaskPlanningEO.setStatus(PlanStatusEnum.ON_GOING.getValue()); + } + } + + if(UpAndDownEnum.UP.getValue().equals(platformTaskPlanningEO.getFlag())){ + platformTaskPlanningEO.setG(true); + }else if(UpAndDownEnum.DOWN.getValue().equals(platformTaskPlanningEO.getFlag())){ + platformTaskPlanningEO.setG(false); + } + } + } + return taskPlanningEOList; + } + /** + * 平台件合规认证计划-编辑数据回显 + * + * @return + */ + @Override + public Map queryListUpdate(String projectId) { SimpleDateFormat sdf = new SimpleDateFormat("yyy-MM-dd"); Date date = null; try { @@ -167,7 +212,6 @@ public class PlatformTaskPlanningEOServiceImpl extends ServiceImplObjectUtils.isNotEmpty(e.getNodeTime())).collect(Collectors.toList()); List up = taskPlanningEOList.stream() .filter(e -> StringUtils.isNotBlank(e.getFlag()) && UpAndDownEnum.UP.getValue().equals(e.getFlag())).collect(Collectors.toList());