Merge remote-tracking branch 'origin/master'

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

@@ -187,67 +187,66 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		}
 
 		List<Map<String, Object>> listMap = new ArrayList<>();
-		if (CollectionUtil.isNotEmpty(paramsConfigEOList)) {
+		list.forEach(collectManifestEO -> { // 参数收集清单
-			list.forEach(collectManifestEO -> { // 参数收集清单
+			// 处理数据字典字段 中英文切换 认证类型，责任领域
-				// 处理数据字典字段 中英文切换 认证类型，责任领域
+			List<String> certCategory = Arrays.asList(collectManifestEO.getCertCategory().split(","));
-				List<String> certCategory = Arrays.asList(collectManifestEO.getCertCategory().split(","));
+			List<String> dutyTerritory = Arrays.asList(collectManifestEO.getDutyTerritory().split(","));
-				List<String> dutyTerritory = Arrays.asList(collectManifestEO.getDutyTerritory().split(","));
+			String certCategoryName = "";
-				String certCategoryName = "";
+			String dutyTerritoryName = "";
-				String dutyTerritoryName = "";
+			if (CutEnum.CN.getValue().equals(cut)) {
-				if (CutEnum.CN.getValue().equals(cut)) {
+				certCategoryName = dictItemList.stream()
-					certCategoryName = dictItemList.stream()
+						.filter(e -> certCategory.contains(e.getItemValue()))
-							.filter(e -> certCategory.contains(e.getItemValue()))
+						.map(SysDictItem::getItemText)
-							.map(SysDictItem::getItemText)
+						.collect(Collectors.joining(","));
-							.collect(Collectors.joining(","));
 
-					dutyTerritoryName = dictItemList.stream()
+				dutyTerritoryName = dictItemList.stream()
-							.filter(e -> dutyTerritory.contains(e.getItemValue()))
+						.filter(e -> dutyTerritory.contains(e.getItemValue()))
-							.map(SysDictItem::getItemText)
+						.map(SysDictItem::getItemText)
-							.collect(Collectors.joining(","));
+						.collect(Collectors.joining(","));
 
-				} else if (CutEnum.EN.getValue().equals(cut)) {
+			} else if (CutEnum.EN.getValue().equals(cut)) {
-					certCategoryName = dictItemList.stream()
+				certCategoryName = dictItemList.stream()
-							.filter(e -> certCategory.contains(e.getItemValue()))
+						.filter(e -> certCategory.contains(e.getItemValue()))
-							.map(SysDictItem::getEnName)
+						.map(SysDictItem::getEnName)
-							.collect(Collectors.joining(","));
+						.collect(Collectors.joining(","));
 
-					dutyTerritoryName = dictItemList.stream()
+				dutyTerritoryName = dictItemList.stream()
-							.filter(e -> dutyTerritory.contains(e.getItemValue()))
+						.filter(e -> dutyTerritory.contains(e.getItemValue()))
-							.map(SysDictItem::getEnName)
+						.map(SysDictItem::getEnName)
-							.collect(Collectors.joining(","));
+						.collect(Collectors.joining(","));
 
-				}
+			}
 
 
 //			String certCategoryName = sysDictService.queryDictItemByValue("cert_category", collectManifestEO.getCertCategory(), cut);
-				collectManifestEO.setCertCategory(certCategoryName);
+			collectManifestEO.setCertCategory(certCategoryName);
 //			String dutyTerritoryName = sysDictService.queryDictItemByValue("duty_territory", collectManifestEO.getDutyTerritory(), cut);
-				collectManifestEO.setDutyTerritory(dutyTerritoryName);
+			collectManifestEO.setDutyTerritory(dutyTerritoryName);
 
-				// 处理状态字段
+			// 处理状态字段
-				Map<String, String> collectManifestStateMap = CollectManifestStateEnum.toMap(cut);
+			Map<String, String> collectManifestStateMap = CollectManifestStateEnum.toMap(cut);
-				String stateName = collectManifestStateMap.get(collectManifestEO.getState());
+			String stateName = collectManifestStateMap.get(collectManifestEO.getState());
-				collectManifestEO.setState(stateName);
+			collectManifestEO.setState(stateName);
 
-				Map<String, Object> manifestMap = objectToMap(collectManifestEO); // 对象转map
+			Map<String, Object> manifestMap = objectToMap(collectManifestEO); // 对象转map
-				String controlType = collectManifestEO.getControlType();
+			String controlType = collectManifestEO.getControlType();
-				String paramsCollectManifestId = collectManifestEO.getId();
+			String paramsCollectManifestId = collectManifestEO.getId();
 
-				if (CollectionUtil.isNotEmpty(paramsConfigEOList)) {
+			if (CollectionUtil.isNotEmpty(paramsConfigEOList)) {
-					paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置
+				paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置
-						Map<String, Object> configMap = new HashMap<>();
+					Map<String, Object> configMap = new HashMap<>();
-						String paramsConfigId = paramsConfigEO.getId();
+					String paramsConfigId = paramsConfigEO.getId();
-						ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
+					ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
-						List<ParamsConfigDataVO> paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
+					List<ParamsConfigDataVO> paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
-						configMap.put("controlType", controlType);
+					configMap.put("controlType", controlType);
-						configMap.put("list", paramsConfigDataVOList);
+					configMap.put("list", paramsConfigDataVOList);
-						manifestMap.put(paramsConfigEO.getId(), configMap);
+					manifestMap.put(paramsConfigEO.getId(), configMap);
-					});
+				});
-				}
+			}
+
+			listMap.add(manifestMap);
+		});
 
-				listMap.add(manifestMap);
-			});
-		}
         return listMap;
     }
 
@@ -266,7 +265,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO configDataVO = new ParamsConfigDataVO();
 			configDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
 			configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
-			configDataVO.setControlValue(paramsCollectManifestEO.getControlVerify());
+			configDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getTextData())) {
 				configDataVO.setDataValue(paramsConfigDataEO.getTextData());
 			}
@@ -277,7 +276,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO configDataVO = new ParamsConfigDataVO();
 			configDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
 			configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
-			configDataVO.setControlValue(paramsCollectManifestEO.getControlValues());
+			configDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getPullData())) {
 				configDataVO.setDataValue(paramsConfigDataEO.getPullData());
 			}
@@ -288,7 +287,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO configDataVO = new ParamsConfigDataVO();
 			configDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue());
 			configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
-			configDataVO.setControlValue(paramsCollectManifestEO.getControlValues());
+			configDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getPullData())) {
 				configDataVO.setDataValue(paramsConfigDataEO.getPullData());
 			}
@@ -309,7 +308,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
 			textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
 			textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
-			textConfigDataVO.setControlValue(paramsCollectManifestEO.getControlVerify());
+			textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getTextData())) {
 				textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
 			}
@@ -318,7 +317,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO pullConfigDataVO = new ParamsConfigDataVO();
 			pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
 			pullConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
-			pullConfigDataVO.setControlValue(paramsCollectManifestEO.getControlValues());
+			pullConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getPullData())) {
 				pullConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
 			}
@@ -329,7 +328,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
 			textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
 			textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
-			textConfigDataVO.setControlValue(paramsCollectManifestEO.getControlVerify());
+			textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getTextData())) {
 				textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
 			}
@@ -338,7 +337,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO pullMoreConfigDataVO = new ParamsConfigDataVO();
 			pullMoreConfigDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue());
 			pullMoreConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
-			pullMoreConfigDataVO.setControlValue(paramsCollectManifestEO.getControlValues());
+			pullMoreConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getPullData())) {
 				pullMoreConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
 			}
@@ -349,7 +348,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
 			textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
 			textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
-			textConfigDataVO.setControlValue(paramsCollectManifestEO.getControlVerify());
+			textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getTextData())) {
 				textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
 			}
@@ -368,7 +367,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO pullConfigDataVO = new ParamsConfigDataVO();
 			pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
 			pullConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
-			pullConfigDataVO.setControlValue(paramsCollectManifestEO.getControlValues());
+			pullConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getPullData())) {
 				pullConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
 			}
@@ -387,7 +386,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO pullMoreConfigDataVO = new ParamsConfigDataVO();
 			pullMoreConfigDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue());
 			pullMoreConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
-			pullMoreConfigDataVO.setControlValue(paramsCollectManifestEO.getControlValues());
+			pullMoreConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getPullData())) {
 				pullMoreConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
 			}
@@ -406,7 +405,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
 			textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
 			textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
-			textConfigDataVO.setControlValue(paramsCollectManifestEO.getControlVerify());
+			textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getTextData())) {
 				textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
 			}
@@ -415,7 +414,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO pullConfigDataVO = new ParamsConfigDataVO();
 			pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
 			pullConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
-			pullConfigDataVO.setControlValue(paramsCollectManifestEO.getControlValues());
+			pullConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getPullData())) {
 				pullConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
 			}
@@ -433,6 +432,21 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		return paramsConfigDataVOList;
 	}
 
+	private List<Map<String, String>> getControlValueMapList(String controlValue) {
+		List<Map<String, String>> controlValueMapList = new ArrayList<>();
+    	if (StringUtils.isNotEmpty(controlValue)) {
+    		controlValue = controlValue.replace("，", ",");
+			String[] controlValueStr = controlValue.split(",");
+			for (int i = 0; i < controlValueStr.length; i++) {
+				Map<String, String> controlValueMap = new HashMap<>();
+				controlValueMap.put("lable", controlValueStr[i]);
+				controlValueMap.put("value", controlValueStr[i]);
+				controlValueMapList.add(controlValueMap);
+			}
+		}
+    	return controlValueMapList;
+ 	}
+
 	/**
 	 * 列表表头中英文切换
 	 *

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

@@ -52,18 +52,18 @@ public class ParamsConfigEOServiceImpl extends ServiceImpl<ParamsConfigEOMapper,
 		String paramsManifestId = paramsConfigVO.getParamsManifestId();
 		List<ParamsConfigEO> paramsConfigEOList = paramsConfigVO.getParamsConfigEOList();
 
-//		int ind = 1;
+		int ind = 1;
 		List<ParamsConfigEO> addConfigList = new ArrayList<>(); // 新增的配置
 		List<ParamsConfigEO> updateConfigList = new ArrayList<>(); // 修改的配置
 		for (ParamsConfigEO paramsConfigEO : paramsConfigEOList) {
 			paramsConfigEO.setParamsManifestId(paramsManifestId);
-//			paramsConfigEO.setDisplaySeq(ind);
+			paramsConfigEO.setDisplaySeq(ind);
 			if (StringUtils.isEmpty(paramsConfigEO.getId())) {
 				addConfigList.add(paramsConfigEO);
 			} else {
 				updateConfigList.add(paramsConfigEO);
 			}
-//			ind++;
+			ind++;
 		}
 
 		// 删除的配置
@@ -96,10 +96,11 @@ public class ParamsConfigEOServiceImpl extends ServiceImpl<ParamsConfigEOMapper,
 				paramsConfigEO.setUpdateBy(sysUser.getUsername());
 				paramsConfigEO.setUpdateTime(now);
 			});
-			updateConfigList.addAll(addConfigList);
-			saveOrUpdateBatch(updateConfigList);
 //			paramsConfigEOMapper.updateForeach(updateConfigList); 批量修改不行
 		}
+
+		updateConfigList.addAll(addConfigList);
+		saveOrUpdateBatch(updateConfigList);
     }
 
 	/**

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

@@ -1,13 +1,16 @@
 package com.jero.modules.cert.collect.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
+import com.jero.modules.cert.collect.entity.ParamsConfigEO;
 import com.jero.modules.cert.collect.entity.ParamsManifestEO;
 import com.jero.modules.cert.collect.enums.CollectManifestStateEnum;
 import com.jero.modules.cert.collect.enums.ManifestStateEnum;
+import com.jero.modules.cert.collect.mapper.ParamsConfigEOMapper;
 import com.jero.modules.cert.collect.mapper.ParamsManifestEOMapper;
 import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService;
 import com.jero.modules.cert.collect.service.IParamsManifestEOService;
@@ -30,6 +33,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 参数清单
@@ -59,6 +63,9 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 	@Autowired
 	private ISysUserService sysUserService;
 
+	@Autowired
+	private ParamsConfigEOMapper paramsConfigEOMapper;
+
 	/**
 	 * 保存
 	 *
@@ -128,6 +135,21 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 	 */
 	@Override
     public void deleteById(String id) {
+		// 关联删除配置
+		LambdaQueryWrapper<ParamsConfigEO>  configEOQueryWrapper = new LambdaQueryWrapper<>();
+		configEOQueryWrapper.eq(ParamsConfigEO::getParamsManifestId, id);
+		paramsConfigEOMapper.delete(configEOQueryWrapper);
+
+		// 关联删除收集的参数项（包含配置数据）
+		LambdaQueryWrapper<ParamsCollectManifestEO>  queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(ParamsCollectManifestEO::getParamsManifestId, id);
+		List<ParamsCollectManifestEO> paramsCollectManifestEOList = paramsCollectManifestEOService.list(queryWrapper);
+		if (CollectionUtil.isNotEmpty(paramsCollectManifestEOList)) {
+			List<String> paramsCollectManifestIdList = paramsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getId).collect(Collectors.toList());
+			paramsCollectManifestEOService.deleteByIds(paramsCollectManifestIdList);
+
+		}
+
         removeById(id);
     }
 
@@ -139,6 +161,21 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 	 */
 	@Override
     public void deleteByIds(List<String> ids) {
+
+		// 关联删除配置
+		LambdaQueryWrapper<ParamsConfigEO>  configEOQueryWrapper = new LambdaQueryWrapper<>();
+		configEOQueryWrapper.in(ParamsConfigEO::getParamsManifestId, ids);
+		paramsConfigEOMapper.delete(configEOQueryWrapper);
+
+		// 关联删除收集的参数项（包含配置数据）
+		LambdaQueryWrapper<ParamsCollectManifestEO>  queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.in(ParamsCollectManifestEO::getParamsManifestId, ids);
+		List<ParamsCollectManifestEO> paramsCollectManifestEOList = paramsCollectManifestEOService.list(queryWrapper);
+		if (CollectionUtil.isNotEmpty(paramsCollectManifestEOList)) {
+			List<String> paramsCollectManifestIdList = paramsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getId).collect(Collectors.toList());
+			paramsCollectManifestEOService.deleteByIds(paramsCollectManifestIdList);
+
+		}
         removeByIds(ids);
     }
 

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigDataVO.java

@@ -2,6 +2,9 @@ package com.jero.modules.cert.collect.vo;
 
 import lombok.Data;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Author: liyawei
  * @Description:
@@ -11,6 +14,7 @@ import lombok.Data;
 public class ParamsConfigDataVO {
     private String type; // 类型：文本，单选，多选，附件
     private String isMust; // 是否必填 1-必填  0-非必填
-    private String controlValue; // 控件备选值，控件校验
+    private String controlVerify; // 控件校验
+    private List<Map<String, String>> controlValue; // 控件备选值
     private String dataValue; // 配置具体数据
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java

@@ -3271,7 +3271,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             String condition = getConditionStr(map);
             //导出数据(全部导出的数据)
             List<Map<String, Object>> datas = bussDocumentLibraryEOMapper.getInfoList(" " + StringUtils.join(conditionFieldList, ","), condition);
-            //处理对应标准,代替标准,被代替标准(由id转中文)
+            //处理被代替标准(由id转中文)
             getStandard(datas);
             //部分导出
             String partId = (String) map.get("id");
@@ -3380,44 +3380,67 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             datasTemp.add(mapTemp);
         }
         for (Map<String, Object> data : datas) {
-            String idTemp = (String) data.get("id");
+            String idTemp = (String) data.get("serial_number");
-            String correspondingStandard = (String) data.get("corresponding_standard");
-            String replaceStandard = (String) data.get("replace_standard");
-            StringBuilder correspondingStandardSb = new StringBuilder();
-            StringBuilder replaceStandardSb = new StringBuilder();
             StringBuilder replacedStandardSb = new StringBuilder();
             datasTemp.forEach(entry -> {
-                String id = (String) entry.get("id");
                 String replaceStandardTemp = (String) entry.get("replace_standard");
-                //对应标准
-                if (StringUtils.isNotBlank(correspondingStandard) && correspondingStandard.contains(id)) {
-                    correspondingStandardSb.append((String) entry.get("serial_number") + ",");
-                }
-                //代替标准
-                if (StringUtils.isNotBlank(replaceStandard) && replaceStandard.contains(id)) {
-                    replaceStandardSb.append((String) entry.get("serial_number") + ",");
-                }
                 //被代替标准
                 if (StringUtils.isNotBlank(replaceStandardTemp) && replaceStandardTemp.contains(idTemp)) {
                     replacedStandardSb.append((String) entry.get("serial_number") + ",");
                 }
             });
-            //对应标准
-            if (StringUtils.isNotBlank(correspondingStandardSb)) {
-                String correspondingStandardStr = correspondingStandardSb.substring(0, correspondingStandardSb.length() - 1);
-                data.put("corresponding_standard", correspondingStandardStr);
-            }
-            //代替标准
-            if (StringUtils.isNotBlank(replaceStandardSb)) {
-                String replaceStandardStr = replaceStandardSb.substring(0, replaceStandardSb.length() - 1);
-                data.put("replace_standard", replaceStandardStr);
-            }
             if (StringUtils.isNotBlank(replacedStandardSb)) {
                 String replacedStandardStr = replacedStandardSb.substring(0, replacedStandardSb.length() - 1);
                 data.put("replaced_standard", replacedStandardStr);
             }
         }
     }
+//    private void getStandard(List<Map<String, Object>> datas) {
+//        List<Map<String, Object>> datasTemp = new ArrayList<>();
+//        for (Map<String, Object> data : datas) {
+//            Map<String, Object> mapTemp = new HashMap<>();
+//            mapCopy(data, mapTemp);
+//            datasTemp.add(mapTemp);
+//        }
+//        for (Map<String, Object> data : datas) {
+//            String idTemp = (String) data.get("id");
+//            String correspondingStandard = (String) data.get("corresponding_standard");
+//            String replaceStandard = (String) data.get("replace_standard");
+//            StringBuilder correspondingStandardSb = new StringBuilder();
+//            StringBuilder replaceStandardSb = new StringBuilder();
+//            StringBuilder replacedStandardSb = new StringBuilder();
+//            datasTemp.forEach(entry -> {
+//                String id = (String) entry.get("id");
+//                String replaceStandardTemp = (String) entry.get("replace_standard");
+//                //对应标准
+//                if (StringUtils.isNotBlank(correspondingStandard) && correspondingStandard.contains(id)) {
+//                    correspondingStandardSb.append((String) entry.get("serial_number") + ",");
+//                }
+//                //代替标准
+//                if (StringUtils.isNotBlank(replaceStandard) && replaceStandard.contains(id)) {
+//                    replaceStandardSb.append((String) entry.get("serial_number") + ",");
+//                }
+//                //被代替标准
+//                if (StringUtils.isNotBlank(replaceStandardTemp) && replaceStandardTemp.contains(idTemp)) {
+//                    replacedStandardSb.append((String) entry.get("serial_number") + ",");
+//                }
+//            });
+//            //对应标准
+//            if (StringUtils.isNotBlank(correspondingStandardSb)) {
+//                String correspondingStandardStr = correspondingStandardSb.substring(0, correspondingStandardSb.length() - 1);
+//                data.put("corresponding_standard", correspondingStandardStr);
+//            }
+//            //代替标准
+//            if (StringUtils.isNotBlank(replaceStandardSb)) {
+//                String replaceStandardStr = replaceStandardSb.substring(0, replaceStandardSb.length() - 1);
+//                data.put("replace_standard", replaceStandardStr);
+//            }
+//            if (StringUtils.isNotBlank(replacedStandardSb)) {
+//                String replacedStandardStr = replacedStandardSb.substring(0, replacedStandardSb.length() - 1);
+//                data.put("replaced_standard", replacedStandardStr);
+//            }
+//        }
+//    }
 
     public void createDatas(Workbook workbook, Sheet sheet, List<Map<String, Object>> datas, String header, List<OnlCgformField> fieldList, String cut) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -4644,28 +4667,28 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                                 countError++;
                             }
                             //判断库中是否存在,如果存在则存id,如果不存在则存输入的值
-                            List<Map<String, Object>> listBySerialNumber = getListBySerialNumber(value);
+//                            List<Map<String, Object>> listBySerialNumber = getListBySerialNumber(value);
-                            String serialNumberStr = "";
+//                            String serialNumberStr = "";
-                            StringBuilder sb = new StringBuilder();
+//                            StringBuilder sb = new StringBuilder();
-                            List<String> list = new ArrayList<>();
+//                            List<String> list = new ArrayList<>();
-                            for (Map<String, Object> stringObjectMap : listBySerialNumber) {
+//                            for (Map<String, Object> stringObjectMap : listBySerialNumber) {
-                                sb.append((String) stringObjectMap.get("id") + ",");
+//                                sb.append((String) stringObjectMap.get("id") + ",");
-                                list.add((String) stringObjectMap.get("serial_number"));
+//                                list.add((String) stringObjectMap.get("serial_number"));
-                            }
+//                            }
-                            if (StringUtils.isNotBlank(value)) {
+//                            if (StringUtils.isNotBlank(value)) {
-                                for (String s : value.split(",")) {
+//                                for (String s : value.split(",")) {
-                                    if (!list.contains(s)) {
+//                                    if (!list.contains(s)) {
-                                        sb.append(s);
+//                                        sb.append(s);
-                                    }
+//                                    }
-                                }
+//                                }
-                            }
+//                            }
-                            if (ObjectUtils.isNotEmpty(sb)) {
+//                            if (ObjectUtils.isNotEmpty(sb)) {
-                                String substring = sb.toString();
+//                                String substring = sb.toString();
-                                if (substring.endsWith(",") || substring.endsWith("，")){
+//                                if (substring.endsWith(",") || substring.endsWith("，")){
-                                    substring = substring.substring(0, substring.length() - 1);
+//                                    substring = substring.substring(0, substring.length() - 1);
-                                }
+//                                }
-                                value = substring;
+//                                value = substring;
-                            }
+//                            }
                         }
                     }
                 }

jero-web/src/common/lang/en-us.js

@@ -613,8 +613,8 @@ module.exports = {
   Transfer: 'Transfer',
   CertificationDirectory: 'Certification directory',
   TaskRequirements: 'Task requirements',
-  CertificationProgress: 'Certification progress',
+  CertificationProgress: 'Homo Progress',
-  CurrentProjectStatusEvaluation: 'Current project status evaluation',
+  CurrentProjectStatusEvaluation: 'Current State',
   NiONumber: 'NiO number',
   ParameterName: 'Parameter name',
   ParameterDescription: 'Parameter description',
@@ -790,4 +790,6 @@ module.exports = {
   resultReported:'Result Reported',
   TheDoesNotContainData:'The maintenance list of the virtual list does not contain data',
   number:'No',
+  Deadline:'Deadline',
+  toBeConfirmed:'To be confirmed',
 }

jero-web/src/common/lang/zh-cn.js

@@ -483,6 +483,7 @@ module.exports = {
   nonConformity: '不符合',
   Tracked: '待追踪',
   notInvolved: '不涉及',
+  toBeConfirmed:'待确认',
   Operator: '操作人',
   role: '角色',
   operationContent: '操作内容',
@@ -795,4 +796,5 @@ module.exports = {
   resultReported:'结果报告',
   TheDoesNotContainData:'该虚拟清单的维护清单中没有数据,是否需要添加',
   number:'序号',
+  Deadline:'截止时间',
 }

jero-web/src/components/UpdateLog/index.vue

@@ -16,7 +16,7 @@
       class="table"
       :columns="columns"
       :pagination="false"
-      :scroll="{y: 400}"
+      :scroll="{y: 420}"
       :data-source="dataSource"
       :loading="loading"
     >
@@ -56,11 +56,12 @@
           loading:false,
           pageNo: 1,
           pageSize: 10,
+          queryId:{},
           total: 0,
           columns: [
             {
               title: this.$t('OperationDetails'),
-              dataIndex: 'content',
+              dataIndex: 'logContent',
               align: 'center',
               ellipsis: true,
               scopedSlots: { customRender: 'content' }
@@ -78,9 +79,10 @@
     mounted() {
     },
     methods:{
-      getList(){
+      getList(data){
         this.visible = true
         this.pageNo = 1
+        this.queryId = data
         this.bussLogList()
       },
       onChange(page, pageSize) {
@@ -96,7 +98,7 @@
         let query = {
           pageNo: this.pageNo,
           pageSize: this.pageSize,
-          documentId: this.$route.query.id
+          ...this.queryId
         }
         this.loading = true
         getAction(this.url.logList, query).then((res) => {
@@ -114,5 +116,8 @@
 </script>
 
 <style scoped>
-
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
 </style>

jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue

@@ -270,7 +270,8 @@
           importZipUrl: '/dummy/dummyInventoryInfoEO/importData',
           exportData: '/dummy/dummyInventoryInfoEO/exportData',
           exportTemplate: '/dummy/dummyInventoryInfoEO/exportTemplate',
-          getSysCategoryTree: '/sys/category/getSysCategoryTree'
+          getSysCategoryTree: '/sys/category/getSysCategoryTree',
+          logList:'/dummy/dummyLogEO/page',
         },
         loading: false,
         dataSource: [],
@@ -589,7 +590,7 @@
         this.getList()
       },
       UpdateLogClick() {
-        this.$refs.UpdateLogRef.getList()
+        this.$refs.UpdateLogRef.getList({dummyInventoryBaseId:this.$route.query.id})
       },
       searchQuery() {
         this.getList()

jero-web/src/views/processCenter/processForm/taskListProcess/index.vue

@@ -225,6 +225,7 @@
       terminationProcess() {
         this.textLoading = this.$t('terminationProcessing')
         this.loading = true
+        this.queryBy.reviewResult = 'termination of task'
         this.completeTask({ flag: 2 })
       },
       adopt() {
@@ -238,6 +239,11 @@
       sendBack() {
         this.textLoading = this.$t('Returning')
         this.loading = true
+        if (this.queryBy.reviewResult == 'inconformity' || this.queryBy.reviewResult == 'to track'){
+
+        }else{
+          this.queryBy.reviewResult = 'to be confirmed'
+        }
         this.completeTask({ flag: 1 })
       },
       submit() {

jero-web/src/views/projectManagement/components/TaskList.vue

@@ -52,43 +52,49 @@
       >
         <div slot="standardInformation" slot-scope="text,result" class="box-left">
           <div class="content">
-            <a class="box-content">{{result.serialNumber}}</a><br/>
+            <a class="box-content-a">{{result.serialNumber}}</a><br/>
             <a>{{result.title}}</a>
           </div>
         </div>
         <div slot="areaOfResponsibility" slot-scope="text,result" class="box-left">
           <div class="content">
-            <span class="box-content">1212sdfdsf</span><br/>
+            <span class="box-content-index">1212sdfdsf</span><br/>
-            <span>责任领土</span>
+            <span class="box-content-index">hahahaha</span>
           </div>
         </div>
         <div slot="confirmationOfDesignConformity" slot-scope="text,result" class="box-left">
-          <div class="content" v-if="result.designTaskStatus" @click="verifyTaskClick(result,1)">
+          <div class="content" v-if="result.designTaskStatus" @click="verifyTaskClick(result,1,false)">
-            <span class="box-content">{{$t('cutoffTime')}}: {{result.designDueDate}}</span><br/>
+            <span class="box-content">{{$t('Deadline')}}: {{result.designDueDate}}</span><br/>
-            <span class="box-content">{{$t('ProcessStatus')}}: {{result.designFlowTaskStatus}}</span><br/>
+            <span class="box-content">{{$t('ProcessStatus')}}: {{result.designStatus}}</span><br/>
-            <span class="box-content-color">{{result.designStatus}}</span>
+            <span class="box-content-color" :class="color[result.designFlowTaskStatus]">
+               {{statusText[result.designFlowTaskStatus]}}
+            </span>
           </div>
-          <div class="content-box" v-if="result.designTaskStatus == 'NotDone'" @click="verifyTaskClick(result,1)">
+          <div class="content-box" v-if="result.designTaskStatus == 'NotDone'" @click="verifyTaskClick(result,1,true)">
             <div class="content-box-jiao"></div>
           </div>
         </div>
         <div slot="PrehomoConfirmation" slot-scope="text,result" class="box-left">
-          <div class="content" v-if="result.prehomoTaskStatus" @click="verifyTaskClick(result,2)">
+          <div class="content" v-if="result.prehomoTaskStatus" @click="verifyTaskClick(result,2,false)">
-            <span class="box-content">{{$t('cutoffTime')}}: {{result.prehomoDueDate}}</span><br/>
+            <span class="box-content">{{$t('Deadline')}}: {{result.prehomoDueDate}}</span><br/>
-            <span class="box-content">{{$t('ProcessStatus')}}: {{result.prehomoFlowTaskStatus}}</span><br/>
+            <span class="box-content">{{$t('ProcessStatus')}}: {{result.prehomoTaskStatus}}</span><br/>
-            <span class="box-content-color">{{result.prehomoTaskStatus}}</span>
+            <span class="box-content-color" :class="color[result.prehomoFlowTaskStatus]">
+              {{statusText[result.prehomoFlowTaskStatus]}}
+            </span>
           </div>
-          <div class="content-box" v-if="result.prehomoTaskStatus == 'NotDone'" @click="verifyTaskClick(result,2)">
+          <div class="content-box" v-if="result.prehomoTaskStatus == 'NotDone'" @click="verifyTaskClick(result,2,true)">
             <div class="content-box-jiao"></div>
           </div>
         </div>
         <div slot="verificationAndConformityconfirmation" slot-scope="text,result" class="box-left">
-          <div class="content" v-if="result.verifyTaskStatus" @click="verifyTaskClick(result,3)">
+          <div class="content" v-if="result.verifyTaskStatus" @click="verifyTaskClick(result,3,false)">
-            <span class="box-content">{{$t('cutoffTime')}}: {{result.verifyDueDate}}</span><br/>
+            <span class="box-content">{{$t('Deadline')}}: {{result.verifyDueDate}}</span><br/>
-            <span class="box-content">{{$t('ProcessStatus')}}: {{result.verifyFlowTaskStatus}}</span><br/>
+            <span class="box-content">{{$t('ProcessStatus')}}: {{result.verifyStatus}}</span><br/>
-            <span class="box-content-color">{{result.verifyStatus}}</span>
+            <span class="box-content-color" :class="color[result.verifyFlowTaskStatus]">
+                {{statusText[result.verifyFlowTaskStatus]}}
+            </span>
           </div>
-          <div class="content-box" v-if="result.verifyTaskStatus == 'NotDone'" @click="verifyTaskClick(result,3)">
+          <div class="content-box" v-if="result.verifyTaskStatus == 'NotDone'" @click="verifyTaskClick(result,3,true)">
             <div class="content-box-jiao"></div>
           </div>
         </div>
@@ -136,6 +142,7 @@
             title: this.$t('standardInformation'),
             align: 'center',
             dataIndex: 'standard',
+            width: 200,
             scopedSlots: { customRender: 'standardInformation' }
           },
           {
@@ -183,6 +190,21 @@
           'haveDone': '已办',
           'showData': '展示数据'
         },
+        color: {
+          'conformity': 'accordColor',
+          'inconformity': 'nonConformityColor',
+          'to track': 'TrackedColor',
+          'uninvolved': 'notInvolvedColor',
+          'to be confirmed': 'submittedColor'
+        },
+        statusText: {
+          'conformity': this.$t('accord'),
+          'inconformity': this.$t('nonConformity'),
+          'to track': this.$t('Tracked'),
+          'uninvolved': this.$t('notInvolved'),
+          'to be confirmed': this.$t('toBeConfirmed')
+        },
+
         queryParam: {},
         url: {
           list: '/project/projectTaskInventoryEO/list'
@@ -209,7 +231,7 @@
       handleExport() {
 
       },
-      verifyTaskClick(val, num) {
+      verifyTaskClick(val, num,isTrue) {
         let query = {}
         switch (num) {
           case 1:
@@ -221,7 +243,7 @@
               id: this.$route.query.id,
               studioEngineer: this.$route.query.studioEngineer,
               serialNumber: val.serialNumber,
-              TaskKey: val.designTaskDefinitionKey,
+              TaskKey: isTrue ? val.designTaskDefinitionKey : 'hhhhh',
               flowType: 2,
               Sponsor: 'designInitiatorName',
               personLiable: 'designDutyName',
@@ -229,7 +251,7 @@
               deliverableTemplate: 'designDeliverableTemplate',
               projectName: this.$route.query.projectName,
               projectNameId: this.$route.query.projectNameId,
-              primaryKeyId: val.designTaskDetailId
+              primaryKeyId: val.designTaskDetailId,
             }
             break
           case 2:
@@ -240,7 +262,7 @@
               studioEngineer: this.$route.query.studioEngineer,
               projectLibraryId: this.$route.query.id,
               serialNumber: val.serialNumber,
-              TaskKey: val.prehomoTaskDefinitionKey,
+              TaskKey: isTrue ? val.prehomoTaskDefinitionKey : 'hhhh',
               flowType: 3,
               id: this.$route.query.id,
               Sponsor: 'prehomoInitiatorName',
@@ -249,7 +271,7 @@
               deliverableTemplate: 'prehomoDeliverableTemplate',
               projectName: this.$route.query.projectName,
               projectNameId: this.$route.query.projectNameId,
-              primaryKeyId: val.prehomoTaskDetailId
+              primaryKeyId: val.prehomoTaskDetailId,
             }
             break
           case 3:
@@ -261,7 +283,7 @@
               studioEngineer: this.$route.query.studioEngineer,
               serialNumber: val.serialNumber,
               projectTaskInventoryId: val.projectLawsInventoryId,
-              TaskKey: val.verifyTaskDefinitionKey,
+              TaskKey: isTrue ? val.verifyTaskDefinitionKey : 'hhhhh',
               flowType: 4,
               Sponsor: 'verifyInitiatorName',
               personLiable: 'verifyDutyName',
@@ -269,7 +291,7 @@
               deliverableTemplate: 'verifyDeliverableTemplate',
               projectName: this.$route.query.projectName,
               projectNameId: this.$route.query.projectNameId,
-              primaryKeyId: val.verifyTaskDetailId
+              primaryKeyId: val.verifyTaskDetailId,
             }
             break
         }
@@ -379,7 +401,7 @@
     height: calc(100% + 32px);
     top: -16px;
     left: -16px;
-    border: 1px seagreen solid;
+    border: 1px #00B3BE solid;
   }
 
   .content-box-jiao {
@@ -387,22 +409,70 @@
     right: 0;
     width: 0;
     height: 0;
-    border-right: 30px solid red;
+    border-right: 14px solid #00B3BE;
-    border-bottom: 30px solid transparent
+    border-bottom: 14px solid transparent
   }
 
   .box-content {
     margin-bottom: 8px;
     display: inline-block;
     text-align: left;
+    font-weight: 400;
+    color: #040B29;
+  }
+
+  .box-content-a {
+    margin-bottom: 8px;
+    display: inline-block;
+    text-align: left;
+    font-weight: 400;
+  }
+
+  .box-content-index {
+    margin-bottom: 8px;
+    display: inline-block;
+    text-align: left;
+    font-weight: 400;
+    color: #040B29;
+  }
+
+  .box-content-index:last-child {
+    margin-bottom: 0;
   }
 
   .box-content-color {
-    padding: 6px 14px;
+    width: 78px;
-    box-sizing: border-box;
+    height: 32px;
-    background: #1ABBC4;
+    display: inline-block;
-    color: #2F8DF3;
     border-radius: 4px;
+    text-align: center;
+    font-size: 14px;
+    line-height: 32px;
+  }
+
+  .accordColor {
+    background: #96ecad;
+    color: #26BD4B;
+  }
+
+  .nonConformityColor {
+    background: #eeaeae;
+    color: #E83030;
+  }
+
+  .TrackedColor {
+    background: #f0d7b1;
+    color: #FDA71C;
+  }
+
+  .notInvolvedColor {
+    background: #e2edf8;
+    color: #707486;
+  }
+
+  .submittedColor {
+    color: #00B3BE;
+    background: #94e0e4;
   }
 
   .Current-color {

jero-web/src/views/projectManagement/components/fixedPlateForm.vue

@@ -46,7 +46,12 @@
           versionsName: [
             {
               required: true,
-              message: this.$t('publishComment') + this.$t('cannotEmpty'),
+              message: this.$t('versionName') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            },
+            {
+              max: 200,
+              message: this.$t('versionName') + this.$t('cannotExceed') + 200 + this.$t('Characters'),
               trigger: 'blur'
             }
           ]