From 688cf6fd62c391498f6a9724ac624ab3ab6e5f7d Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 26 Sep 2023 13:56:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6=E5=90=8E=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=A6=86=E7=9B=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLawsInventoryEOServiceImpl.java    | 42 +++++++++++--------
 1 file changed, 24 insertions(+), 18 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 c8c2b6595..64e303d33 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
@@ -11897,25 +11897,31 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 							} else {
 								inventoryEO.setVerifyDutyIdName("");
 							}
-							//设计交付物类型
-							lawsInventoryEO.setDesignDeliverableType(lawsInventoryEOS.get(0).getDesignDeliverableType());
-							lawsInventoryEO.setDesignDeliverableTypeName(lawsInventoryEOS.get(0).getDesignDeliverableTypeName());
-							//验证交付物类型
-							lawsInventoryEO.setVerifyDeliverableType(lawsInventoryEOS.get(0).getVerifyDeliverableType());
-							lawsInventoryEO.setVerifyDeliverableTypeName(lawsInventoryEOS.get(0).getVerifyDeliverableTypeName());
-							//交付物类型模板
-							lawsInventoryEO.setDesignDeliverableTemplate(lawsInventoryEOS.get(0).getDesignDeliverableTemplate());
-							lawsInventoryEO.setDesignDeliverableTemplateName(lawsInventoryEOS.get(0).getDesignDeliverableTemplateName());
-
-							lawsInventoryEO.setVerifyDeliverableTemplate(lawsInventoryEOS.get(0).getVerifyDeliverableTemplate());
-							lawsInventoryEO.setVerifyDeliverableTemplateName(lawsInventoryEOS.get(0).getVerifyDeliverableTemplateName());
-
-							lawsInventoryEO.setVerifyDutyId(lawsInventoryEOS.get(0).getDesignDutyId());
-							lawsInventoryEO.setDesignDutyIdName(lawsInventoryEOS.get(0).getDesignDutyIdName());
-
-							lawsInventoryEO.setVerifyDutyId(lawsInventoryEOS.get(0).getVerifyDutyId());
-							lawsInventoryEO.setVerifyDutyIdName(lawsInventoryEOS.get(0).getVerifyDutyIdName());
 						}
+						//设计交付物类型
+						lawsInventoryEO.setDesignDeliverableType(lawsInventoryEOS.get(0).getDesignDeliverableType());
+						lawsInventoryEO.setDesignDeliverableTypeName(lawsInventoryEOS.get(0).getDesignDeliverableTypeName());
+						//验证交付物类型
+						lawsInventoryEO.setVerifyDeliverableType(lawsInventoryEOS.get(0).getVerifyDeliverableType());
+						lawsInventoryEO.setVerifyDeliverableTypeName(lawsInventoryEOS.get(0).getVerifyDeliverableTypeName());
+						//交付物类型模板
+						lawsInventoryEO.setDesignDeliverableTemplate(lawsInventoryEOS.get(0).getDesignDeliverableTemplate());
+						lawsInventoryEO.setDesignDeliverableTemplateName(lawsInventoryEOS.get(0).getDesignDeliverableTemplateName());
+
+						lawsInventoryEO.setVerifyDeliverableTemplate(lawsInventoryEOS.get(0).getVerifyDeliverableTemplate());
+						lawsInventoryEO.setVerifyDeliverableTemplateName(lawsInventoryEOS.get(0).getVerifyDeliverableTemplateName());
+
+						lawsInventoryEO.setVerifyDutyId(lawsInventoryEOS.get(0).getDesignDutyId());
+						lawsInventoryEO.setDesignDutyIdName(lawsInventoryEOS.get(0).getDesignDutyIdName());
+
+						lawsInventoryEO.setVerifyDutyId(lawsInventoryEOS.get(0).getVerifyDutyId());
+						lawsInventoryEO.setVerifyDutyIdName(lawsInventoryEOS.get(0).getVerifyDutyIdName());
+
+						lawsInventoryEO.setDesignDueDate(lawsInventoryEOS.get(0).getDesignDueDate());
+						lawsInventoryEO.setVerifyDueDate(lawsInventoryEOS.get(0).getVerifyDueDate());
+
+						lawsInventoryEO.setDesignRemark(lawsInventoryEOS.get(0).getDesignRemark());
+						lawsInventoryEO.setVerifyRemark(lawsInventoryEOS.get(0).getVerifyRemark());
 					}
 				}
 			}

From e9f11d5391582ea63f5b28604b35b7e6fbcc55b0 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 26 Sep 2023 14:04:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=20=E5=B9=B3=E5=8F=B0=E4=BB=B6=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95=E8=B0=83=E5=8F=96-=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E7=8A=B6=E6=80=81=E4=B8=BA=E4=BB=BB=E5=8A=A1=E5=BE=85?=
 =?UTF-8?q?=E5=8F=91=E8=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlatformProjectCertificationInventoryEOServiceImpl.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
index 332cabe4c..ad34b90f8 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
@@ -4496,7 +4496,8 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 
 					projectCertificationInventoryEOTemp.setId(UUID.randomUUID().toString().replace("-", ""));
 					projectCertificationInventoryEOTemp.setProjectLibraryId(projectLibraryId);
-					projectCertificationInventoryEOTemp.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+					projectCertificationInventoryEOTemp.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
+//					projectCertificationInventoryEOTemp.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
 					projectCertificationInventoryEOTemp.setCreateTime(new Date());
 					projectCertificationInventoryEOTemp.setUpdateTime(new Date());
 					projectCertificationInventoryEOTemp.setCertificationProgress(CertificationProgressEnum.NOT_START.getValue());