合并分支 'dev_2nd_LCYH' 到 'master'

Dev 2nd lcyh

查看合并请求 laws-nio/laws-weilai!302

jero-boot/db/蔚来标准sql/dev_2nd_period.sql

@@ -448,4 +448,8 @@ ALTER TABLE `project_version_info`
 ALTER TABLE `project_version_info`
     ADD COLUMN `project_laws_inventory_id` varchar(255) NULL COMMENT '法规清单数据id' AFTER `verify_flow_status`;
 ALTER TABLE `project_version_info`
-    ADD COLUMN `applicable_supplement` varchar(255) NULL COMMENT '适用增补件' AFTER `project_laws_inventory_id`;
+    ADD COLUMN `applicable_supplement` varchar(255) NULL COMMENT '适用增补件' AFTER `project_laws_inventory_id`;
+
+-- 虚拟认证清单-增加字段     2023-3-30   未同步生产环境
+ALTER TABLE `auth_dummy_inventory_info`
+    ADD COLUMN `deliverable_template` varchar(500) NULL COMMENT '交付物模板' AFTER `auth_dummy_inventory_base_id`;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java

@@ -134,4 +134,12 @@ public class AuthDummyInventoryInfoEO implements Serializable {
     /**值类型，对应SysCategoryValueTypeEnum中value**/
     @TableField(exist = false)
     private String valueType;
+
+    /**交付物模板*/
+    @ApiModelProperty(value = "交付物模板")
+    private String deliverableTemplate;
+    /**交付物模板名称**/
+    @TableField(exist = false)
+    @Excel(name = "交付物模板", width = 20)
+    private String deliverableTemplateName;
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java

@@ -27,6 +27,7 @@ import com.jero.modules.dummy.entity.DummyInventoryInfoEO;
 import com.jero.modules.dummy.enums.DummyInventoryBaseFieldEnum;
 import com.jero.modules.dummy.service.impl.DummyLogEOServiceImpl;
 import com.jero.modules.dummy.util.DeepCopyListUtil;
+import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
 import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
 import com.jero.modules.project.enums.ProjectInventoryFieldEnum;
@@ -1302,6 +1303,8 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 		if(CollectionUtils.isNotEmpty(datas)){
 			List<SysCategory> categoryList = this.sysCategoryService.list();
 			List<SysDictItem> sysDictItems = this.sysDictItemServiceImpl.getBaseMapper().selectItemsAll();
+			String deliverableTemplates = datas.stream().map(AuthDummyInventoryInfoEO::getDeliverableTemplate).distinct().collect(Collectors.joining(","));
+			List<OSSFile> deliverableTemplateFileList = iOSSFileService.getFileInfos(deliverableTemplates);
 
 			for (AuthDummyInventoryInfoEO data : datas) {
 				if(StringUtils.isNotEmpty(data.getDeliverableType())){
@@ -1312,6 +1315,20 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 					String dutyTerritoryName = this.sysDictItemService.disposeShowDictItemValue(sysDictItems,data.getDutyTerritory(),cut, ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue());
 					data.setDutyTerritoryName(dutyTerritoryName);
 				}
+				if(StringUtils.isNotBlank(data.getDeliverableTemplate())){
+					String[] deliverableTemplateArr = data.getDeliverableTemplate().split(",");
+					String deliverableTemplateName = deliverableTemplateFileList.stream().filter(file -> {
+						boolean flag = false;
+						for (String deliverableTemplate : deliverableTemplateArr) {
+							if (StringUtils.equals(file.getId(),deliverableTemplate)) {
+								flag = true;
+								break;
+							}
+						}
+						return flag;
+					}).map(OSSFile::getFileName).collect(Collectors.joining(","));
+					data.setDeliverableTemplateName(deliverableTemplateName);
+				}
 			}
 
 		}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java

@@ -288,6 +288,14 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
 		 return Result.OK(list);
 	 }
 
+	@ApiOperation(value="详情目录查询", notes="详情目录查询")
+	@GetMapping(value = "/getMenuList")
+	public Result<List<Map<String,Object>>> getMenuList(@RequestParam(name="id",required=true) String id,
+														@RequestParam(name="cut",required=true) String cut) {
+		List<Map<String, Object>> list = bussDocumentLibraryEOService.getMenuList(id,cut);
+		return Result.OK(list);
+	}
+
 	 /**
 	  * 新增数据
 	  * @param map

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

@@ -98,6 +98,7 @@ public interface IBussDocumentLibraryEOService extends IService<BussDocumentLibr
      */
     List<Map<String, Object>> getInfoById(String id, String cut);
 
+    List<Map<String, Object>> getMenuList(String id, String cut);
     /**
      * 新增数据
      *

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

@@ -1030,6 +1030,53 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 //        return dataList;
 //    }
 
+
+    public List<Map<String, Object>> getMenuList(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());
+        List<Map<String, Object>> result = new ArrayList<>(); // 要返回的结果
+
+        //区域管理
+        OnlCgformArea onlCgformArea = new OnlCgformArea();
+        onlCgformArea.setIsModel(ModuleEnum.DOCUMENT_LIBRARY.getValue());
+        List<OnlCgformArea> areaList = onlCgformAreaServiceImpl.queryList(onlCgformArea);
+
+        for (OnlCgformArea onlCgformAreaTemp : areaList) {
+            String areaName = "";
+            if (CutEnum.CN.getValue().equals(cut)) {
+                areaName = onlCgformAreaTemp.getShowArea();
+            } else {
+                areaName = onlCgformAreaTemp.getEnName();
+            }
+            Map<String, Object> menuMap = new HashMap<>();
+            menuMap.put("name",areaName);
+            result.add(menuMap);
+            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();
+
+                if (FieldTypeEnum.FILE.getValue().equals(fieldShowType)) {
+                    Map<String, Object> menuMap1 = new HashMap<>();
+                    menuMap1.put("pname",areaName);
+                    if (CutEnum.CN.getValue().equals(cut)) {
+                        menuMap1.put("name",onlCgformField.getDbFieldTxt());
+                    } else {
+                        menuMap1.put("name",onlCgformField.getDbFieldEnName());
+                    }
+                    result.add(menuMap1);
+                }
+            }
+        }
+        return result;
+    }
+
     /**
      * 详情数据查询
      *
@@ -1098,7 +1145,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             //过滤出表单字段(is_show_form-->表单是否显示0否 1是)
             fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(StringUtils.valueOf(e.getIsShowForm()))).collect(Collectors.toList());
         }
-
         for (OnlCgformArea onlCgformAreaTemp : areaList) {
             String areaName = "";
             if (CutEnum.CN.getValue().equals(cut)) {
@@ -1161,61 +1207,31 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                         mapNew.put("value",fileIdList);
                         resultTemp.add(mapNew);
                     }else{
+
                         if (StringUtils.isNotBlank(value)) {
+                            Map<String, Object> mapNew = new HashMap<>();
+                            List<Map<String, Object>> listVal = new ArrayList<>();
                             List<OSSFile> fileInfos = iOSSFileService.getFileInfosByConnectId(value);
                             //多文件处理
-                            if (fileInfos.size() > 1) {
+                            if(ObjectUtils.isNotEmpty(fileInfos)){
-                                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);
-                                // 添加标准分解单跳转
+                                for (OSSFile fileInfo : fileInfos) {
-                                List<SarFileSplitInfoEO> infoEOList = sarFileSplitInfoService.queryByFileId(fileInfos.get(0).getId());
+                                    Map<String, Object> mapValue = new HashMap<>();
-                                if (CollectionUtil.isNotEmpty(infoEOList)) {
+                                    mapValue.put("id",fileInfo.getId());
-                                    mapNew.put("splitFlag", 1);
+                                    mapValue.put("fileName",fileInfo.getFileName());
-                                    mapNew.put("splitInfoId", infoEOList.get(0).getId());
+                                    List<SarFileSplitInfoEO> infoEOList = sarFileSplitInfoService.queryByFileId(fileInfo.getId());
-                                } else{
+                                    // 添加标准分解单跳转
-                                    mapNew.put("splitFlag", 0);
+                                    if (CollectionUtil.isNotEmpty(infoEOList)) {
+                                        mapValue.put("splitFlag", 1);
+                                        mapValue.put("splitInfoId", infoEOList.get(0).getId());
+                                    } else{
+                                        mapValue.put("splitFlag", 0);
+                                    }
+                                    listVal.add(mapValue);
                                 }
-                                resultTemp.add(mapNew);
                             }
+                            mapNew.put("value", listVal);
+                            resultTemp.add(mapNew);
                         } else {
                             Map<String, Object> mapNew = new HashMap<>();
                             mapNew.put("value", "");
@@ -1973,11 +1989,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 if (null != bl) {
                     String repStr = bl.getReplacedStandard();
                     if (StringUtils.isNotBlank(repStr)) {
-                        if (!repStr.contains(idTemp)) {
+                        if (!repStr.contains(StringUtils.valueOf(map.get("serial_number")))) {
-                            repStr = repStr + "," + idTemp;
+                            repStr = repStr + "," + StringUtils.valueOf(map.get("serial_number"));
                         }
                     } else {
-                        repStr = idTemp;
+                        repStr = StringUtils.valueOf(map.get("serial_number"));
                     }
                     bl.setReplacedStandard(repStr);
                     bussDocumentLibraryEOMapper.updateById(bl);
@@ -2684,7 +2700,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         bussDocumentLibraryEOMapper.deleteById((String) map.get("id"));
         bussDocumentLibraryEOMapper.insertInfo(insertField, insertValue);
         //处理代替标准和被代替标准逻辑
-        String docId = (String) map.get("id");
+        String docId = StringUtils.valueOf(map.get("serial_number"));
         Object repObj = map.get("replace_standard_id");
         if(null != repObj){
             String[] replace_standard_list = repObj.toString().split(",");

jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue

@@ -691,4 +691,9 @@
   ::v-deep .ant-table-placeholder {
     margin-top: 8px !important;
   }
+
+  .viewFile {
+    color: #00B3BE;
+    cursor: pointer;
+  }
 </style>