From 8e5b2aa962b543f7571468fa9855b02305181342 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Fri, 9 Jun 2023 18:19:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9MP=EF=BC=8C=E5=9C=B0=E6=96=B9=E6=89=B9?=
 =?UTF-8?q?=E5=87=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/entity/ProjectTaskPlanning.java   | 16 +++++
 .../enums/ProjectTaskPlanningNameEnum.java    |  3 +
 .../impl/ProjectTaskPlanningServiceImpl.java  | 66 +++++++++++++++++++
 3 files changed, 85 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskPlanning.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskPlanning.java
index 32324c8c2..ef06a26d1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskPlanning.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskPlanning.java
@@ -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;
+
 }
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 767676d4c..3905ec322 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
@@ -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"),
     ;
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 478d48fd1..2130aae07 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
@@ -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()

From 84209da95e4d357ad493aaad3a215379eef779bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Mon, 12 Jun 2023 15:35:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ParamsCollectManifestEOServiceImpl.java   | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index c33192062..37c66f4c9 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -3789,9 +3789,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                         + "3.If the control type is drop-down multi-selection, multiple entries are separated by English or Chinese exclamation points\n"
                         + "4.Configuration data is filled in according to the sequence of control type, and if there are multiple control types, it needs to be separated by \"#\"\n"
                         + "5.When the control contains multiple component types, if you fill in only some of the information, you need to distinguish blank data with \"#\"\n"
-                        + "6.When filling in, start in column G and do not modify information such as NIO number and parameter name\n"
-                        + "7.File fields are file type, must create a folder in the directory of the same level as the file with the name of the nio number and place the file in the folder. Assume that the file is saved in the A number B.pdf,Should fill in A/B.pdf\n"
-                        + "8.When importing into the system, you need to put the Excel into a folder, place other attachment files correctly as required, and finally compress the folder into zip format for import\n";
+                        + "6.If the value contains multiple parameters, copy the row, insert and paste the contents of the row, and enter the corresponding parameter values in the newly pasted row\n"
+                        + "7.When filling in, start in column G and do not modify information such as NIO number and parameter name\n"
+                        + "8.File fields are file type, must create a folder in the directory of the same level as the file with the name of the nio number and place the file in the folder. Assume that the file is saved in the A number B.pdf,Should fill in A/B.pdf\n"
+                        + "9.When importing into the system, you need to put the Excel into a folder, place other attachment files correctly as required, and finally compress the folder into zip format for import\n";
             } else {
                 explanation = "填写说明\n"
                         + "1.导入数据从第三行开始,第一行为表头,第二行为填写说明,第三行是示例数据，需要从第四行开始填写\n"
@@ -3799,9 +3800,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                         + "3.控件类型为下拉多选时，填写多个时采用英文或中文感叹号分割\n"
                         + "4.配置数据按照控件类型顺序进行填写，若存在多种控件类型填写时需要通过“#”隔开\n"
                         + "5.控件中包含多种组件类型时，若只填写其中部分信息需要用#区分空白数据\n"
-                        + "6.填写时从G列开始，请勿修改NIO编号和参数名称等信息\n"
-                        + "7.上传附件为文件属性,填写时需要在本文件同级目录下以NIO编号为名称建立文件夹,并在文件夹下放置文件且该文件夹下只能有一层级,假设在NIO.XXXX下放置了B.pdf,则应填写NIO.XXXX/B.pdf\n"
-                        + "8.导入系统时，需要将该Excel放入文件夹内，并按照要求正确放置其他附件文件，最后将文件夹压缩为zip格式进行导入\n";
+                        + "6.填写值中包含多值参数时，需要复制行并插入粘贴行内容，并在新粘贴的行内填写相对应配置的参数值\n"
+                        + "7.填写时从G列开始，请勿修改NIO编号和参数名称等信息\n"
+                        + "8.上传附件为文件属性,填写时需要在本文件同级目录下以NIO编号为名称建立文件夹,并在文件夹下放置文件且该文件夹下只能有一层级,假设在NIO.XXXX下放置了B.pdf,则应填写NIO.XXXX/B.pdf\n"
+                        + "9.导入系统时，需要将该Excel放入文件夹内，并按照要求正确放置其他附件文件，最后将文件夹压缩为zip格式进行导入\n";
             }
             XSSFRow row2 = sheetItems.createRow(1);
             row2.setHeight((short) 2500);