From aef19b32b392517f8878b5fdce0a165c6b09971f Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Thu, 21 Apr 2022 18:59:35 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E8=AE=BE=E7=BD=AE=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLibraryBaseController.java | 3 +- .../service/IProjectLibraryBaseService.java | 3 +- .../impl/ProjectLibraryBaseServiceImpl.java | 7 +- .../impl/ProjectTaskPlanningServiceImpl.java | 90 ++++++++++++------- 4 files changed, 67 insertions(+), 36 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java index b8db3e277..dec40b212 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java @@ -16,6 +16,7 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.text.ParseException; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -70,7 +71,7 @@ public class ProjectLibraryBaseController extends JeroController add(@Validated @RequestBody ProjectLibraryBase projectLibraryBase) { + public Result add(@Validated @RequestBody ProjectLibraryBase projectLibraryBase) throws ParseException { projectLibraryBaseService.add(projectLibraryBase); return Result.OK("添加成功！"); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java index a1696c568..dedae398b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.project.entity.ProjectLibraryBase; +import java.text.ParseException; import java.util.List; import java.util.Map; @@ -21,7 +22,7 @@ public interface IProjectLibraryBaseService extends IService * @param projectLibraryBase * @return */ - void add(ProjectLibraryBase projectLibraryBase); + void add(ProjectLibraryBase projectLibraryBase) throws ParseException; /** * 更新 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 501162bc0..c0a79ebdb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -18,6 +18,7 @@ import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.text.ParseException; import java.util.*; import java.util.stream.Collectors; @@ -40,6 +41,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl timeNodeVOS = new ArrayList<>(); 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); - - 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); + if(StringUtils.isNotBlank(projectTaskPlanning.getListConfirmation().toString())) { + listConfirmationVO.setName(ProjectTaskPlanningNameEnum.LIST_CONFIRMATION.getName()); + listConfirmationVO.setTime(projectTaskPlanning.getListConfirmation()); + timeNodeVOS.add(listConfirmationVO); + } + if(!StringUtils.isEmpty(projectTaskPlanning.getLegalTaskConfirmation().toString())) { + TimeNodeVO legalTaskConfirmationVO = new TimeNodeVO(); + legalTaskConfirmationVO.setName(ProjectTaskPlanningNameEnum.LEGAL_TASK_CONFIRMATION.getName()); + legalTaskConfirmationVO.setTime(projectTaskPlanning.getLegalTaskConfirmation()); + timeNodeVOS.add(legalTaskConfirmationVO); + } + if(StringUtils.isNotBlank(projectTaskPlanning.getDesignDeadline().toString())) { + TimeNodeVO designDeadlineVO = new TimeNodeVO(); + designDeadlineVO.setName(ProjectTaskPlanningNameEnum.DESIGN_DEADLINE.getName()); + designDeadlineVO.setTime(projectTaskPlanning.getDesignDeadline()); + timeNodeVOS.add(designDeadlineVO); + } + if(StringUtils.isNotBlank(projectTaskPlanning.getPrehomoDeadline().toString())) { + TimeNodeVO prehomoDeadlineVO = new TimeNodeVO(); + prehomoDeadlineVO.setName(ProjectTaskPlanningNameEnum.PREHOMO_DEADLINE.getName()); + prehomoDeadlineVO.setTime(projectTaskPlanning.getPrehomoDeadline()); + timeNodeVOS.add(prehomoDeadlineVO); + } + if(StringUtils.isNotBlank(projectTaskPlanning.getAttestationStartTime().toString())) { + TimeNodeVO attestationStartTimeVO = new TimeNodeVO(); + attestationStartTimeVO.setName(ProjectTaskPlanningNameEnum.ATTESTATION_START_TIME.getName()); + attestationStartTimeVO.setTime(projectTaskPlanning.getAttestationStartTime()); + timeNodeVOS.add(attestationStartTimeVO); + } + if(StringUtils.isNotBlank(projectTaskPlanning.getAttestationEndTime().toString())) { + TimeNodeVO attestationEndTimeVO = new TimeNodeVO(); + attestationEndTimeVO.setName(ProjectTaskPlanningNameEnum.ATTESTATION_END_TIME.getName()); + attestationEndTimeVO.setTime(projectTaskPlanning.getAttestationEndTime()); + timeNodeVOS.add(attestationEndTimeVO); + } + if(StringUtils.isNotBlank(projectTaskPlanning.getVerifyDeadline().toString())) { + TimeNodeVO verifyDeadlineVO = new TimeNodeVO(); + verifyDeadlineVO.setName(ProjectTaskPlanningNameEnum.VERIFY_DEADLINE.getName()); + verifyDeadlineVO.setTime(projectTaskPlanning.getVerifyDeadline()); + timeNodeVOS.add(verifyDeadlineVO); + } // 排序 Collections.sort(timeNodeVOS, listConfirmationVO); @@ -142,4 +154,18 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl