From 9ddd197ea5c4aab7cd92f7648dce8084a1d41390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 8 Feb 2023 14:04:25 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E7=AC=A6=E5=90=88?=
 =?UTF-8?q?=E6=80=A7=E6=B5=81=E7=A8=8B=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?-=E6=88=AA=E8=87=B3=E6=97=B6=E9=97=B4=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectLawsInventoryEOServiceImpl.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 2a462f93f..cdcfad0bc 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
@@ -3173,12 +3173,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
             cnContentLower = "项目: " + PRN +
                     "\n法规: " + LAW_CN +
                     "\n发起人: " + sysUser.getUsername() +
-                    "\n截止时间: " + sdf.format(projectLawsInventoryEO.getVerifyDueDate());
+                    "\n截止时间: " + sdf.format(projectLawsInventoryEO.getDesignDueDate());
             enContentUpper = "Hello! "+ sysUser.getUsername() +" has completed the task. Please check and review it";
             enContentLower = "Project: " + PRN +
                     "\nRegulation No: " + LAW_EN +
                     "\nInitiator: " + sysUser.getUsername() +
-                    "\nDue Date: " + sdf.format(projectLawsInventoryEO.getVerifyDueDate());
+                    "\nDue Date: " + sdf.format(projectLawsInventoryEO.getDesignDueDate());
             color = MsgColorEnum.GREEN.getValue();
 
 			//feishuMsgVo.setAssignee(sysUser.getUsername());

From 636fa894364ee96c9c63bba0b55a97e5be022586 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 8 Feb 2023 15:43:06 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=AC=A6=E5=90=88=E6=80=A7=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E5=8F=91=E9=80=81=E9=A3=9E=E4=B9=A6=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E6=97=B6=20=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E6=8B=BC=E6=8E=A5=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectLawsInventoryEOServiceImpl.java       | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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 cdcfad0bc..1b02e6e9c 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
@@ -3384,9 +3384,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						+ JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink()
 						+ projectLibraryBase.getId()
 						+ JumpLinkEnum.DESIGN_AFFIRM_LINK.getType()
-						+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
-						+ projectYearNameInfoEO.getYearName()
-						+ projectLibraryBase.getTargetMarket();
+						+ "&projectName=" + PRN;
 				//href = "<a href='"
 				//		+ JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType()
 				//		+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"

From 014c834e9468f96aae19306de740f6000b015ffd Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 9 Feb 2023 10:21:54 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E7=A6=85=E9=81=9364916=20=E5=8F=82?=
 =?UTF-8?q?=E8=80=83=E5=8F=82=E6=95=B0=E5=88=97=E8=A1=A8=E5=A4=B4=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ParamsCollectManifestEOServiceImpl.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 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 47e547cb5..b0365d022 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
@@ -1384,7 +1384,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 						map.put("flag", true); // 标识
 						map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName));
 						String[] references = projectName.split("-");
-						map.put("db_field_txt", references[0] + "-" + references[1] + "-" + paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldTxt());//字段中文名
+						// map.put("db_field_txt", references[0] + "-" + references[1] + "-" + paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldTxt());//字段中文名
+						map.put("db_field_txt", projectName + "-" + paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldTxt());//字段中文名
 						map.put("db_field_id", paramsManifestEO.getReferencesColId());
 						map.put("references_col", true);
 					} else {
@@ -1400,7 +1401,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 						map.put("flag", true); // 标识
 						map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName));
 						String[] references = projectName.split("-");
-						map.put("db_field_txt", references[0] + "-" + references[1] + "-" + paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldEnName());//字段中文名
+						// map.put("db_field_txt", references[0] + "-" + references[1] + "-" + paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldEnName());//字段中文名
+						map.put("db_field_txt", projectName + "-" + paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldEnName());//字段中文名
 						map.put("db_field_id", paramsManifestEO.getReferencesColId());
 						map.put("references_col", true);
 

From abd8f44d262ec5f45745749a3097bd4d052d9a66 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 9 Feb 2023 11:26:38 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=94=B6=E9=9B=86?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95-=E8=BF=94=E5=9B=9E=E8=A1=A8=E5=A4=B4?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=A0=87=E8=AF=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 b0365d022..707a89e12 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
@@ -1413,6 +1413,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 					map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名
 				}
 			}
+			if(StringUtils.equals(dbFieldName,"nio_number")
+					|| StringUtils.equals(dbFieldName,"duty_territory")
+					|| StringUtils.equals(dbFieldName,"sdt")
+					|| StringUtils.equals(dbFieldName,"dre")
+					|| StringUtils.equals(dbFieldName,"deadline")
+			){
+				map.put("sort", "true");
+			}
 			list.add(map);
 		}