From 846a5878ba805c7099811038419a9757c00d3d88 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 19 May 2022 15:25:58 +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-=E5=8F=98=E6=9B=B4=E6=89=A9=E5=B1=95?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ParamsManifestEOServiceImpl.java     | 40 ++++++++++++++-----
 .../ParamsManifestHistoryEOServiceImpl.java   |  6 ---
 2 files changed, 29 insertions(+), 17 deletions(-)

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 9366a6495..ffa2ecf50 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
@@ -234,16 +234,31 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 			Boolean finish = (Boolean) map.get("finish");
 			Date time = (Date) map.get("time");
 			if (finish) {
-				manifestEO.setState(ManifestStateEnum.FINISHED.getValue());
-				manifestEO.setFinishTime(time);
+				if (ManifestStateEnum.COLLECTING.getValue().equals(manifestEO.getState())) {
+					manifestEO.setState(ManifestStateEnum.FINISHED.getValue());
+					manifestEO.setFinishTime(time);
 
-				// 更新清单状态和完成时间
-				ParamsManifestEO updateParamsManifestEO = new ParamsManifestEO();
-				updateParamsManifestEO.setId(manifestEO.getId());
-				updateParamsManifestEO.setState(ManifestStateEnum.FINISHED.getValue());
-				updateParamsManifestEO.setFinishTime(time);
-				updateById(updateParamsManifestEO);
+					// 更新清单状态和完成时间
+					ParamsManifestEO updateParamsManifestEO = new ParamsManifestEO();
+					updateParamsManifestEO.setId(manifestEO.getId());
+					updateParamsManifestEO.setState(ManifestStateEnum.FINISHED.getValue());
+					updateParamsManifestEO.setFinishTime(time);
+					updateById(updateParamsManifestEO);
+				}
+			} else {
+				if (ManifestStateEnum.FINISHED.getValue().equals(manifestEO.getState())) {
+					manifestEO.setState(ManifestStateEnum.COLLECTING.getValue());
+					manifestEO.setFinishTime(null);
+
+					// 更新清单状态和完成时间
+					ParamsManifestEO updateParamsManifestEO = new ParamsManifestEO();
+					updateParamsManifestEO.setId(manifestEO.getId());
+					updateParamsManifestEO.setState(ManifestStateEnum.FINISHED.getValue());
+					updateParamsManifestEO.setFinishTime(time);
+					updateById(updateParamsManifestEO);
+				}
 			}
+
 		});
 
 		return rows;
@@ -270,7 +285,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 			throw new JeroBootException("清单收集中，无法发起变更！");
 		}
 		// 查询项目引用的模板是否是最新版本
-		Integer newestVersion = paramsInfoPublishEOService.getNewestVersionByParamsTemplateId(id);
+		Integer newestVersion = paramsInfoPublishEOService.getNewestVersionByParamsTemplateId(paramsManifestEO.getParamsTemplateId());
 		if (newestVersion == null) {
 			throw new JeroBootException("查询不到模板最新发布版本！");
 		}
@@ -280,7 +295,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 		}
 
 		// 查询最新版模板参数项
-		List<ParamsInfoPublishEO> newParamsInfoPublishEOList = paramsInfoPublishEOService.getListByPublishVersion(id, newestVersion);
+		List<ParamsInfoPublishEO> newParamsInfoPublishEOList = paramsInfoPublishEOService.getListByPublishVersion(paramsManifestEO.getParamsTemplateId(), newestVersion);
 		// 查询项目所有参数项（这时候参数项都收集完了）
 		ParamsCollectManifestEO paramsCollectManifestEO = new ParamsCollectManifestEO();
 		paramsCollectManifestEO.setParamsManifestId(id);
@@ -331,9 +346,12 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 		}
 
 		// 删除参数项配置数据
-		paramsConfigDataEOService.deleteByParamsCollectManifestIdList(delCollectManifestIdList);
+		if (CollectionUtil.isNotEmpty(delCollectManifestIdList)) {
+			paramsConfigDataEOService.deleteByParamsCollectManifestIdList(delCollectManifestIdList);
+		}
 		// 更新项目参数项
 		paramsCollectManifestEOService.updateBatchById(updateCollectManifestEOList);
+
 		// 参数清单版本加 1
 		ParamsManifestEO updateManifestEO = new ParamsManifestEO();
 		updateManifestEO.setId(id);
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestHistoryEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestHistoryEOServiceImpl.java
index 57552b4d1..5e1167dd2 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestHistoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestHistoryEOServiceImpl.java
@@ -126,12 +126,6 @@ public class ParamsManifestHistoryEOServiceImpl extends ServiceImpl<ParamsManife
 
 		// 添加清单
 		paramsManifestHistoryEOService.save(paramsManifestHistoryEO);
-
-		// 参数清单版加 1
-		ParamsManifestEO updateParamsManifestEO = new ParamsManifestEO();
-		updateParamsManifestEO.setId(paramsManifestEO.getId());
-		updateParamsManifestEO.setVersion(paramsManifestEO.getVersion() + 1);
-		paramsManifestEOService.updateById(updateParamsManifestEO);
 	}
 
 	@Override