认证-参数项收集-需求变更点修改

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java

@@ -113,21 +113,21 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 	}
 
 	/**
-	 *   保存
+	 * 暂存
 	 *
 	 * @param paramsCollectManifestVO
 	 * @return
 	 */
-	@AutoLog(value = "参数项收集清单-保存")
-	@ApiOperation(value="参数项收集清单-保存", notes="参数项收集清单-保存")
+	@AutoLog(value = "参数项收集清单-暂存")
+	@ApiOperation(value="参数项收集清单-暂存", notes="参数项收集清单-暂存")
 	@PostMapping(value = "/save")
 //	@RequiresPermissions("params:collectManifest:save")
 	public Result<?> save(@RequestBody ParamsCollectManifestVO paramsCollectManifestVO) {
-		boolean isSuccess = paramsCollectManifestEOService.save(paramsCollectManifestVO.getConfigDataList());
+		boolean isSuccess = paramsCollectManifestEOService.save(paramsCollectManifestVO.getConfigDataList(), paramsCollectManifestVO.getParamsManifestId());
 		if (isSuccess) {
-			return Result.OK("保存成功！");
+			return Result.OK("暂存成功！");
 		} else {
-			return Result.error("保存失败！");
+			return Result.error("暂存失败！");
 		}
 	}
 
@@ -388,6 +388,21 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 		return Result.OK(configLableList);
 	}
 
+	/**
+	 *  冻结配置-回显已冻结的配置
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-回显已冻结的配置")
+	@ApiOperation(value="参数项收集清单-回显已冻结的配置", notes="参数项收集清单-回显已冻结的配置")
+	@PostMapping(value = "/getLockedConfigIdList")
+//	@RequiresPermissions("params:collectManifest:lock")
+	public Result<?> getLockedConfigIdList(ParamsCollectManifestVO paramsCollectManifestVO) {
+		List<String> lockedConfigIdList = paramsCollectManifestEOService.getLockedConfigIdList(paramsCollectManifestVO);
+		return Result.OK(lockedConfigIdList);
+	}
+
 	/**
 	 *  冻结配置
 	 *

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml

@@ -48,6 +48,9 @@
                 <if test="paramsCollectManifestEO.dutyTerritory !=null and paramsCollectManifestEO.dutyTerritory !=''">
                     AND duty_territory = #{paramsCollectManifestEO.dutyTerritory}
                 </if>
+                <if test="paramsCollectManifestEO.state !=null and paramsCollectManifestEO.state !=''">
+                    AND state = #{paramsCollectManifestEO.state}
+                </if>
                 <if test="paramsCollectManifestEO.paramsManifestId !=null and paramsCollectManifestEO.paramsManifestId !=''">
                     AND params_manifest_id = #{paramsCollectManifestEO.paramsManifestId}
                 </if>

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java

@@ -85,9 +85,10 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
 	/**
 	 * 保存
 	 * @param configDataList
+	 * @param paramsManifestId
 	 * @return
 	 */
-	boolean save(List<Map<String, Object>> configDataList);
+	boolean save(List<Map<String, Object>> configDataList, String paramsManifestId);
 
 	/**
 	 * 查询清单所用模版参数项列表（过滤清单已添加的参数项）
@@ -127,6 +128,9 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
 	// 配置-下拉选项
 	List<Map<String, String>> getConfigLabelList(ParamsCollectManifestVO paramsCollectManifestVO);
 
+	// 冻结配置-回显已冻结的配置
+	List<String> getLockedConfigIdList(ParamsCollectManifestVO paramsCollectManifestVO);
+
 	// 冻结配置
 	boolean lockConfigColumn(ParamsCollectManifestVO paramsCollectManifestVO);
 

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java

@@ -747,8 +747,11 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 	}
 
 	@Override
-	public boolean save(List<Map<String, Object>> configDataList) {
+	public boolean save(List<Map<String, Object>> configDataList, String paramsManifestId) {
 		List<ParamsConfigDataEO> newConfigDataEOList = new ArrayList<>();
+		List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); // 查询配置列
+		List<String> paramsConfigIdList = paramsConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList());
+		List<ParamsConfigDataEO> paramsConfigDataEOList = paramsConfigDataEOService.queryListByConfigIdList(paramsConfigIdList); // 查询所有配置数据
 
 		// 处理数据
 		for (Map<String, Object> map : configDataList) {
@@ -768,7 +771,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 				List<Map<String, Object>> paramsConfigDataVOList = (List<Map<String, Object>>) paramsConfigDataMap.get("list");
 
 				// 判断是新增还是修改
-				ParamsConfigDataEO oldConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigEOId, paramsCollectManifestId);
+//				ParamsConfigDataEO oldConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigEOId, paramsCollectManifestId);
+				ParamsConfigDataEO oldConfigDataEO = getConfigDataEOByConfigIdAndCollectManifestId(paramsConfigEOId, paramsCollectManifestId,paramsConfigDataEOList);
 				if (ObjectUtil.isNotEmpty(oldConfigDataEO)) {
 					paramsConfigDataEO.setId(oldConfigDataEO.getId());
 
@@ -1323,6 +1327,22 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		return configLabelList;
 	}
 
+	@Override
+	public List<String> getLockedConfigIdList(ParamsCollectManifestVO paramsCollectManifestVO) {
+		String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
+
+		// 查询配置列
+		LambdaQueryWrapper<ParamsConfigEO> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(ParamsConfigEO::getParamsManifestId, paramsManifestId);
+		queryWrapper.eq(ParamsConfigEO::getIsLock, ConfigLockEnum.YES.getValue()); // 指定查询非冻结配置
+		queryWrapper.orderByAsc(ParamsConfigEO::getDisplaySeq);
+		List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.list(queryWrapper);
+
+		List<String> lockedConfigIdList = paramsConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList());
+
+		return lockedConfigIdList;
+	}
+
 	@Override
 	public boolean lockConfigColumn(ParamsCollectManifestVO paramsCollectManifestVO) {
 		if (StringUtils.isEmpty(paramsCollectManifestVO.getParamsManifestId())) {