From 3ecfe6accd042e9473d197edd842721f9514f260 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 21 Jul 2022 17:19:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E9=A1=B9?=
 =?UTF-8?q?=E6=94=B6=E9=9B=86=E6=B8=85=E5=8D=95-=E4=B8=8B=E5=8F=91?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 7db02d212..f0ea1ec22 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -1393,7 +1393,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		paramsCollectManifestEOList = paramsCollectManifestEOList.stream().sorted(Comparator.comparing(ParamsCollectManifestBaseEO::getNioNumber)).collect(Collectors.toList()); // 按NIO编号升序
  		for (ParamsCollectManifestEO paramsCollectManifestEO : paramsCollectManifestEOList) {
 			// 判断参数项状态
-			if (CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(paramsCollectManifestEO.getState())) {
+			if (CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(paramsCollectManifestEO.getState())
+					|| CollectManifestStateEnum.SDT_BACK.getValue().equals(paramsCollectManifestEO.getState())
+					|| CollectManifestStateEnum.CHANGE.getValue().equals(paramsCollectManifestEO.getState())) {
 				if (StringUtils.isNotBlank(paramsCollectManifestEO.getSdt())) {
 					ParamsCollectManifestEO updateEO = new ParamsCollectManifestEO();
 					updateEO.setId(paramsCollectManifestEO.getId());
@@ -1517,7 +1519,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		List<ParamsCollectManifestEO> paramsCollectManifestEOList = list(queryWrapper);
 		for (ParamsCollectManifestEO paramsCollectManifestEO : paramsCollectManifestEOList) {
 			// 判断参数项状态
-			if (CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(paramsCollectManifestEO.getState())) {
+			if (CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(paramsCollectManifestEO.getState())
+					|| CollectManifestStateEnum.SDT_BACK.getValue().equals(paramsCollectManifestEO.getState())
+					|| CollectManifestStateEnum.CHANGE.getValue().equals(paramsCollectManifestEO.getState())) {
 				if (StringUtils.isNotBlank(paramsCollectManifestEO.getSdt())) {
 					ParamsCollectManifestEO updateEO = new ParamsCollectManifestEO();
 					updateEO.setId(paramsCollectManifestEO.getId());