diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskPlanningController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskPlanningController.java index 7dc8eb7cc..48d0b509a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskPlanningController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskPlanningController.java @@ -138,8 +138,9 @@ public class ProjectTaskPlanningController extends JeroController queryByProjectId(@RequestParam(name="projectId",required=true) String projectId) { - List projectTaskPlanning = projectTaskPlanningService.queryByProjectId(projectId); + public Result queryByProjectId(@RequestParam(name="projectId",required=true) String projectId, + @RequestParam(name="cut",required=true) String cut) { + List projectTaskPlanning = projectTaskPlanningService.queryByProjectId(projectId,cut); if(projectTaskPlanning==null) { return Result.error("未找到对应数据"); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java index 6e8e635d9..07e172834 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java @@ -1,21 +1,21 @@ 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("验证符合性确认截止时间"), + LIST_CONFIRMATION("法规清单确认","listConfirmation"), + LEGAL_TASK_CONFIRMATION("法规任务确认","legalTaskConfirmation"), + DESIGN_DEADLINE("设计符合性确认截止时间","designDeadline"), + PREHOMO_DEADLINE("PreHomo确认截止时间","prehomoDeadline"), + ATTESTATION_START_TIME("认证开始","attestationStartTime"), + ATTESTATION_END_TIME("认证结束","attestationEndTime"), + VERIFY_DEADLINE("验证符合性确认截止时间","verifyDeadline"), ; String name; + String value; - - ProjectTaskPlanningNameEnum(String name) { + ProjectTaskPlanningNameEnum(String name, String value) { this.name = name; - + this.value = value; } public String getName() { @@ -25,4 +25,12 @@ public enum ProjectTaskPlanningNameEnum { public void setName(String name) { this.name = name; } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskPlanningService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskPlanningService.java index a084d82f7..8cc1ff17f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskPlanningService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskPlanningService.java @@ -52,7 +52,7 @@ public interface IProjectTaskPlanningService extends IService queryByProjectId(String projectId); + List queryByProjectId(String projectId,String cut); /** * 列表查询 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java index 7cb20e77b..4b3ecf542 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java @@ -2,6 +2,7 @@ package com.jero.modules.project.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.vo.LoginUser; import com.jero.modules.project.entity.ProjectTaskPlanning; import com.jero.modules.project.enums.PlanStatusEnum; @@ -89,7 +90,7 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl queryByProjectId(String projectId) { + public List queryByProjectId(String projectId,String cut) { ProjectTaskPlanning projectTaskPlanning = projectTaskPlanningMapper.getByProjectId(projectId); List timeNodeVOS = new ArrayList<>(); TimeNodeVO listConfirmationVO=null; @@ -106,7 +107,13 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl