项目库法规认证计划(各阶段确认进度)

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskPlanningController.java

@@ -9,6 +9,7 @@ import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.project.entity.ProjectTaskPlanning;
 import com.jero.modules.project.service.IProjectTaskPlanningService;
+import com.jero.modules.project.vo.TimeNodeVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -23,20 +24,20 @@ import java.util.Arrays;
 import java.util.List;
 
 
- /**
+/**
- * @Description: 法规/认证任务计划 (各阶段确认进度) 表
+ * @Description: 法规,认证任务计划 (各阶段确认进度) 表
  * @Author: jero-boot
  * @Date:   2022-04-11
  * @Version: V1.0
  */
-@Api(tags="法规/认证任务计划 (各阶段确认进度) 表")
+@Api(tags="法规,认证任务计划 (各阶段确认进度) 表")
 @RestController
 @RequestMapping("/project/projectTaskPlanning")
 @Slf4j
 public class ProjectTaskPlanningController extends JeroController<ProjectTaskPlanning, IProjectTaskPlanningService> {
 	@Autowired
 	private IProjectTaskPlanningService projectTaskPlanningService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -46,8 +47,8 @@ public class ProjectTaskPlanningController extends JeroController<ProjectTaskPla
 	 * @param req
 	 * @return
 	 */
-	@AutoLog(value = "法规/认证任务计划 (各阶段确认进度) 表-分页列表查询")
+	@AutoLog(value = "法规,认证任务计划 (各阶段确认进度) 表-分页列表查询")
-	@ApiOperation(value="法规/认证任务计划 (各阶段确认进度) 表-分页列表查询", notes="法规/认证任务计划 (各阶段确认进度) 表-分页列表查询")
+	@ApiOperation(value="法规,认证任务计划 (各阶段确认进度) 表-分页列表查询", notes="法规,认证任务计划 (各阶段确认进度) 表-分页列表查询")
 	@GetMapping(value = "/page")
 	public Result<?> queryPageList(ProjectTaskPlanning projectTaskPlanning,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -64,8 +65,8 @@ public class ProjectTaskPlanningController extends JeroController<ProjectTaskPla
 	 *
 	 * @return
 	 */
-	@AutoLog(value = "法规/认证任务计划 (各阶段确认进度) 表-列表查询")
+	@AutoLog(value = "法规,认证任务计划 (各阶段确认进度) 表-列表查询")
-    @ApiOperation(value="法规/认证任务计划 (各阶段确认进度) 表-列表查询", notes="法规/认证任务计划 (各阶段确认进度) 表-列表查询")
+	@ApiOperation(value="法规,认证任务计划 (各阶段确认进度) 表-列表查询", notes="法规,认证任务计划 (各阶段确认进度) 表-列表查询")
 	@GetMapping(value = "/list")
 	public Result<List<ProjectTaskPlanning>> queryList() {
         List<ProjectTaskPlanning> list = projectTaskPlanningService.queryList();
@@ -78,8 +79,8 @@ public class ProjectTaskPlanningController extends JeroController<ProjectTaskPla
 	 * @param projectTaskPlanning
 	 * @return
 	 */
-	@AutoLog(value = "法规/认证任务计划 (各阶段确认进度) 表-添加")
+	@AutoLog(value = "法规,认证任务计划 (各阶段确认进度) 表-添加")
-	@ApiOperation(value="法规/认证任务计划 (各阶段确认进度) 表-添加", notes="法规/认证任务计划 (各阶段确认进度) 表-添加")
+	@ApiOperation(value="法规,认证任务计划 (各阶段确认进度) 表-添加", notes="法规,认证任务计划 (各阶段确认进度) 表-添加")
 	@PostMapping(value = "/add")
 	public Result<?> add(@Validated @RequestBody ProjectTaskPlanning projectTaskPlanning) {
 		projectTaskPlanningService.add(projectTaskPlanning);
@@ -92,8 +93,8 @@ public class ProjectTaskPlanningController extends JeroController<ProjectTaskPla
 	 * @param projectTaskPlanning
 	 * @return
 	 */
-	@AutoLog(value = "法规/认证任务计划 (各阶段确认进度) 表-编辑")
+	@AutoLog(value = "法规,认证任务计划 (各阶段确认进度) 表-编辑")
-	@ApiOperation(value="法规/认证任务计划 (各阶段确认进度) 表-编辑", notes="法规/认证任务计划 (各阶段确认进度) 表-编辑")
+	@ApiOperation(value="法规,认证任务计划 (各阶段确认进度) 表-编辑", notes="法规,认证任务计划 (各阶段确认进度) 表-编辑")
 	@PutMapping(value = "/edit")
 	public Result<?> edit(@Validated @RequestBody ProjectTaskPlanning projectTaskPlanning) {
 		projectTaskPlanningService.editById(projectTaskPlanning);
@@ -106,8 +107,8 @@ public class ProjectTaskPlanningController extends JeroController<ProjectTaskPla
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "法规/认证任务计划 (各阶段确认进度) 表-通过id删除")
+	@AutoLog(value = "法规,认证任务计划 (各阶段确认进度) 表-通过id删除")
-	@ApiOperation(value="法规/认证任务计划 (各阶段确认进度) 表-通过id删除", notes="法规/认证任务计划 (各阶段确认进度) 表-通过id删除")
+	@ApiOperation(value="法规,认证任务计划 (各阶段确认进度) 表-通过id删除", notes="法规,认证任务计划 (各阶段确认进度) 表-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 		projectTaskPlanningService.deleteById(id);
@@ -120,8 +121,8 @@ public class ProjectTaskPlanningController extends JeroController<ProjectTaskPla
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "法规/认证任务计划 (各阶段确认进度) 表-批量删除")
+	@AutoLog(value = "法规,认证任务计划 (各阶段确认进度) 表-批量删除")
-	@ApiOperation(value="法规/认证任务计划 (各阶段确认进度) 表-批量删除", notes="法规/认证任务计划 (各阶段确认进度) 表-批量删除")
+	@ApiOperation(value="法规,认证任务计划 (各阶段确认进度) 表-批量删除", notes="法规,认证任务计划 (各阶段确认进度) 表-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.projectTaskPlanningService.deleteByIds(Arrays.asList(ids.split(",")));
@@ -129,16 +130,16 @@ public class ProjectTaskPlanningController extends JeroController<ProjectTaskPla
 	}
 
 	/**
-	 * 通过id查询
+	 * 通过projectId查询
 	 *
 	 * @param projectId
 	 * @return
 	 */
-	@AutoLog(value = "法规/认证任务计划 (各阶段确认进度) 表-通过id查询")
+	@AutoLog(value = "法规,认证任务计划 (各阶段确认进度) 表-通过projectId查询")
-	@ApiOperation(value="法规/认证任务计划 (各阶段确认进度) 表-通过id查询", notes="法规/认证任务计划 (各阶段确认进度) 表-通过id查询")
+	@ApiOperation(value="法规,认证任务计划 (各阶段确认进度) 表-通过projectId查询", notes="法规,认证任务计划 (各阶段确认进度) 表-通过projectId查询")
 	@GetMapping(value = "/queryByprojectId")
 	public Result<?> queryById(@RequestParam(name="id",required=true) String projectId) {
-		ProjectTaskPlanning projectTaskPlanning = projectTaskPlanningService.queryByProjectId(projectId);
+		List<TimeNodeVO> projectTaskPlanning = projectTaskPlanningService.queryByProjectId(projectId);
 		if(projectTaskPlanning==null) {
 			return Result.error("未找到对应数据");
 		}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskPlanning.java

@@ -4,12 +4,15 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jero.modules.project.vo.TimeNodeVO;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -35,36 +38,39 @@ public class ProjectTaskPlanning implements Serializable {
     /**法规清单确认*/
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
-    private java.util.Date listConfirmation;
+    private Date listConfirmation;
 
     /**法规任务确认*/
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
-    private java.util.Date legalTaskConfirmation;
+    private Date legalTaskConfirmation;
 
     /**设计符合性确认截止时间*/
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
-    private java.util.Date designDeadline;
+    private Date designDeadline;
 
     /**PreHomo确认截止时间*/
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
-    private java.util.Date prehomoDeadline;
+    private Date prehomoDeadline;
 
     /**认证开始*/
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
-    private java.util.Date attestationStartTime;
+    private Date attestationStartTime;
 
     /**认证结束*/
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
-    private java.util.Date attestationEndTime;
+    private Date attestationEndTime;
 
     /**验证符合性确认截止时间*/
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
-    private java.util.Date verifyDeadline;
+    private Date verifyDeadline;
+
+    /**时间List对象*/
+    List<TimeNodeVO> timeNodeVOS;
 
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java

@@ -0,0 +1,28 @@
+package com.jero.modules.project.enums;
+
+public enum ProjectTaskPlanningNameEnum {
+    LIST_CONFIRMATION("法规清单确认"),
+    LEGAL_TASK_CONFIRMATION("法规任务确认"),
+    DESIGN_DEADLINE("设计符合性确认截止时间"),
+    PREHOMO_DEADLINE("PreHomo确认截止时间"),
+    ATTESTATION_START_TIME("认证开始"),
+    ATTESTATION_END_TIME("认证结束"),
+    VERIFY_DEADLINE("验证符合性确认截止时间"),
+
+    ;
+    String name;
+
+
+    ProjectTaskPlanningNameEnum(String name) {
+        this.name = name;
+
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectTaskPlanningMapper.java

@@ -1,17 +1,19 @@
 package com.jero.modules.project.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jero.modules.project.entity.ProjectTaskPlanning;
+import org.apache.ibatis.annotations.Select;
+
 import java.util.List;
 
-import org.apache.ibatis.annotations.Param;
-import com.jero.modules.project.entity.ProjectTaskPlanning;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
 /**
- * @Description: 法规/认证任务计划 (各阶段确认进度) 表
+ * @Description: 法规,认证任务计划 (各阶段确认进度) 表
  * @Author: jero-boot
  * @Date:   2022-04-11
  * @Version: V1.0
  */
 public interface ProjectTaskPlanningMapper extends BaseMapper<ProjectTaskPlanning> {
+    @Select("SELECT * FROM project_task_planning where project_id=#{projectId}")
+    List<ProjectTaskPlanning> getByProjectId(String projectId);
 
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskPlanningService.java

@@ -1,7 +1,9 @@
 package com.jero.modules.project.service;
 
-import com.jero.modules.project.entity.ProjectTaskPlanning;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.modules.project.entity.ProjectTaskPlanning;
+import com.jero.modules.project.vo.TimeNodeVO;
+
 import java.util.List;
 
 /**
@@ -50,7 +52,7 @@ public interface IProjectTaskPlanningService extends IService<ProjectTaskPlannin
 	 * @param projectId
 	 * @return
 	 */
-	ProjectTaskPlanning queryByProjectId(String projectId);
+	List<TimeNodeVO> queryByProjectId(String projectId);
 
 	/**
 	 * 列表查询

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java

@@ -2,14 +2,16 @@ package com.jero.modules.project.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.modules.project.entity.ProjectTaskPlanning;
+import com.jero.modules.project.enums.ProjectTaskPlanningNameEnum;
 import com.jero.modules.project.mapper.ProjectTaskPlanningMapper;
 import com.jero.modules.project.service.IProjectTaskPlanningService;
+import com.jero.modules.project.vo.TimeNodeVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
-import java.util.Date;
+import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Description: 法规/认证任务计划 (各阶段确认进度) 表
@@ -20,6 +22,8 @@ import java.util.Map;
 @Service
 public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlanningMapper, ProjectTaskPlanning> implements IProjectTaskPlanningService {
 
+	@Autowired
+	private ProjectTaskPlanningMapper projectTaskPlanningMapper;
 	/**
 	 * 保存
 	 *
@@ -51,9 +55,9 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
 	 * @return
 	 */
 	@Override
-    public void deleteById(String id) {
+	public void deleteById(String id) {
-        removeById(id);
+		removeById(id);
-    }
+	}
 
 	/**
 	 * 批量删除
@@ -62,9 +66,9 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
 	 * @return
 	 */
 	@Override
-    public void deleteByIds(List<String> ids) {
+	public void deleteByIds(List<String> ids) {
-        removeByIds(ids);
+		removeByIds(ids);
-    }
+	}
 
 	/**
 	 * 通过项目id查询,并按升序排序
@@ -73,41 +77,52 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
 	 * @return
 	 */
 	@Override
-    public ProjectTaskPlanning queryByProjectId(String projectId) {
+	public List<TimeNodeVO> queryByProjectId(String projectId) {
-		ProjectTaskPlanning projectTaskPlanning = getById(projectId);
+		List<ProjectTaskPlanning> projectTaskPlanningList = projectTaskPlanningMapper.getByProjectId(projectId);
-		Date listConfirmation = projectTaskPlanning.getListConfirmation();//法规清单确认
-		Date legalTaskConfirmation = projectTaskPlanning.getLegalTaskConfirmation();//法规任务确认
-		Date designDeadline = projectTaskPlanning.getDesignDeadline();//设计符合性确认截止时间
-		Date prehomoDeadline = projectTaskPlanning.getPrehomoDeadline();//PreHomo确认截止时间
-		Date attestationStartTime = projectTaskPlanning.getAttestationStartTime();//认证开始
-		Date attestationEndTime = projectTaskPlanning.getAttestationEndTime();//认证结束
-		Date verifyDeadline = projectTaskPlanning.getVerifyDeadline();
-		List dateList=new ArrayList();
-		dateList.add(projectTaskPlanning.getListConfirmation());
-		dateList.add(projectTaskPlanning.getLegalTaskConfirmation());
-		dateList.add(projectTaskPlanning.getDesignDeadline());
-		dateList.add(projectTaskPlanning.getPrehomoDeadline());
-		dateList.add(projectTaskPlanning.getAttestationStartTime());
-		dateList.add(projectTaskPlanning.getAttestationEndTime());
-		dateList.add(projectTaskPlanning.getVerifyDeadline());
-		//Collections.sort(dateList);
 
-		List<Map<Date, Object>> list = new ArrayList<>();
+		List<TimeNodeVO> timeNodeVOS = new ArrayList<>();
-	/*	for (ProjectTaskPlanning plann : dateList) {
+		for (ProjectTaskPlanning projectTaskPlanning : projectTaskPlanningList) {
-			Map<Date, Object> map = new HashMap<>();
-			if ("file_name".equals(onlCgformField.getDbFieldName())) {
-				//跳转详情的标识
-				map.put("click", "true");
-			}
-		}*/
 
+			TimeNodeVO listConfirmationVO = new TimeNodeVO();
+			listConfirmationVO.setName(ProjectTaskPlanningNameEnum.LIST_CONFIRMATION.getName());
+			listConfirmationVO.setTime(projectTaskPlanning.getListConfirmation());
+			timeNodeVOS.add(listConfirmationVO);
 
+			TimeNodeVO legalTaskConfirmationVO = new TimeNodeVO();
+			legalTaskConfirmationVO.setName(ProjectTaskPlanningNameEnum.LEGAL_TASK_CONFIRMATION.getName());
+			legalTaskConfirmationVO.setTime(projectTaskPlanning.getLegalTaskConfirmation());
+			timeNodeVOS.add(legalTaskConfirmationVO);
 
-		for(int i=dateList.size();i>0;i++){
+			TimeNodeVO designDeadlineVO = new TimeNodeVO();
+			designDeadlineVO.setName(ProjectTaskPlanningNameEnum.DESIGN_DEADLINE.getName());
+			designDeadlineVO.setTime(projectTaskPlanning.getDesignDeadline());
+			timeNodeVOS.add(designDeadlineVO);
 
+			TimeNodeVO prehomoDeadlineVO = new TimeNodeVO();
+			prehomoDeadlineVO.setName(ProjectTaskPlanningNameEnum.PREHOMO_DEADLINE.getName());
+			prehomoDeadlineVO.setTime(projectTaskPlanning.getPrehomoDeadline());
+			timeNodeVOS.add(prehomoDeadlineVO);
+
+			TimeNodeVO attestationStartTimeVO = new TimeNodeVO();
+			attestationStartTimeVO.setName(ProjectTaskPlanningNameEnum.ATTESTATION_START_TIME.getName());
+			attestationStartTimeVO.setTime(projectTaskPlanning.getAttestationStartTime());
+			timeNodeVOS.add(attestationStartTimeVO);
+
+			TimeNodeVO attestationEndTimeVO = new TimeNodeVO();
+			attestationEndTimeVO.setName(ProjectTaskPlanningNameEnum.ATTESTATION_END_TIME.getName());
+			attestationEndTimeVO.setTime(projectTaskPlanning.getAttestationEndTime());
+			timeNodeVOS.add(attestationEndTimeVO);
+
+			TimeNodeVO verifyDeadlineVO = new TimeNodeVO();
+			verifyDeadlineVO.setName(ProjectTaskPlanningNameEnum.VERIFY_DEADLINE.getName());
+			verifyDeadlineVO.setTime(projectTaskPlanning.getVerifyDeadline());
+			timeNodeVOS.add(verifyDeadlineVO);
+
+			// 排序
+			Collections.sort(timeNodeVOS, listConfirmationVO);
 		}
-		return getById(projectId);
+		return timeNodeVOS;
-    }
+	}
 
     /**
 	 * 列表查询

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/TimeNodeVO.java

@@ -0,0 +1,21 @@
+package com.jero.modules.project.vo;
+
+import lombok.Data;
+
+import java.util.Comparator;
+import java.util.Date;
+
+@Data
+public class TimeNodeVO implements Comparator<TimeNodeVO> {
+    private String name;
+    private Date time;
+
+    @Override
+    public int compare(TimeNodeVO o1, TimeNodeVO o2) {
+        if(o1.getTime() .after( o2.getTime())){
+            return 1;
+        }else{
+            return -1;
+        }
+    }
+}