WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加统计节点MP，地方批准

Browse Source
This commit is contained in:
高嵩
2023-06-09 18:19:38 +08:00
parent e3684bb528
commit 8e5b2aa962
3 changed files with 85 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskPlanning.java
+16
View File
@@ -147,4 +147,20 @@ public class ProjectTaskPlanning implements Serializable {
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date eight;
/**mp*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date mp;
/**地方批准1*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date localapproval1;
/**地方批准2*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date localapproval2;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java
+3
View File
@@ -18,6 +18,8 @@ public enum ProjectTaskPlanningNameEnum {
ATTESTATION_START_TIME("认证开始","Certification Start"),// name:认证开始 value:Certification begins
VERIFY_DEADLINE("验证核查","Verification And Verification"),
CERTIFICATION_SUBMISSION("认证提交","Certification Submission"),
LOCALAPPROVAL_1("地方批准1","Local Approval 1"),
LOCALAPPROVAL_2("地方批准2","Local Approval 2"),
G_ZERO("G0","G0"),
G_ONE("G1","G1"),
G_TWO("G2","G2"),
@@ -26,6 +28,7 @@ public enum ProjectTaskPlanningNameEnum {
G_FIVE("G5","G5"),
G_SIX("G6","G6"),
G_SEVEN("G7","G7"),
G_MP("MP","MP"),
// VERIFY_DEADLINE("验证符合性确认","Validation Compliance Confirmation"),
;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java
+66
View File
@@ -299,6 +299,52 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
timeNodeVOS.add(certificationSubmissionVo);
}
//地方批准1
if(ObjectUtils.isNotEmpty(projectTaskPlanning.getLocalapproval1())){
TimeNodeVO certificationSubmissionVo = new TimeNodeVO();
if(CutEnum.CN.getValue().equals(cut)){
certificationSubmissionVo.setName(ProjectTaskPlanningNameEnum.LOCALAPPROVAL_1.getName());
}else{
certificationSubmissionVo.setName(ProjectTaskPlanningNameEnum.LOCALAPPROVAL_1.getValue());
}
certificationSubmissionVo.setTime(projectTaskPlanning.getLocalapproval1());
if(projectTaskPlanning.getLocalapproval1().after(trueNow)){
certificationSubmissionVo.setStatus(PlanStatusEnum.LESS_THAN_TIME.getValue());
}else if(projectTaskPlanning.getLocalapproval1().before(trueNow)){
certificationSubmissionVo.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue());
}else{
certificationSubmissionVo.setStatus(PlanStatusEnum.ON_GOING.getValue());
}
certificationSubmissionVo.setProjectId(projectTaskPlanning.getProjectId());
certificationSubmissionVo.setG(false);
timeNodeVOS.add(certificationSubmissionVo);
}
//地方批准2
if(ObjectUtils.isNotEmpty(projectTaskPlanning.getLocalapproval2())){
TimeNodeVO certificationSubmissionVo = new TimeNodeVO();
if(CutEnum.CN.getValue().equals(cut)){
certificationSubmissionVo.setName(ProjectTaskPlanningNameEnum.LOCALAPPROVAL_2.getName());
}else{
certificationSubmissionVo.setName(ProjectTaskPlanningNameEnum.LOCALAPPROVAL_2.getValue());
}
certificationSubmissionVo.setTime(projectTaskPlanning.getLocalapproval2());
if(projectTaskPlanning.getLocalapproval2().after(trueNow)){
certificationSubmissionVo.setStatus(PlanStatusEnum.LESS_THAN_TIME.getValue());
}else if(projectTaskPlanning.getLocalapproval2().before(trueNow)){
certificationSubmissionVo.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue());
}else{
certificationSubmissionVo.setStatus(PlanStatusEnum.ON_GOING.getValue());
}
certificationSubmissionVo.setProjectId(projectTaskPlanning.getProjectId());
certificationSubmissionVo.setG(false);
timeNodeVOS.add(certificationSubmissionVo);
}
// G0 - G7
if(ObjectUtils.isNotEmpty(projectTaskPlanning.getZero())){
TimeNodeVO timeNodeVO = new TimeNodeVO();
@@ -453,6 +499,26 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
timeNodeVOS.add(timeNodeVO);
}
if(ObjectUtils.isNotEmpty(projectTaskPlanning.getMp())){
TimeNodeVO timeNodeVO = new TimeNodeVO();
if(CutEnum.CN.getValue().equals(cut)){
timeNodeVO.setName(ProjectTaskPlanningNameEnum.G_MP.getName());
}else{
timeNodeVO.setName(ProjectTaskPlanningNameEnum.G_MP.getValue());
}
timeNodeVO.setTime(projectTaskPlanning.getMp());
if(projectTaskPlanning.getMp().after(trueNow)){
timeNodeVO.setStatus(PlanStatusEnum.LESS_THAN_TIME.getValue());
}else if(projectTaskPlanning.getMp().before(trueNow)){
timeNodeVO.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue());
}else{
timeNodeVO.setStatus(PlanStatusEnum.ON_GOING.getValue());
}
timeNodeVO.setProjectId(projectTaskPlanning.getProjectId());
timeNodeVO.setG(true);
timeNodeVOS.add(timeNodeVO);
}
// 排序
// Collections.sort(timeNodeVOS, listConfirmationVO);
timeNodeVOS = timeNodeVOS.stream()