Merge remote-tracking branch 'origin/master'

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

@@ -612,99 +612,17 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 
         //查询所有
         List<Map<String, Object>> mapList = bussDocumentLibraryEOMapper.selectMapsAll(null);
-        //对应标准id
-        String correspondingStandard = (String) dataList.get(0).get("corresponding_standard");
-        //代替标准id
-        String replaceStandardTemp = (String) dataList.get(0).get("replace_standard");
         //处理被代替标准和对应标准
-        List<String> replaceStandardNameList = new ArrayList<>();//代替标准
         List<String> replacedStandardNameList = new ArrayList<>();//被代替标准
-        List<String> replacedStandardIdList = new ArrayList<>();//被代替标准
-        List<String> correspondingStandardNameList = new ArrayList<>();//对应标准
         for (Map<String, Object> map : mapList) {
-            //对应标准处理
-            if (StringUtils.isNotBlank(correspondingStandard) && correspondingStandard.contains((String) map.get("id"))) {
-                for (String s : correspondingStandard.split(",")) {
-                    if (s.equals((String) map.get("id"))) {
-                        correspondingStandardNameList.add((String) map.get("serial_number"));
-                    } else {
-                        boolean flag = isId(s);
-                        if (!flag && !correspondingStandardNameList.contains(s)) {
-                            correspondingStandardNameList.add(s);
-                        }
-                    }
-                }
-            } else {
-                //处理已删除的文档的对应标准
-                if (StringUtils.isNotBlank(correspondingStandard)) {
-                    for (String s : correspondingStandard.split(",")) {
-                        boolean flag = isId(s);
-                        if (!flag && !correspondingStandardNameList.contains(s)) {
-                            correspondingStandardNameList.add(s);
-                        }
-                    }
-                }
-            }
-            //代替标准
-            if (StringUtils.isNotBlank(replaceStandardTemp) && replaceStandardTemp.contains((String) map.get("id"))) {
-                for (String s : replaceStandardTemp.split(",")) {
-                    if (s.equals((String) map.get("id"))) {
-                        replaceStandardNameList.add((String) map.get("serial_number"));
-                    } else {
-                        boolean flag = isId(s);
-                        if (!flag && !replaceStandardNameList.contains(s)) {
-                            replaceStandardNameList.add(s);
-                        }
-                    }
-                }
-            } else {
-                //处理已删除的代替标准
-                if (StringUtils.isNotBlank(replaceStandardTemp)) {
-                    for (String s : replaceStandardTemp.split(",")) {
-                        boolean flag = isId(s);
-                        if (!flag && !replaceStandardNameList.contains(s)) {
-                            replaceStandardNameList.add(s);
-                        }
-                    }
-                }
-
-            }
             //被代替标准
             String replaceStandard = (String) map.get("replace_standard");
-            if (StringUtils.isNotBlank(replaceStandard) && replaceStandard.contains(id)) {
+            if (StringUtils.isNotBlank(replaceStandard) && replaceStandard.contains((String) dataList.get(0).get("serial_number"))) {
                 String serialNumber = (String) map.get("serial_number");
                 replacedStandardNameList.add(serialNumber);
-                replacedStandardIdList.add((String) map.get("id"));
             }
         }
-        //对应标准中文
-//        if (correspondingStandardNameList.size() != 0) {
-        dataList.get(0).put("corresponding_standard", StringUtils.join(correspondingStandardNameList, ","));
-        dataList.get(0).put("corresponding_standard_id", correspondingStandard);
-//        }
-//        if (replacedStandardNameList.size() != 0) {
         dataList.get(0).put("replaced_standard", StringUtils.join(replacedStandardNameList, ","));
-//        dataList.get(0).put("replaced_standard_id", StringUtils.join(replacedStandardIdList, ","));
-//        }
-//        if (replaceStandardNameList.size() != 0) {
-        dataList.get(0).put("replace_standard", StringUtils.join(replaceStandardNameList, ","));
-        dataList.get(0).put("replace_standard_id", replaceStandardTemp);
-//        }
-        //代替标准中文
-//        String replaceStandard = (String) dataList.get(0).get("replace_standard");
-//        if (StringUtils.isNotBlank(replaceStandard)) {
-//            LambdaQueryWrapper<BussDocumentLibraryEO> queryWrapperTemp = new LambdaQueryWrapper<>();
-//            queryWrapperTemp.in(BussDocumentLibraryEO::getId, Arrays.asList(replaceStandard.split(",")));
-//            List<Map<String, Object>> dataListTemp = bussDocumentLibraryEOMapper.selectMaps(queryWrapperTemp);
-//            if (dataListTemp.size() != 0) {
-//                List<String> replaceStandardListNew = new ArrayList<>();
-//                for (Map<String, Object> map : dataListTemp) {
-//                    replaceStandardListNew.add((String) map.get("serial_number"));
-//                }
-//                dataList.get(0).put("replace_standard", StringUtils.join(replaceStandardListNew, ","));
-//                dataList.get(0).put("replace_standard_id", replaceStandard);
-//            }
-//        }
         for (Map.Entry<String, Object> entry : dataList.get(0).entrySet()) {
             if(treeList.contains(entry.getKey())){
                 String value = (String) entry.getValue();
@@ -717,6 +635,131 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         }
         return dataList;
     }
+//    public List<Map<String, Object>> getDocumentInfoById(String id, String cut) {
+//        //字段属性
+//        List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
+//        List<OnlCgformField> treeOnlCgformFieldList = fieldList.stream().filter(e -> FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
+//        List<String> treeList = treeOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
+//        List<OnlCgformField> onlCgformFieldDateMoreList = fieldList.stream().filter(e -> FieldTypeEnum.DATE_MORE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
+//        List<String> dateMoreList = onlCgformFieldDateMoreList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
+//        //通过id查询数据
+//        List<Map<String, Object>> dataList = bussDocumentLibraryEOMapper.selectMapsAll(id);
+//        //多选日期
+//        for (Map.Entry<String, Object> entry : dataList.get(0).entrySet()) {
+//            String key = entry.getKey();
+//            if(dateMoreList.contains(key) && ObjectUtils.isNotEmpty(entry.getValue())){
+//                String value = (String) entry.getValue();
+//                entry.setValue(Arrays.asList(value.split(",")));
+//            }
+//        }
+//
+//        //查询所有
+//        List<Map<String, Object>> mapList = bussDocumentLibraryEOMapper.selectMapsAll(null);
+//        //对应标准id
+//        String correspondingStandard = (String) dataList.get(0).get("corresponding_standard");
+//        //代替标准id
+//        String replaceStandardTemp = (String) dataList.get(0).get("replace_standard");
+//        //处理被代替标准和对应标准
+//        List<String> replaceStandardNameList = new ArrayList<>();//代替标准
+//        List<String> replacedStandardNameList = new ArrayList<>();//被代替标准
+//        List<String> replacedStandardIdList = new ArrayList<>();//被代替标准
+//        List<String> correspondingStandardNameList = new ArrayList<>();//对应标准
+//        for (Map<String, Object> map : mapList) {
+//            //对应标准处理
+//            if (StringUtils.isNotBlank(correspondingStandard) && correspondingStandard.contains((String) map.get("id"))) {
+//                for (String s : correspondingStandard.split(",")) {
+//                    if (s.equals((String) map.get("id"))) {
+//                        correspondingStandardNameList.add((String) map.get("serial_number"));
+//                    } else {
+//                        boolean flag = isId(s);
+//                        if (!flag && !correspondingStandardNameList.contains(s)) {
+//                            correspondingStandardNameList.add(s);
+//                        }
+//                    }
+//                }
+//            } else {
+//                //处理已删除的文档的对应标准
+//                if (StringUtils.isNotBlank(correspondingStandard)) {
+//                    for (String s : correspondingStandard.split(",")) {
+//                        boolean flag = isId(s);
+//                        if (!flag && !correspondingStandardNameList.contains(s)) {
+//                            correspondingStandardNameList.add(s);
+//                        }
+//                    }
+//                }
+//            }
+//            //代替标准
+//            if (StringUtils.isNotBlank(replaceStandardTemp) && replaceStandardTemp.contains((String) map.get("id"))) {
+//                for (String s : replaceStandardTemp.split(",")) {
+//                    if (s.equals((String) map.get("id"))) {
+//                        replaceStandardNameList.add((String) map.get("serial_number"));
+//                    } else {
+//                        boolean flag = isId(s);
+//                        if (!flag && !replaceStandardNameList.contains(s)) {
+//                            replaceStandardNameList.add(s);
+//                        }
+//                    }
+//                }
+//            } else {
+//                //处理已删除的代替标准
+//                if (StringUtils.isNotBlank(replaceStandardTemp)) {
+//                    for (String s : replaceStandardTemp.split(",")) {
+//                        boolean flag = isId(s);
+//                        if (!flag && !replaceStandardNameList.contains(s)) {
+//                            replaceStandardNameList.add(s);
+//                        }
+//                    }
+//                }
+//
+//            }
+//            //被代替标准
+//            String replaceStandard = (String) map.get("replace_standard");
+//            if (StringUtils.isNotBlank(replaceStandard) && replaceStandard.contains(id)) {
+//                String serialNumber = (String) map.get("serial_number");
+//                replacedStandardNameList.add(serialNumber);
+//                replacedStandardIdList.add((String) map.get("id"));
+//            }
+//        }
+//        //对应标准中文
+////        if (correspondingStandardNameList.size() != 0) {
+//        dataList.get(0).put("corresponding_standard", StringUtils.join(correspondingStandardNameList, ","));
+//        dataList.get(0).put("corresponding_standard_id", correspondingStandard);
+////        }
+////        if (replacedStandardNameList.size() != 0) {
+//        dataList.get(0).put("replaced_standard", StringUtils.join(replacedStandardNameList, ","));
+////        dataList.get(0).put("replaced_standard_id", StringUtils.join(replacedStandardIdList, ","));
+////        }
+////        if (replaceStandardNameList.size() != 0) {
+//        dataList.get(0).put("replace_standard", StringUtils.join(replaceStandardNameList, ","));
+//        dataList.get(0).put("replace_standard_id", replaceStandardTemp);
+////        }
+//        //代替标准中文
+////        String replaceStandard = (String) dataList.get(0).get("replace_standard");
+////        if (StringUtils.isNotBlank(replaceStandard)) {
+////            LambdaQueryWrapper<BussDocumentLibraryEO> queryWrapperTemp = new LambdaQueryWrapper<>();
+////            queryWrapperTemp.in(BussDocumentLibraryEO::getId, Arrays.asList(replaceStandard.split(",")));
+////            List<Map<String, Object>> dataListTemp = bussDocumentLibraryEOMapper.selectMaps(queryWrapperTemp);
+////            if (dataListTemp.size() != 0) {
+////                List<String> replaceStandardListNew = new ArrayList<>();
+////                for (Map<String, Object> map : dataListTemp) {
+////                    replaceStandardListNew.add((String) map.get("serial_number"));
+////                }
+////                dataList.get(0).put("replace_standard", StringUtils.join(replaceStandardListNew, ","));
+////                dataList.get(0).put("replace_standard_id", replaceStandard);
+////            }
+////        }
+//        for (Map.Entry<String, Object> entry : dataList.get(0).entrySet()) {
+//            if(treeList.contains(entry.getKey())){
+//                String value = (String) entry.getValue();
+//                if(StringUtils.isNotBlank(value)){
+//                    dataList.get(0).put(entry.getKey(), Arrays.asList(value.split(",")));
+//                }else{
+//                    dataList.get(0).put(entry.getKey(), null);
+//                }
+//            }
+//        }
+//        return dataList;
+//    }
 
     /**
      * 详情数据查询
@@ -726,6 +769,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
      */
     @Override
     public List<Map<String, Object>> getInfoById(String id, String cut) {
+        //字段属性
+        List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
+        //标准选择字段
+        List<OnlCgformField> standardOnlCgformFieldList = fieldList.stream()
+                .filter(e -> FieldTypeEnum.STANDARD.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
+        List<String> standFieldList = standardOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
         //通过id查询数据
         List<Map<String, Object>> dataList = bussDocumentLibraryEOMapper.selectMapsAll(id);
 
@@ -738,129 +787,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         //查询所有
         List<Map<String, Object>> mapList = bussDocumentLibraryEOMapper.selectMapsAll(null);
 
-        //原始对应标准,代替标准,被代替标准(原始数据存的是iD)
-        String correspondingStandardId = "";
-        String replaceStandardId = "";//代替标准
-        if (!dataList.isEmpty()) {
-            correspondingStandardId = (String) dataList.get(0).get("corresponding_standard");//对应标准
-            replaceStandardId = (String) dataList.get(0).get("replace_standard");//代替标准
-        }
-
-        //被代替标准
-        List<String> replacedStandardIdList = new ArrayList<>();//代替标准
-
-        //对应标准,代替标准,被代替标准对应的编码
-        List<String> correspondingStandardNameList = new ArrayList<>();//对应标准编码
-        List<String> replaceStandardNameList = new ArrayList<>();//代替标准编码
-        List<String> replacedStandardNameList = new ArrayList<>();//被代替标准编码
-
-        List<Map<String, Object>> listCorrespondingStandard = new ArrayList<>();
-        List<Map<String, Object>> listReplaceStandard = new ArrayList<>();
-        List<Map<String, Object>> listReplacedStandard = new ArrayList<>();
-
-
-        //处理被代替标准和对应标准
-        for (Map<String, Object> map : mapList) {
-            Map<String, Object> stringObjectMap = new HashMap<>();
-            //对应标准处理
-            if (StringUtils.isNotBlank(correspondingStandardId) && correspondingStandardId.contains((String) map.get("id"))) {
-                for (String s : correspondingStandardId.split(",")) {
-                    Map<String, Object> mapTemp = new HashMap<>();
-                    if (s.equals((String) map.get("id"))) {
-                        correspondingStandardNameList.add((String) map.get("serial_number"));
-                        mapTemp.put("title", (String) map.get("serial_number"));
-                        mapTemp.put("id", (String) map.get("id"));
-                        if (ObjectUtils.isNotEmpty(mapTemp)) {
-                            listCorrespondingStandard.add(mapTemp);
-                        }
-                    } else {
-                        boolean flag = isId(s);
-                        if (!flag && !correspondingStandardNameList.contains(s)) {
-                            correspondingStandardNameList.add(s);
-                            mapTemp.put("title", s);
-                            mapTemp.put("id", "");
-                            if (ObjectUtils.isNotEmpty(mapTemp)) {
-                                listCorrespondingStandard.add(mapTemp);
-                            }
-                        }
-                    }
-                }
-            } else {
-                if (StringUtils.isNotBlank(correspondingStandardId)) {
-                    for (String s : correspondingStandardId.split(",")) {
-                        Map<String, Object> mapTemp = new HashMap<>();
-                        boolean flag = isId(s);
-                        if (!flag && !correspondingStandardNameList.contains(s)) {
-                            correspondingStandardNameList.add(s);
-                            mapTemp.put("title", s);
-                            mapTemp.put("id", "");
-                            if (ObjectUtils.isNotEmpty(mapTemp)) {
-                                listCorrespondingStandard.add(mapTemp);
-                            }
-                        }
-                    }
-                }
-
-            }
-            //代替标准
-            if (StringUtils.isNotBlank(replaceStandardId) && replaceStandardId.contains((String) map.get("id"))) {
-                for (String s : replaceStandardId.split(",")) {
-                    Map<String, Object> mapTemp = new HashMap<>();
-                    if (s.equals((String) map.get("id"))) {
-                        replaceStandardNameList.add((String) map.get("serial_number"));
-                        mapTemp.put("title", (String) map.get("serial_number"));
-                        mapTemp.put("id", (String) map.get("id"));
-                        if (ObjectUtils.isNotEmpty(mapTemp)) {
-                            listReplaceStandard.add(mapTemp);
-                        }
-                    } else {
-                        boolean flag = isId(s);
-                        if (!flag && !replaceStandardNameList.contains(s)) {
-                            replaceStandardNameList.add(s);
-                            mapTemp.put("title", s);
-                            mapTemp.put("id", "");
-                            if (ObjectUtils.isNotEmpty(mapTemp)) {
-                                listReplaceStandard.add(mapTemp);
-                            }
-                        }
-                    }
-                }
-            } else {
-                if (StringUtils.isNotBlank(replaceStandardId)) {
-                    for (String s : replaceStandardId.split(",")) {
-                        Map<String, Object> mapTemp = new HashMap<>();
-                        boolean flag = isId(s);
-                        if (!flag && !replaceStandardNameList.contains(s)) {
-                            replaceStandardNameList.add(s);
-                            mapTemp.put("title", s);
-                            mapTemp.put("id", "");
-                            if (ObjectUtils.isNotEmpty(mapTemp)) {
-                                listReplaceStandard.add(mapTemp);
-                            }
-                        }
-                    }
-                }
-            }
-            //被代替标准
-            String replaceStandard = (String) map.get("replace_standard");
-            if (StringUtils.isNotBlank(replaceStandard) && replaceStandard.contains(id)) {
-                replacedStandardIdList.add((String) map.get("id"));
-                String serialNumber = (String) map.get("serial_number");
-                replacedStandardNameList.add(serialNumber);
-                stringObjectMap.put("title", (String) map.get("serial_number"));
-                stringObjectMap.put("id", (String) map.get("id"));
-                if (ObjectUtils.isNotEmpty(stringObjectMap)) {
-                    listReplacedStandard.add(stringObjectMap);
-                }
-            }
-        }
-
         //区域管理
         OnlCgformArea onlCgformArea = new OnlCgformArea();
         onlCgformArea.setIsModel(ModuleEnum.DOCUMENT_LIBRARY.getValue());
         List<OnlCgformArea> areaList = onlCgformAreaServiceImpl.queryList(onlCgformArea);
-        //字段属性
-        List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList("1");
 
         //过滤出下拉选
         List<OnlCgformField> onlCgformFieldList = fieldList.stream()
@@ -1005,22 +935,34 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 } else {
                     //处理字段类型为文件之外的字段
                     if (dataList.size() != 0) {
+                        List<String> standardNameList = new ArrayList<>();//对应标准编码
+                        List<Map<String, Object>> listStandard = new ArrayList<>();
                         String finalValue = value;
                         dataList.get(0).entrySet().forEach(entry -> {
                             if (onlCgformField.getDbFieldName().equals(entry.getKey())) {
-                                if (onlCgformField.getDbFieldName().equals("replace_standard")) {
+                                //标准类型字段处理
-                                    //代替标准
+                                if(standFieldList.contains(entry.getKey())){
-                                    map.put("value", StringUtils.join(replaceStandardNameList, ","));
+                                    if(ObjectUtils.isNotEmpty(entry.getValue())){
-                                    map.put("list", listReplaceStandard);
+                                        for (Map<String, Object> map1 : mapList) {
-                                } else if (onlCgformField.getDbFieldName().equals("replaced_standard")) {
+                                            //对应标准处理
-                                    //被代替标准
+                                            if (ObjectUtils.isNotEmpty(entry.getValue())) {
-                                    map.put("value", StringUtils.join(replacedStandardNameList, ","));
+                                                for (String s : entry.getValue().toString().split(",")) {
-                                    map.put("list", listReplacedStandard);
+                                                    Map<String, Object> mapTemp1 = new HashMap<>();
-                                } else if (onlCgformField.getDbFieldName().equals("corresponding_standard")) {
+                                                    if (s.equals((String) map1.get("serial_number"))) {
-                                    //对应标准
+                                                        standardNameList.add((String) map1.get("serial_number"));
-                                    map.put("value", StringUtils.join(correspondingStandardNameList, ","));
+                                                        mapTemp1.put("title", (String) map1.get("serial_number"));
-                                    map.put("list", listCorrespondingStandard);
+                                                        mapTemp1.put("id", (String) map1.get("id"));
-                                } else if (FieldTypeEnum.DATE_SINGLE.getValue().equals(onlCgformField.getFieldShowType())) {
+                                                        if (ObjectUtils.isNotEmpty(mapTemp1)) {
+                                                            listStandard.add(mapTemp1);
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        map.put("value", entry.getValue().toString());
+                                        map.put("list", listStandard);
+                                    }
+                                }else if (FieldTypeEnum.DATE_SINGLE.getValue().equals(onlCgformField.getFieldShowType())) {
                                     map.put("value", finalValue);
                                 } else {
                                     map.put("value", entry.getValue());
@@ -1050,6 +992,331 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         }
         return result;
     }
+//    public List<Map<String, Object>> getInfoById(String id, String cut) {
+//        //通过id查询数据
+//        List<Map<String, Object>> dataList = bussDocumentLibraryEOMapper.selectMapsAll(id);
+//
+//        List<Map<String, Object>> result = new ArrayList<>(); // 要返回的结果
+//        if (dataList.isEmpty()){
+//            // 取不到数据，直接返回空结果
+//            return result;
+//        }
+//
+//        //查询所有
+//        List<Map<String, Object>> mapList = bussDocumentLibraryEOMapper.selectMapsAll(null);
+//
+//        //原始对应标准,代替标准,被代替标准(原始数据存的是iD)
+//        String correspondingStandardId = "";
+//        String replaceStandardId = "";//代替标准
+//        if (!dataList.isEmpty()) {
+//            correspondingStandardId = (String) dataList.get(0).get("corresponding_standard");//对应标准
+//            replaceStandardId = (String) dataList.get(0).get("replace_standard");//代替标准
+//        }
+//
+//        //被代替标准
+//        List<String> replacedStandardIdList = new ArrayList<>();//代替标准
+//
+//        //对应标准,代替标准,被代替标准对应的编码
+//        List<String> correspondingStandardNameList = new ArrayList<>();//对应标准编码
+//        List<String> replaceStandardNameList = new ArrayList<>();//代替标准编码
+//        List<String> replacedStandardNameList = new ArrayList<>();//被代替标准编码
+//
+//        List<Map<String, Object>> listCorrespondingStandard = new ArrayList<>();
+//        List<Map<String, Object>> listReplaceStandard = new ArrayList<>();
+//        List<Map<String, Object>> listReplacedStandard = new ArrayList<>();
+//
+//
+//        //处理被代替标准和对应标准
+//        for (Map<String, Object> map : mapList) {
+//            Map<String, Object> stringObjectMap = new HashMap<>();
+//            //对应标准处理
+//            if (StringUtils.isNotBlank(correspondingStandardId) && correspondingStandardId.contains((String) map.get("id"))) {
+//                for (String s : correspondingStandardId.split(",")) {
+//                    Map<String, Object> mapTemp = new HashMap<>();
+//                    if (s.equals((String) map.get("id"))) {
+//                        correspondingStandardNameList.add((String) map.get("serial_number"));
+//                        mapTemp.put("title", (String) map.get("serial_number"));
+//                        mapTemp.put("id", (String) map.get("id"));
+//                        if (ObjectUtils.isNotEmpty(mapTemp)) {
+//                            listCorrespondingStandard.add(mapTemp);
+//                        }
+//                    } else {
+//                        boolean flag = isId(s);
+//                        if (!flag && !correspondingStandardNameList.contains(s)) {
+//                            correspondingStandardNameList.add(s);
+//                            mapTemp.put("title", s);
+//                            mapTemp.put("id", "");
+//                            if (ObjectUtils.isNotEmpty(mapTemp)) {
+//                                listCorrespondingStandard.add(mapTemp);
+//                            }
+//                        }
+//                    }
+//                }
+//            } else {
+//                if (StringUtils.isNotBlank(correspondingStandardId)) {
+//                    for (String s : correspondingStandardId.split(",")) {
+//                        Map<String, Object> mapTemp = new HashMap<>();
+//                        boolean flag = isId(s);
+//                        if (!flag && !correspondingStandardNameList.contains(s)) {
+//                            correspondingStandardNameList.add(s);
+//                            mapTemp.put("title", s);
+//                            mapTemp.put("id", "");
+//                            if (ObjectUtils.isNotEmpty(mapTemp)) {
+//                                listCorrespondingStandard.add(mapTemp);
+//                            }
+//                        }
+//                    }
+//                }
+//
+//            }
+//            //代替标准
+//            if (StringUtils.isNotBlank(replaceStandardId) && replaceStandardId.contains((String) map.get("id"))) {
+//                for (String s : replaceStandardId.split(",")) {
+//                    Map<String, Object> mapTemp = new HashMap<>();
+//                    if (s.equals((String) map.get("id"))) {
+//                        replaceStandardNameList.add((String) map.get("serial_number"));
+//                        mapTemp.put("title", (String) map.get("serial_number"));
+//                        mapTemp.put("id", (String) map.get("id"));
+//                        if (ObjectUtils.isNotEmpty(mapTemp)) {
+//                            listReplaceStandard.add(mapTemp);
+//                        }
+//                    } else {
+//                        boolean flag = isId(s);
+//                        if (!flag && !replaceStandardNameList.contains(s)) {
+//                            replaceStandardNameList.add(s);
+//                            mapTemp.put("title", s);
+//                            mapTemp.put("id", "");
+//                            if (ObjectUtils.isNotEmpty(mapTemp)) {
+//                                listReplaceStandard.add(mapTemp);
+//                            }
+//                        }
+//                    }
+//                }
+//            } else {
+//                if (StringUtils.isNotBlank(replaceStandardId)) {
+//                    for (String s : replaceStandardId.split(",")) {
+//                        Map<String, Object> mapTemp = new HashMap<>();
+//                        boolean flag = isId(s);
+//                        if (!flag && !replaceStandardNameList.contains(s)) {
+//                            replaceStandardNameList.add(s);
+//                            mapTemp.put("title", s);
+//                            mapTemp.put("id", "");
+//                            if (ObjectUtils.isNotEmpty(mapTemp)) {
+//                                listReplaceStandard.add(mapTemp);
+//                            }
+//                        }
+//                    }
+//                }
+//            }
+//            //被代替标准
+//            String replaceStandard = (String) map.get("replace_standard");
+//            if (StringUtils.isNotBlank(replaceStandard) && replaceStandard.contains(id)) {
+//                replacedStandardIdList.add((String) map.get("id"));
+//                String serialNumber = (String) map.get("serial_number");
+//                replacedStandardNameList.add(serialNumber);
+//                stringObjectMap.put("title", (String) map.get("serial_number"));
+//                stringObjectMap.put("id", (String) map.get("id"));
+//                if (ObjectUtils.isNotEmpty(stringObjectMap)) {
+//                    listReplacedStandard.add(stringObjectMap);
+//                }
+//            }
+//        }
+//
+//        //区域管理
+//        OnlCgformArea onlCgformArea = new OnlCgformArea();
+//        onlCgformArea.setIsModel(ModuleEnum.DOCUMENT_LIBRARY.getValue());
+//        List<OnlCgformArea> areaList = onlCgformAreaServiceImpl.queryList(onlCgformArea);
+//        //字段属性
+//        List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList("1");
+//
+//        //过滤出下拉选
+//        List<OnlCgformField> onlCgformFieldList = fieldList.stream()
+//                .filter(e -> FieldTypeEnum.PULL_SINGLE.getValue().equals(e.getFieldShowType())
+//                        || FieldTypeEnum.PULL_MORE.getValue().equals(e.getFieldShowType()))
+//                .collect(Collectors.toList());
+//
+//        //过滤出树形字段
+//        List<OnlCgformField> treeFieldList = fieldList.stream()
+//                .filter(e -> FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType()))
+//                .collect(Collectors.toList());
+//
+//        //下拉选字段
+//        List<String> fieldPullList = onlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
+//
+//        //数据字典
+//        List<SysDictItem> sysDictItems = sysDictItemServiceImpl.selectItemsAll();
+//
+//        //树形数据字典
+//        List<SysCategory> categoryList = sysCategoryService.list();
+//        //处理树形数据字典
+//        dataList.get(0).entrySet().forEach(entry -> {
+//            //下拉选处理数据字典
+//            treeDictItem(categoryList, entry, treeFieldList, cut,null);
+//        });
+//
+//        //下拉单选和下拉多选数据字典处理
+//        List<OnlCgformField> finalFieldList = fieldList;
+//        dataList.get(0).entrySet().forEach(entry -> {
+//            if (fieldPullList.contains(entry.getKey())) {
+//                //下拉选处理数据字典
+//                dictItem(sysDictItems, entry, cut, finalFieldList,null);
+//            }
+//        });
+//
+//        if (fieldList.size() != 0) {
+//            //过滤出表单字段(is_show_form-->表单是否显示0否 1是)
+//            fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowForm()))).collect(Collectors.toList());
+//        }
+//
+//        for (OnlCgformArea onlCgformAreaTemp : areaList) {
+//            String areaName = "";
+//            if (CutEnum.CN.getValue().equals(cut)) {
+//                areaName = onlCgformAreaTemp.getShowArea();
+//            } else {
+//                areaName = onlCgformAreaTemp.getEnName();
+//            }
+//            Map<String, Object> mapTemp = new HashMap<>();
+//            List<Map<String, Object>> resultTemp = new ArrayList<>();
+//            List<OnlCgformField> fieldListTemp = fieldList.stream().filter(e -> onlCgformAreaTemp.getId().equals(e.getShowArea())).collect(Collectors.toList());
+//            for (OnlCgformField onlCgformField : fieldListTemp) {
+//                //字段
+//                String dbFieldName = onlCgformField.getDbFieldName();
+//                //字段类型
+//                String fieldShowType = onlCgformField.getFieldShowType();
+//                String value = "";
+//                if (FieldTypeEnum.DATE_SINGLE.getValue().equals(fieldShowType)) {
+//                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+//                    if (ObjectUtils.isNotEmpty(dataList.get(0).get(dbFieldName))) {
+//                        value = sdf.format(dataList.get(0).get(dbFieldName));
+//                    }
+//                } else {
+//                    value = String.valueOf(dataList.get(0).get(dbFieldName));
+//                    if("null".equals(value)){
+//                        value = "";
+//                    }
+//                }
+//                Map<String, Object> map = new HashMap<>();
+//                //处理文件
+//                if (FieldTypeEnum.FILE.getValue().equals(fieldShowType)) {
+//                    //处理文本信息和关联信息区域之外的区域中文件类型字段返归结果格式
+//                    if(!"文本信息".equals(onlCgformAreaTemp.getShowArea()) && !"关联信息".equals(onlCgformAreaTemp.getShowArea())){
+//                        List<OSSFile> fileInfos = iOSSFileService.getFileInfosByConnectId(value);
+//                        List<String> fileIdList = fileInfos.stream().map(OSSFile::getId).collect(Collectors.toList());
+//                        Map<String, Object> mapNew = new HashMap<>();
+//                        mapPut(cut, mapNew, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName, null);
+//                        mapNew.put("value",fileIdList);
+//                        resultTemp.add(mapNew);
+//                    }else{
+//                        if (StringUtils.isNotBlank(value)) {
+//                            List<OSSFile> fileInfos = iOSSFileService.getFileInfosByConnectId(value);
+//                            //多文件处理
+//                            if (fileInfos.size() > 1) {
+//                                if (fileInfos.size() != 0) {
+//                                    int i = 0;
+//                                    for (OSSFile fileInfo : fileInfos) {
+//                                        if (i == 0) {
+//                                            Map<String, Object> mapNew = new HashMap<>();
+//                                            mapNew.put("value", fileInfo);
+//                                            mapPut(cut, mapNew, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName, null);
+//                                            mapNew.put("count", fileInfos.size());
+//                                            // 添加标准分解单跳转
+//                                            List<SarFileSplitInfoEO> infoEOList = sarFileSplitInfoService.queryByFileId(fileInfo.getId());
+//                                            if (CollectionUtil.isNotEmpty(infoEOList)) {
+//                                                mapNew.put("splitFlag", 1);
+//                                                mapNew.put("splitInfoId", infoEOList.get(0).getId());
+//                                            } else{
+//                                                mapNew.put("splitFlag", 0);
+//                                            }
+//
+//                                            resultTemp.add(mapNew);
+//                                            i++;
+//                                        } else {
+//                                            Map<String, Object> mapNew = new HashMap<>();
+//                                            mapNew.put("value", fileInfo);
+//                                            mapPut(cut, mapNew, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName, null);
+//                                            // 添加标准分解单跳转
+//                                            List<SarFileSplitInfoEO> infoEOList = sarFileSplitInfoService.queryByFileId(fileInfo.getId());
+//                                            if (CollectionUtil.isNotEmpty(infoEOList)) {
+//                                                mapNew.put("splitFlag", 1);
+//                                                mapNew.put("splitInfoId", infoEOList.get(0).getId());
+//                                            } else{
+//                                                mapNew.put("splitFlag", 0);
+//                                            }
+//                                            resultTemp.add(mapNew);
+//                                        }
+//                                    }
+//                                }
+//                            } else if (fileInfos.size() == 1) {
+//                                //单个文件处理
+//                                Map<String, Object> mapNew = new HashMap<>();
+//                                mapNew.put("count", fileInfos.size());
+//                                mapNew.put("value", fileInfos.get(0));
+//                                mapPut(cut, mapNew, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName, null);
+//                                // 添加标准分解单跳转
+//                                List<SarFileSplitInfoEO> infoEOList = sarFileSplitInfoService.queryByFileId(fileInfos.get(0).getId());
+//                                if (CollectionUtil.isNotEmpty(infoEOList)) {
+//                                    mapNew.put("splitFlag", 1);
+//                                    mapNew.put("splitInfoId", infoEOList.get(0).getId());
+//                                } else{
+//                                    mapNew.put("splitFlag", 0);
+//                                }
+//                                resultTemp.add(mapNew);
+//                            }
+//                        } else {
+//                            Map<String, Object> mapNew = new HashMap<>();
+//                            mapNew.put("value", "");
+//                            mapPut(cut, mapNew, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName, null);
+//                            resultTemp.add(mapNew);
+//                        }
+//                    }
+//                } else {
+//                    //处理字段类型为文件之外的字段
+//                    if (dataList.size() != 0) {
+//                        String finalValue = value;
+//                        dataList.get(0).entrySet().forEach(entry -> {
+//                            if (onlCgformField.getDbFieldName().equals(entry.getKey())) {
+//                                if (onlCgformField.getDbFieldName().equals("replace_standard")) {
+//                                    //代替标准
+//                                    map.put("value", StringUtils.join(replaceStandardNameList, ","));
+//                                    map.put("list", listReplaceStandard);
+//                                } else if (onlCgformField.getDbFieldName().equals("replaced_standard")) {
+//                                    //被代替标准
+//                                    map.put("value", StringUtils.join(replacedStandardNameList, ","));
+//                                    map.put("list", listReplacedStandard);
+//                                } else if (onlCgformField.getDbFieldName().equals("corresponding_standard")) {
+//                                    //对应标准
+//                                    map.put("value", StringUtils.join(correspondingStandardNameList, ","));
+//                                    map.put("list", listCorrespondingStandard);
+//                                } else if (FieldTypeEnum.DATE_SINGLE.getValue().equals(onlCgformField.getFieldShowType())) {
+//                                    map.put("value", finalValue);
+//                                } else {
+//                                    map.put("value", entry.getValue());
+//                                }
+//                            }
+//                        });
+//                    }
+//                    mapPut(cut, map, "field_show_type",
+//                            onlCgformField.getFieldShowType(), "dict_field",
+//                            onlCgformField.getDictField(), "db_field_name",
+//                            onlCgformField.getDbFieldName(), "db_field_txt",
+//                            onlCgformField.getDbFieldTxt(), "db_field_en_name",
+//                            onlCgformField.getDbFieldEnName(), "area", areaName, null);
+//                }
+//                if (map.size() != 0) {
+//                    resultTemp.add(map);
+//                }
+//            }
+//            if (CutEnum.CN.getValue().equals(cut)) {
+//                areaName = onlCgformAreaTemp.getShowArea();
+//                mapTemp.put(areaName, resultTemp);
+//            } else {
+//                areaName = onlCgformAreaTemp.getEnName();
+//                mapTemp.put(areaName, resultTemp);
+//            }
+//            result.add(mapTemp);
+//        }
+//        return result;
+//    }
 
     private void mapPut(String cut, Map<String, Object> map, String field_show_type,
                         String fieldShowType2, String dict_field, String dictField,
@@ -3004,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");
@@ -3113,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");
@@ -4377,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-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java

@@ -274,6 +274,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                 wrapperInfo.in(DummyContentChangeEO::getParentId,dummyInventoryBaseEO.getId());
                 List<DummyContentChangeEO> dummyContentChangeEOInfoList = iDummyContentChangeEOService.list(wrapperInfo);
 
+                if(CollectionUtils.isNotEmpty(dummyContentChangeEOInfoList)){
                 //3.对比基础表数据
                 //3.1截止到现在发布,期间修改的数据(基础)
                 //最新的数据为-->dummyInventoryBaseEOList
@@ -410,6 +411,13 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                         dummyContentChangeEOMapper.update(null,infoUpdateWrapper);
                     }
                 }
+            }else{
+                    if(CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) {
+                        throw new JeroBootException("维护清单为空,发布失败");
+                    }else{
+                        throw new JeroBootException("The maintenance list is empty, and publishing failed.");
+                    }
+                }
             }
         }else{
             //撤回,需要发消息

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java

@@ -7,6 +7,7 @@ import com.jero.common.system.base.controller.JeroController;
 import com.jero.modules.project.entity.ProjectRelatedPersonnel;
 import com.jero.modules.project.service.IProjectRelatedPersonnelService;
 import com.jero.modules.project.util.ExcelLangUtils;
+import com.jero.modules.system.entity.SysUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -197,4 +198,17 @@ public class ProjectRelatedPersonnelController extends JeroController<ProjectRel
 		Map<String, Object> objectMap = this.projectRelatedPersonnelService.queryPersonByProjectId(projectId, dutyTerritory);
 		return Result.OK(objectMap);
 	}
+
+	/**
+	 * 通过projectId查询认证工程师
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "项目库-相关人员维护表-根据projectId查询认证工程师")
+	@ApiOperation(value="项目库-相关人员维护表-根据projectId查询认证工程师", notes="项目库-相关人员维护表-根据projectId查询认证工程师")
+	@GetMapping(value = "/queryCertificationEngineer")
+	public Result<?> queryCertificationEngineer(@RequestParam(name="projectId",required=true) String projectId){
+		List<SysUser> certificationEngineerList = projectRelatedPersonnelService.queryCertificationEngineer(projectId);
+		return Result.OK(certificationEngineerList);
+	}
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java

@@ -231,4 +231,17 @@ public class ProjectTaskInventoryEO implements Serializable {
     /**中英文切换**/
     @TableField(exist = false)
     private String cut;
+
+    /**设计符合性流程-结束前三天发送消息标识0未发 1已发**/
+    private String designSendMsgFlag;
+    /**设计符合性流程-结束当天发送消息标识0未发 1已发**/
+    private String designSendMsgCurrentFlag;
+    /**prehomo确认流程-结束前三天发送消息标识0未发 1已发**/
+    private String prehomoSendMsgFlag;
+    /**prehomo确认流程-结束当天发送消息标识0未发 1已发**/
+    private String prehomoSendMsgCurrentFlag;
+    /**验证符合性流程-结束前三天发送消息标识0未发 1已发**/
+    private String verifySendMsgFlag;
+    /**验证符合性流程-结束当天发送消息标识0未发 1已发**/
+    private String verifySendMsgCurrentFlag;
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java

@@ -10,7 +10,6 @@ import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper;
 import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
 import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
 import com.jero.modules.project.service.IProjectLawsInventoryEOService;
-import com.jero.modules.system.entity.SysUser;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -19,7 +18,6 @@ import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java

@@ -3,6 +3,7 @@ package com.jero.modules.project.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.common.api.vo.Result;
 import com.jero.modules.project.entity.ProjectRelatedPersonnel;
+import com.jero.modules.system.entity.SysUser;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
@@ -85,4 +86,5 @@ public interface IProjectRelatedPersonnelService extends IService<ProjectRelated
 
 	ProjectRelatedPersonnel queryByProjectIdAndDutyTerritory(String projectId, String dutyTerritory);
 
+    List<SysUser> queryCertificationEngineer(String projectId);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java

@@ -759,4 +759,29 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 			updateById(projectRelatedPersonnel);
 		}
 	}
+
+	@Override
+	public List<SysUser> queryCertificationEngineer(String projectId) {
+		QueryWrapper<ProjectRelatedPersonnel> queryWrapper = new QueryWrapper<>();
+		List<ProjectRelatedPersonnel> list = list(queryWrapper.eq("project_id",projectId));
+
+		List<String> certificationEngineerList = list.stream().map(e -> e.getCertificationEngineer()).collect(Collectors.toList());
+
+		StringBuilder userIdBuilder=new StringBuilder();
+		List<SysUser> certificationEngineerUsers = new ArrayList<>();
+		if(CollectionUtils.isNotEmpty(certificationEngineerList)){
+			for(String certificationEngineerId :certificationEngineerList){
+				if(StringUtils.isNotBlank(certificationEngineerId)) {
+					userIdBuilder.append(certificationEngineerId).append(",");
+				}
+			}
+			String userId = userIdBuilder.substring(0, userIdBuilder.toString().length() - 1);
+			List userIdList = Arrays.asList(userId.split(","));
+			userIdList.stream().distinct().collect(Collectors.toList());
+			QueryWrapper<SysUser> userqueryWrapper = new QueryWrapper<>();
+			userqueryWrapper.in("id ", userIdList);
+			certificationEngineerUsers = sysUserMapper.selectList(userqueryWrapper);
+		}
+		return certificationEngineerUsers;
+	}
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java

@@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
@@ -61,24 +62,28 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 			projectTaskInventoryDetailEO.setCreateTime(now);
 			projectTaskInventoryDetailEO.setUpdateTime(now);
 			List<ProjectTaskInventoryDetailEO> list = new ArrayList<>();
-
+			LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 			List<String> userIdList = Arrays.asList(projectTaskInventoryDetailEO.getUserIds().split(","));
-			userIdList.forEach(userId -> {
+			//过滤掉当前操作人。
-				ProjectTaskInventoryDetailEO taskInventoryDetailEO = new ProjectTaskInventoryDetailEO();
+			userIdList = userIdList.stream().distinct().filter(userId-> !org.apache.commons.lang3.StringUtils.equals(userId,currentUser.getId())).collect(Collectors.toList());
-				BeanUtils.copyProperties(projectTaskInventoryDetailEO,taskInventoryDetailEO);
+			if(CollectionUtils.isNotEmpty(userIdList)){
-				taskInventoryDetailEO.setUserId(userId);
+				userIdList.forEach(userId -> {
-				list.add(taskInventoryDetailEO);
+					ProjectTaskInventoryDetailEO taskInventoryDetailEO = new ProjectTaskInventoryDetailEO();
-			});
+					BeanUtils.copyProperties(projectTaskInventoryDetailEO,taskInventoryDetailEO);
+					taskInventoryDetailEO.setUserId(userId);
+					list.add(taskInventoryDetailEO);
+				});
 
-			//先删后加，确保一个用户只有一个任务。
+				//先删后加，确保一个用户只有一个任务。
-			QueryWrapper<ProjectTaskInventoryDetailEO> deleteWrapper = new QueryWrapper<>();
+				QueryWrapper<ProjectTaskInventoryDetailEO> deleteWrapper = new QueryWrapper<>();
-			deleteWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getActiProcInstId,projectTaskInventoryDetailEO.getActiProcInstId());
+				deleteWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getActiProcInstId,projectTaskInventoryDetailEO.getActiProcInstId());
-			deleteWrapper.lambda().in(ProjectTaskInventoryDetailEO::getUserId,userIdList);
+				deleteWrapper.lambda().in(ProjectTaskInventoryDetailEO::getUserId,userIdList);
-			this.baseMapper.delete(deleteWrapper);
+				this.baseMapper.delete(deleteWrapper);
 
-			super.saveBatch(list);
+				super.saveBatch(list);
 
-			sendMessage(projectTaskInventoryDetailEO,userIdList);
+				sendMessage(projectTaskInventoryDetailEO,userIdList);
+			}
 		}
     }
 
@@ -92,7 +97,7 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
     public void editById(ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO) {
     	Date now = new Date();
         projectTaskInventoryDetailEO.setUpdateTime(now);
-    	saveOrUpdate(projectTaskInventoryDetailEO);
+        this.baseMapper.updateById(projectTaskInventoryDetailEO);
     }
 
 	/**

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java

@@ -547,28 +547,28 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 					String textByValue = DesignComplianceStatusEnum.getTextByValue(projectTaskInventoryEO.getDesignStatus(), cut);
 					projectTaskInventoryEO.setDesignStatus(textByValue);
 				}
-				if(StringUtils.isNotEmpty(projectTaskInventoryEO.getDesignFlowTaskStatus())){
+				/*if(StringUtils.isNotEmpty(projectTaskInventoryEO.getDesignFlowTaskStatus())){
 					String textByValue = ReviewResultEnum.getTextByValue(projectTaskInventoryEO.getDesignFlowTaskStatus(), cut);
 					projectTaskInventoryEO.setDesignFlowTaskStatus(textByValue);
-				}
+				}*/
 
 				if(StringUtils.isNotEmpty(projectTaskInventoryEO.getPrehomoStatus())){
 					String textByValue = DesignComplianceStatusEnum.getTextByValue(projectTaskInventoryEO.getPrehomoStatus(), cut);
 					projectTaskInventoryEO.setPrehomoStatus(textByValue);
 				}
-				if(StringUtils.isNotEmpty(projectTaskInventoryEO.getPrehomoFlowTaskStatus())){
+				/*if(StringUtils.isNotEmpty(projectTaskInventoryEO.getPrehomoFlowTaskStatus())){
 					String textByValue = ReviewResultEnum.getTextByValue(projectTaskInventoryEO.getPrehomoFlowTaskStatus(), cut);
 					projectTaskInventoryEO.setPrehomoFlowTaskStatus(textByValue);
-				}
+				}*/
 
 				if(StringUtils.isNotEmpty(projectTaskInventoryEO.getVerifyStatus())){
 					String textByValue = DesignComplianceStatusEnum.getTextByValue(projectTaskInventoryEO.getVerifyStatus(), cut);
 					projectTaskInventoryEO.setVerifyStatus(textByValue);
 				}
-				if(StringUtils.isNotEmpty(projectTaskInventoryEO.getVerifyFlowTaskStatus())){
+				/*if(StringUtils.isNotEmpty(projectTaskInventoryEO.getVerifyFlowTaskStatus())){
 					String textByValue = ReviewResultEnum.getTextByValue(projectTaskInventoryEO.getVerifyFlowTaskStatus(), cut);
 					projectTaskInventoryEO.setVerifyFlowTaskStatus(textByValue);
-				}
+				}*/
 			}
 		}
 	}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/SendMessageUtils.java

@@ -40,8 +40,8 @@ public class SendMessageUtils {
         SendMessageUtils.sysAnnouncementService = sysAnnouncementService;
     }
 
-    @Autowired
     private static IFeishuService iFeishuService;
+    @Autowired
     public void setIFeishuService(IFeishuService iFeishuService){
         SendMessageUtils.iFeishuService = iFeishuService;
     }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java

@@ -108,8 +108,8 @@ public class workFlowController {
     @AutoLog(value = "流程实例明细列表")
     @ApiOperation(value="流程实例明细列表", notes="流程实例明细列表")
     @GetMapping("/get_list_by_instance")
-    public List<Map<String, Object>> get_list_by_instance(@RequestParam("prcNum") String prcNum,@RequestParam(value="sortWord",required = false)String sortWord,@RequestParam(value="shunxu",required = false) String shunxu){
+    public List<Map<String, Object>> get_list_by_instance(@RequestParam("prcNum") String prcNum,@RequestParam("cut") String cut,@RequestParam("prcType") String prcType,@RequestParam(value="sortWord",required = false)String sortWord,@RequestParam(value="shunxu",required = false) String shunxu){
-        return workFlowFeignClient.get_list_by_instance(prcNum,sortWord,shunxu);
+        return workFlowFeignClient.get_list_by_instance(prcNum,cut,prcType,sortWord,shunxu);
     }
 
     @AutoLog(value = "获取图片")
@@ -143,8 +143,8 @@ public class workFlowController {
     @AutoLog(value = "根据流程实例id查询流程历史")
     @ApiOperation(value="根据流程实例id查询流程历史", notes="根据流程实例id查询流程历史")
     @GetMapping("/queryProcessHistoryByPrcId")
-    public List<Map<String, Object>> queryProcessHistoryByPrcId(@RequestParam("prcId") String prcId,@RequestParam(value="sortWord",required = false)String sortWord,@RequestParam(value="shunxu",required = false) String shunxu){
+    public List<Map<String, Object>> queryProcessHistoryByPrcId(@RequestParam("prcId") String prcId,@RequestParam("cut") String cut,@RequestParam("prcType") String prcType,@RequestParam(value="sortWord",required = false)String sortWord,@RequestParam(value="shunxu",required = false) String shunxu){
-        return workFlowFeignClient.queryProcessHistoryByPrcId(prcId,sortWord,shunxu);
+        return workFlowFeignClient.queryProcessHistoryByPrcId(prcId,cut,prcType,sortWord,shunxu);
     }
 
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/TaskCommonQuery.java

@@ -47,4 +47,6 @@ public class TaskCommonQuery {
 
 	@ApiModelProperty(value = "高级搜索字符串")
 	private String advanceSearchVOStr;
+
+	private String cut;
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java

@@ -87,7 +87,7 @@ public interface WorkFlowFeignClient {
      * @return
      */
     @RequestMapping(value = "/bat-wkflow/task/get_list_by_instance",method = RequestMethod.GET)
-    List<Map<String, Object>> get_list_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu);
+    List<Map<String, Object>> get_list_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam("cut") String cut,@RequestParam("prcType") String prcType,@RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu);
 
     /**
      * 获取图片
@@ -125,6 +125,6 @@ public interface WorkFlowFeignClient {
      * @return
      */
     @RequestMapping(value = "/bat-wkflow/task/queryProcessHistoryByPrcId",method = RequestMethod.GET)
-    List<Map<String, Object>> queryProcessHistoryByPrcId(@RequestParam("prcId") String prcId, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu);
+    List<Map<String, Object>> queryProcessHistoryByPrcId(@RequestParam("prcId") String prcId, @RequestParam("cut") String cut,@RequestParam("prcType") String prcType,@RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu);
 
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java

@@ -103,8 +103,8 @@ public class WorkFlowFeignClientImpl{
      * @param shunxu
      * @return
      */
-    public List<Map<String, Object>> get_list_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu){
+    public List<Map<String, Object>> get_list_by_instance(@RequestParam("prcNum") String prcNum,@RequestParam("cut") String cut,@RequestParam("prcType") String prcType, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu){
-        return  workFlowFeignClient.get_list_by_instance(prcNum,sortWord,shunxu);
+        return  workFlowFeignClient.get_list_by_instance(prcNum,cut,prcType,sortWord,shunxu);
     }
 
     /**
@@ -145,7 +145,7 @@ public class WorkFlowFeignClientImpl{
      * @param shunxu
      * @return
      */
-    public List<Map<String, Object>> queryProcessHistoryByPrcId(@RequestParam("prcId") String prcId, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu){
+    public List<Map<String, Object>> queryProcessHistoryByPrcId(@RequestParam("prcId") String prcId,@RequestParam("cut") String cut,@RequestParam("prcType") String prcType, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu){
-        return  workFlowFeignClient.queryProcessHistoryByPrcId(prcId,sortWord,shunxu);
+        return  workFlowFeignClient.queryProcessHistoryByPrcId(prcId,cut,prcType,sortWord,shunxu);
     }
 }

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',
@@ -789,4 +789,7 @@ module.exports = {
   yellow: 'yellow',
   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: '操作内容',
@@ -794,4 +795,6 @@ module.exports = {
   yellow:'黄',
   resultReported:'结果报告',
   TheDoesNotContainData:'该虚拟清单的维护清单中没有数据,是否需要添加',
+  number:'序号',
+  Deadline:'截止时间',
 }

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

@@ -3,43 +3,78 @@
     <div class='box'>
 <!--      纯文本-->
       <div v-if='detailDate.controlType === "1"'>
-        <a-input class="box-input"
+        <div v-for='(item,index) in detailDate.list' :key='index'>
-                 :disabled="disabled"
+          <div v-if='item.type==="text"'>
-                 v-model="formInline.nioNumber"
+            <a-input class="box-input"
-                 :placeholder="$t('PleaseEnter')+$t('NiONumber')"/>
+                     :disabled="disabled"
+                     v-model="formInline.nioNumber"
+                     :placeholder="$t('PleaseEnter')+$t('NiONumber')"/>
+          </div>
+        </div>
       </div>
 <!--      纯下拉单选-->
       <div v-if='detailDate.controlType === "2"'>
-        <a-select :placeholder="$t('PleaseSelect')+$t('controlType')" v-model="formInline.controlType">
+        <div v-for='(item,index) in detailDate.list' :key='index'>
-          <a-select-option v-for="(item, key) in detailDate.list" :key="key" :value="item.value">
+          <div v-if='item.type === "pull"'>
+            <a-select :placeholder="$t('PleaseSelect')+$t('controlType')" v-model="formInline.controlType">
+              <a-select-option v-for="(item, key) in item.list" :key="key" :value="item.value">
                     <span style="display: inline-block;width: 100%" :title=" item.label ">
                       {{ item.label }}
                     </span>
-          </a-select-option>
+              </a-select-option>
-        </a-select>
+            </a-select>
-        <a-input class="box-input"
+          </div>
-                 :disabled="disabled"
+        </div>
-                 v-model="formInline.nioNumber"
-                 :placeholder="$t('PleaseEnter')+$t('NiONumber')"/>
       </div>
 <!--      纯下拉多选-->
-      <div v-if='detailDate.controlType === "3"'>22</div>
+      <div v-if='detailDate.controlType === "3"'>
+
+      </div>
 <!--      纯附件-->
-      <div v-if='detailDate.controlType === "4"'>22</div>
+      <div v-if='detailDate.controlType === "4"'>
+
+      </div>
 <!--      文本+下拉单选-->
-      <div v-if='detailDate.controlType === "5"'>22</div>
+      <div v-if='detailDate.controlType === "5"'>
+
+      </div>
 <!--      文本+下拉多选-->
-      <div v-if='detailDate.controlType === "6"'>22</div>
+      <div v-if='detailDate.controlType === "6"'>
+
+      </div>
 <!--      文本+附件-->
-      <div v-if='detailDate.controlType === "7"'>22</div>
+      <div v-if='detailDate.controlType === "7"'>
+
+      </div>
 <!--      下拉单选+附件-->
-      <div v-if='detailDate.controlType === "8"'>22</div>
+      <div v-if='detailDate.controlType === "8"'>
+
+      </div>
 <!--      下拉多选+附件-->
-      <div v-if='detailDate.controlType === "9"'>22</div>
+      <div v-if='detailDate.controlType === "9"'>
+
+      </div>
 <!--      文本+下拉单选+附件-->
-      <div v-if='detailDate.controlType === "10"'>22</div>
+      <div v-if='detailDate.controlType === "10"' style='display: flex'>
+        <div v-for='(item,index) in detailDate.list' :key='index'>
+          <div v-if='item.type==="pull"'>
+            <a-select :placeholder="$t('PleaseSelect')+$t('controlType')" v-model="formInline.controlType">
+              <a-select-option v-for="(item, key) in item.controlValue" :key="key" :value="item.value">
+                    <span style="display: inline-block;width: 100%" :title=" item.label ">
+                      {{ item.label }}
+                    </span>
+              </a-select-option>
+            </a-select>
+          </div>
+          <div v-if='item.type==="text"'>
+            <a-input class="box-input"
+                     :disabled="disabled"
+                     v-model="formInline.nioNumber"
+                     :placeholder="$t('PleaseEnter')+$t('NiONumber')"/>
+          </div>
+        </div>
+      </div>
     </div>
-<!--   {{  detailDate.controlType }}-->
   </div>
 </template>
 
@@ -67,6 +102,9 @@ export default {
 
   },
   watch: {
+    detailDate(newold,oldold) {
+      console.log(newold,oldold,'ll')
+    }
   }
 }
 </script>

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/components/tableCollection/index.vue

@@ -27,7 +27,7 @@
                      </a>
          </span>
         <span slot="detailClick" slot-scope="text,record">
-          <collection-type :detailDate='record' />
+          <collection-type :detailDate='text' />
         </span>
       </a-table>
     </div>

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/documentTools/virtualList/index.vue

@@ -277,7 +277,7 @@
                 _this.$message.success(_this.$t('OperationSuccessful'))
                 _this.getList()
               } else {
-                _this.$message.warning(_this.$t('operationFailed'))
+                _this.$message.warning(res.message)
               }
             })
           }

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>
@@ -125,9 +131,9 @@
       return {
         columns: [
           {
-            title: this.$t('serialNumber'),
+            title: this.$t('number'),
             align: 'center',
-            width: 80,
+            width: 70,
             customRender: function(t, r, index) {
               return parseInt(index) + 1
             }
@@ -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'
             }
           ]