平台件合规认证计划

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformTaskPlanningEOController.java

@@ -79,7 +79,14 @@ public class PlatformTaskPlanningEOController extends JeroController<PlatformTas
     @ApiOperation(value="平台件合规认证计划-列表查询", notes="平台件合规认证计划-列表查询")
 	@GetMapping(value = "/list")
 	public Result<?> queryList(String projectId) {
-		Map<String,Object> result = platformTaskPlanningEOService.queryList(projectId);
+		List<PlatformTaskPlanningEO> platformTaskPlanningEOList = platformTaskPlanningEOService.queryList(projectId);
+		return Result.OK(platformTaskPlanningEOList);
+	}
+	@AutoLog(value = "平台件合规认证计划-编辑数据回显")
+    @ApiOperation(value="平台件合规认证计划-编辑数据回显", notes="平台件合规认证计划-编辑数据回显")
+	@GetMapping(value = "/queryListUpdate")
+	public Result<?> queryListUpdate(String projectId) {
+		Map<String,Object> result = platformTaskPlanningEOService.queryListUpdate(projectId);
         return Result.OK(result);
 	}
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformTaskPlanningEOService.java

@@ -65,5 +65,12 @@ public interface IPlatformTaskPlanningEOService extends IService<PlatformTaskPla
 	 *
 	 * @return
 	 */
-	Map<String,Object> queryList(String projectId);
+	List<PlatformTaskPlanningEO> queryList(String projectId);
+
+	/**
+	 * 平台件合规认证计划-编辑数据回显
+	 * @param projectId
+	 * @return
+	 */
+	Map<String,Object> queryListUpdate(String projectId);
 }

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<PlatformTaskP
 				platformTaskPlanningEO.setCreateTime(now);
 				platformTaskPlanningEO.setUpdateTime(now);
 				platformTaskPlanningEO.setFlag("up");
+				platformTaskPlanningEO.setId(null);
 			}
 			for (PlatformTaskPlanningEO platformTaskPlanningEO : platformTaskPlanningEOListDown) {
 				Date now = new Date();
 				platformTaskPlanningEO.setCreateTime(now);
 				platformTaskPlanningEO.setUpdateTime(now);
 				platformTaskPlanningEO.setFlag("down");
+				platformTaskPlanningEO.setId(null);
 			}
 			saveBatch(platformTaskPlanningEOListUp);
 			saveBatch(platformTaskPlanningEOListDown);
@@ -126,7 +128,50 @@ public class PlatformTaskPlanningEOServiceImpl extends ServiceImpl<PlatformTaskP
 	 * @return
 	 */
 	@Override
-    public Map<String,Object> queryList(String projectId) {
+    public List<PlatformTaskPlanningEO> 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<PlatformTaskPlanningEO> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(PlatformTaskPlanningEO::getProjectId,projectId);
+		wrapper.isNotNull(PlatformTaskPlanningEO::getNodeTime);
+		wrapper.orderByAsc(PlatformTaskPlanningEO::getNodeTime);
+		List<PlatformTaskPlanningEO> 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<String,Object> queryListUpdate(String projectId) {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyy-MM-dd");
 		Date date = null;
 		try {
@@ -167,7 +212,6 @@ public class PlatformTaskPlanningEOServiceImpl extends ServiceImpl<PlatformTaskP
 					}
 				}
 			}
-			taskPlanningEOList = taskPlanningEOList.stream().filter(e->ObjectUtils.isNotEmpty(e.getNodeTime())).collect(Collectors.toList());
 
 			List<PlatformTaskPlanningEO> up = taskPlanningEOList.stream()
 					.filter(e -> StringUtils.isNotBlank(e.getFlag()) && UpAndDownEnum.UP.getValue().equals(e.getFlag())).collect(Collectors.toList());