From 3ba874dfe879137f7e7694faa206478fe08b034b Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Sat, 2 Jul 2022 09:52:01 +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-=E9=85=8D=E7=BD=AE=E6=A0=87=E8=AF=86=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsManifestEOController.java           | 18 +++++++
 .../impl/ParamsManifestEOServiceImpl.java     | 51 -------------------
 2 files changed, 18 insertions(+), 51 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java
index 6cc8feeff..bead11a58 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java
@@ -10,6 +10,7 @@ import com.jero.common.system.base.controller.JeroController;
 import com.jero.modules.cert.collect.entity.ParamsConfigEO;
 import com.jero.modules.cert.collect.entity.ParamsManifestEO;
 import com.jero.modules.cert.collect.enums.ManifestStateEnum;
+import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService;
 import com.jero.modules.cert.collect.service.IParamsConfigEOService;
 import com.jero.modules.cert.collect.service.IParamsManifestEOService;
 import com.jero.modules.cert.collect.vo.ParamsManifestHistoryVO;
@@ -48,6 +49,9 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
 	@Autowired
 	private IParamsManifestEOService paramsManifestEOService;
 
+	@Autowired
+	private IParamsCollectManifestEOService paramsCollectManifestEOService;
+
 	@Autowired
 	private IParamsConfigEOService paramsConfigEOService;
 
@@ -123,6 +127,20 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
 		return Result.OK(true); // 无重复
 	}
 
+	/**
+	 * 获取配置标识
+	 * 判断是否可新增配置，清单参数项状态为 待发起、变更时，可添加配置
+	 * @return
+	 */
+	@AutoLog(value = "参数清单-获取配置标识")
+	@ApiOperation(value="参数清单-获取配置标识", notes="参数清单-获取配置标识")
+	@GetMapping(value = "/getConfigFlag")
+//	@RequiresPermissions("params:manifest:page")
+	public Result<?> getManifestConfigFlag(@RequestParam(name="paramsManifestId", required = true) String paramsManifestId) {
+		boolean configFlag = paramsCollectManifestEOService.getManifestConfigFlag(paramsManifestId);
+		return Result.OK(configFlag);
+	}
+
 	/**
 	 *   添加
 	 *
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 08e7848b1..730bc2942 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
@@ -290,60 +290,9 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 	@Override
 	public IPage pageInfo(IPage page, ParamsManifestEO paramsManifestEO) {
 		IPage rows = paramsManifestEOMapper.pageInfo(page, paramsManifestEO);
-		// 根据参数项状态更新清单状态
-		List<ParamsManifestEO> paramsManifestEOList = rows.getRecords();
-		if (CollectionUtil.isNotEmpty(paramsManifestEOList)) {
-			List<String> manifestIdList = paramsManifestEOList.stream().map(ParamsManifestEO::getId).collect(Collectors.toList());
-			Map<String, List<ParamsCollectManifestEO>> manifestMap = paramsCollectManifestEOService.queryByManifestIdList(manifestIdList);
-
-			paramsManifestEOList.forEach(manifestEO -> {
-			/*Map<String, Object> map = paramsCollectManifestEOService.isCollectFinished(manifestEO.getId());
-			Boolean finish = (Boolean) map.get("finish");
-			Date time = (Date) map.get("time");
-			if (finish) {
-				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);
-
-			} else {
-				if (ManifestStateEnum.FINISHED.getValue().equals(manifestEO.getState())) {
-					// 更新清单状态和完成时间
-					ParamsManifestEO updateParamsManifestEO = new ParamsManifestEO();
-					updateParamsManifestEO.setId(manifestEO.getId());
-					updateParamsManifestEO.setState(ManifestStateEnum.COLLECTING.getValue());
-					updateParamsManifestEO.setFinishTime(null);
-					updateById(updateParamsManifestEO);
-				}
-				manifestEO.setState(ManifestStateEnum.COLLECTING.getValue());
-				manifestEO.setFinishTime(null);
-
-			}*/
-
-				// 添加配置标识，清单参数项状态为 待发起、变更时，可添加配置
-				boolean configFlag = getManifestConfigFlag(manifestMap.get(manifestEO.getId()));
-				manifestEO.setConfigFlag(configFlag);
-
-			});
-		}
 		return rows;
 	}
 
-	private boolean getManifestConfigFlag(List<ParamsCollectManifestEO> list) {
-		int number = (int) list.stream().filter(e->CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState())
-				|| CollectManifestStateEnum.CHANGE.getValue().equals(e.getState())).count();
-		if (number == list.size() && list.size() > 0) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
 	/**
 	 * 变更扩展
 	 * 仅能选择一条进行变更扩展