From a275c00067bed5fb717a3befd2f10bfcec7dfe34 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 9 Jun 2022 13:38:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95-=E5=8F=98=E6=9B=B4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cert/collect/mapper/xml/ParamsManifestEOMapper.xml    | 3 ++-
 .../impl/ParamsCollectManifestHistoryEOServiceImpl.java   | 8 ++++++++
 .../collect/service/impl/ParamsManifestEOServiceImpl.java | 3 +++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
index 5ff89355a..7d1a1e3a1 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
@@ -77,7 +77,8 @@
             pni.project_name as project_name,
             pm.params_template_id as params_template_id,
             pt.params_template_name as params_template_name,
-            pm.params_template_publish_version as params_template_publish_version
+            pm.params_template_publish_version as params_template_publish_version,
+            pm.create_time as create_time
         from params_manifest pm
         left join params_template pt on pm.params_template_id = pt.id
         left join project_library_base as plb on plb.id = pm.project_id
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java
index 05f0af194..dbeda896e 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java
@@ -133,6 +133,14 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
 				});
 			}
 
+			// 处理工程接口人
+			Map<String, Object> sdtMap = new HashMap<>();
+			sdtMap.put("id", collectManifestEO.getId());
+			sdtMap.put("state", collectManifestEO.getState());
+			sdtMap.put("dutyTerritory", StringUtils.join(dutyTerritory, ","));
+			sdtMap.put("dataValue", collectManifestEO.getSdt());
+			manifestMap.put("sdt", sdtMap);
+
 			listMap.add(manifestMap);
 		});
 
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
index b175f3671..f9d66015d 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
@@ -353,6 +353,9 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 				updateCollectManifestEO.setId(oldCollectManifestEO.getId());
 				updateCollectManifestEO.setState(CollectManifestStateEnum.WAIT_COLLECT.getValue());
 				updateCollectManifestEO.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_AFTER.getValue());
+				updateCollectManifestEO.setControlType(newControlType);
+				updateCollectManifestEO.setControlVerify(newControlVerify);
+				updateCollectManifestEO.setControlValues(newControlValues);
 
 				delCollectManifestIdList.add(oldCollectManifestEO.getId());
 			} else {