修复合并问题

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

@@ -169,7 +169,6 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
     private String uploadpath;
 
 
-
     @Value(value = "${jero.backUrl}")
     private String backUrl;
 
@@ -529,13 +528,15 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 					List<ParamsConfigDataVO> paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
 					configMap.put("controlType", controlType);
 					configMap.put("list", paramsConfigDataVOList);
-					manifestMap.put(paramsConfigEO.getId(), configMap);*/
+					manifestMap.put(paramsConfigEO.getId(), configMap);
 
     Map<String, Object> paramsConfigDataVO = new HashMap<>();
     Map<String, Object> configMap = new HashMap<>();
     String paramsConfigId = paramsConfigEO.getId();
     List<ParamsConfigDataEO> paramsConfigDatas = this.getConfigDataEOListByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据
-					if(CollectionUtils.isNotEmpty(paramsConfigDatas)){
+					if(CollectionUtils.isNotEmpty(paramsConfigDatas))
+
+    {
         // 匿名比较器排序
         Collections.sort(paramsConfigDatas, new Comparator<ParamsConfigDataEO>() {
             @Override
@@ -550,7 +551,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
             List<ParamsConfigDataVO> paramsConfigDataVOList = this.getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
             paramsConfigDataVO.put(paramsConfigDataEO.getId(), paramsConfigDataVOList);
         }
-					}else {
+        }else
+
+        {
             ParamsConfigDataEO paramsConfigDataEO = this.getConfigDataEOByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据
             List<ParamsConfigDataVO> paramsConfigDataVOList = this.getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
             String key = UUID.randomUUID().toString().replaceAll("-", "");
@@ -829,6 +832,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
     /**
      * 重新组装配置数据 用于返回前端
+     *
      * @param controlType
      * @param paramsConfigDataEO
      * @param paramsCollectManifestEO
@@ -1096,6 +1100,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
     /**
      * 重新组装配置数据 用于返回前端
+     *
      * @param controlType
      * @param referencesCol
      * @param paramsCollectManifestEO
@@ -1773,6 +1778,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
     /**
      * 查询清单所用模版参数项列表（过滤清单已添加的参数项）
+     *
      * @param paramsCollectManifestVO
      * @return
      */
@@ -4080,6 +4086,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
     /**
      * 根据责任领域code，获取责任领域名称，包含中英文切换。
+     *
      * @param dutyTerritoryList
      * @param dutyTerritoryCode
      * @param cut
@@ -4918,6 +4925,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
     /**
      * 将对象转Map
+     *
      * @param obj 待转对象
      * @return
      */
@@ -4966,6 +4974,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
     /**
      * 将对象转Map
+     *
      * @param obj 待转对象
      * @return
      */
@@ -6125,7 +6134,6 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                         }
 
 
-
                         referencesColIsNullFlag = false;
                     }
                 }
@@ -6268,7 +6276,6 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                     }
 
 
-
                 }
                 String referencesCol = referncesColBuilder.toString();
                 if (StringUtils.isNotEmpty(referencesCol)) {
@@ -6422,6 +6429,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
     /**
      * 发送变更消息
+     *
      * @param paramsCollectManifestMapList
      * @param paramsManifestEO             清单信息
      * @param projectInfo
@@ -6575,6 +6583,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
     /**
      * 创建高级查询条件
+     *
      * @param queryConditionVOList
      * @param sqlJoinSb
      */

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java

@@ -1824,16 +1824,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 				// 无法转ParamsConfigDataVO（遍历会出现该异常 ： LinkedHashMap cannot be cast to ParamsConfigDataVO）
 				// List<Map<String, Object>> configDataVOList = (List<Map<String, Object>>) paramsReportConfigDataMap.get("list");
 
-				// 判断是新增还是修改
+
-				ParamsConfigDataEO oldConfigDataEO = getConfigDataEOByConfigIdAndCollectManifestId(paramsReportConfigEOId, paramsCollectManifestId, paramsReportConfigDataEOList);
-				if (ObjectUtil.isNotEmpty(oldConfigDataEO)) {
-					paramsReportConfigDataEO.setId(oldConfigDataEO.getId());
-				}
-				//******************配置2被添加了**********************
-				logCnContent.append(paramsReportConfigEO.getConfigName()).append("的");
-				logEnContent.append(paramsReportConfigEO.getConfigName());
-				configNameCn = paramsReportConfigEO.getConfigName()+"的";
-				configNameEn = paramsReportConfigEO.getConfigName();
 				Map<String, Object> paramsConfigDataVOMap = (Map<String, Object>)  paramsReportConfigDataMap.get("paramsConfigData");
 
 				for (Map.Entry<String, Object> paramsConfigDataMap : paramsConfigDataVOMap.entrySet()) {