From 4b1d2fca5c8020c60c7e785a045e058c9b0698f4 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 26 May 2022 15:29:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B8=85=E5=8D=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=20-=20=E4=BD=BF=E7=94=A8stream?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=B5=81=E8=BF=9B=E8=A1=8C=E5=A4=9A=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=8E=92=E5=BA=8F=EF=BC=88=E6=B3=95=E8=A7=84=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=97=A5=E6=9C=9F=E3=80=81=E6=B3=95=E8=A7=84=E5=8F=B7?= =?UTF-8?q?=EF=BC=89=E3=80=82=20=E6=B5=81=E7=A8=8B=E4=B8=AD=E6=B6=89?= =?UTF-8?q?=E5=8F=8A=E5=88=B0=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF=20-=20?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=20(project=20name)=20=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/entity/ProjectTaskInventoryEO.java | 4 ++++ .../project/enums/DesignComplianceStatusEnum.java | 1 + .../modules/project/job/InventoryAffirmJob.java | 4 ++-- .../com/jero/modules/project/job/PrehomoJob.java | 4 ++-- .../modules/project/job/VerifyComplianceJob.java | 4 ++-- .../modules/project/job/designComplianceJob.java | 4 ++-- .../impl/ProjectLawsInventoryEOServiceImpl.java | 10 +++++----- .../ProjectTaskInventoryDetailEOServiceImpl.java | 6 +++--- .../impl/ProjectTaskInventoryEOServiceImpl.java | 14 ++++++++++---- 9 files changed, 31 insertions(+), 20 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java index 814481dcc..3b62cb7c8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java @@ -303,4 +303,8 @@ public class ProjectTaskInventoryEO implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "流程结束时间 最后的时间") private Date processEndTime; + + /**法规清单创建日期，任务清单中需要根据此字段进行倒序排序**/ + @TableField(exist = false) + private Date lawsInventoryCreateTime; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/DesignComplianceStatusEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/DesignComplianceStatusEnum.java index d3b281492..2f4d91196 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/DesignComplianceStatusEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/DesignComplianceStatusEnum.java @@ -10,6 +10,7 @@ public enum DesignComplianceStatusEnum { TO_SUBMIT("待提交","To submit"), TO_REVIEW("待审查","To approve"), REVIEW_COMPLETED("审查完成","Complete"), + REVIEW_THE_RETURN("审查退回","Returned"), ; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java index 5bb417eb4..305a8891d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java @@ -119,7 +119,7 @@ public class InventoryAffirmJob implements Job { // XXX . String msgContentEN = "The remaining processing time for the regulation list confirmation of" + projectNameInfoEO.getProjectName() - + "(project name) is 3 days. Please check and handle it in time."; + + " is 3 days. Please check and handle it in time."; //发送消息 projectLawsInventoryEOService.sendMessage(msgContentEN,threeDaysUserIdList,projectLibraryBase.getId()); } @@ -130,7 +130,7 @@ public class InventoryAffirmJob implements Job { /*String msgContentCN = "您" + projectLibraryBase.getProjectName() + "(项目名称)法规清单的任务今天即将结束,请及时查看处理*/ String msgContentEN = "The the regulation list confirmation of " + projectNameInfoEO.getProjectName() - + "(project name) is coming to an end today. Please check and deal with it in time"; + + " is coming to an end today. Please check and deal with it in time"; //发送消息 projectLawsInventoryEOService.sendMessage(msgContentEN,currentDaysUserIdList,projectLibraryBase.getId()); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java index b78a7822c..00198d3e0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java @@ -125,7 +125,7 @@ public class PrehomoJob implements Job { //The remaining processing time for the Pre-Homo confirmation of GB 7258 in XXX (project name) is 3 days. Please check and handle it in time. String msgContentEN = "The remaining processing time for the Pre-Homo confirmation of " + projectLawsInventoryEO.getSerialNumber() + " in " + projectNameInfoEO.getProjectName() - + " (project name) is 3 days. Please check and handle it in time."; + + " is 3 days. Please check and handle it in time."; //发送消息 projectLawsInventoryEOService.sendMessage(msgContentEN,threeDaysUserIdList,projectLawsInventoryEO.getId()); } @@ -137,7 +137,7 @@ public class PrehomoJob implements Job { //The the Pre-Homo confirmation of GB 7258 in XXX (project name) is coming to an end today. Please check and deal with it in time String msgContentEN = "The the Pre-Homo confirmation of " + projectLawsInventoryEO.getSerialNumber() + " in " + projectNameInfoEO.getProjectName() - + " (project name) is coming to an end today. Please check and deal with it in time."; + + " is coming to an end today. Please check and deal with it in time."; //发送消息 projectLawsInventoryEOService.sendMessage(msgContentEN,currentDaysUserIdList,projectLawsInventoryEO.getId()); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java index 286ac52c4..6652af5eb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java @@ -125,7 +125,7 @@ public class VerifyComplianceJob implements Job { //The remaining processing time for the Verify compliance confirmation of GB 7258 in XXX (project name) is 3 days. Please check and handle it in time. String msgContentEN = "The remaining processing time for the Verify compliance confirmation of " + projectLawsInventoryEO.getSerialNumber() + " in " + projectNameInfoEO.getProjectName() - + " (project name) is 3 days. Please check and handle it in time."; + + " is 3 days. Please check and handle it in time."; //发送消息 projectLawsInventoryEOService.sendMessage(msgContentEN,threeDaysUserIdList,projectLawsInventoryEO.getId()); } @@ -137,7 +137,7 @@ public class VerifyComplianceJob implements Job { //The the Verify compliance confirmation of GB 7258 in XXX (project name) is coming to an end today. Please check and deal with it in time String msgContentEN = "The the Verify compliance confirmation of " + projectLawsInventoryEO.getSerialNumber() + " in " + projectNameInfoEO.getProjectName() - + " (project name) is coming to an end today. Please check and deal with it in time."; + + " is coming to an end today. Please check and deal with it in time."; //发送消息 projectLawsInventoryEOService.sendMessage(msgContentEN,currentDaysUserIdList,projectLawsInventoryEO.getId()); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java index b28aa9e11..0cab1726f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java @@ -121,7 +121,7 @@ public class designComplianceJob implements Job { //您XXX（项目名称）中GB 7258的设计符合性确认剩余处理时间还有3天，请及时查看处理 String msgContentEN = "The remaining processing time for the design compliance confirmation of " + projectLawsInventoryEO.getSerialNumber() + " in " + projectNameInfoEO.getProjectName() - + " (project name) is 3 days. Please check and handle it in time."; + + " is 3 days. Please check and handle it in time."; //发送消息 projectLawsInventoryEOService.sendMessage(msgContentEN,threeDaysUserIdList,projectLawsInventoryEO.getId()); } @@ -132,7 +132,7 @@ public class designComplianceJob implements Job { //您XXX（项目名称）中GB 7258的设计符合性确认任务今天即将结束，请及时查看处理 String msgContentEN = "The the design compliance confirmation of " + projectLawsInventoryEO.getSerialNumber() + " in " + projectNameInfoEO.getProjectName() - + " (project name) is coming to an end today. Please check and deal with it in time."; + + " is coming to an end today. Please check and deal with it in time."; //发送消息 projectLawsInventoryEOService.sendMessage(msgContentEN,currentDaysUserIdList,projectLawsInventoryEO.getId()); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index a10e5b221..5c85fdf26 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -981,7 +981,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl