修改认证导出

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

@@ -4346,6 +4346,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
         List<String> dbFieldExampleList = new LinkedList<>();
 
         // 固定列
+        int indexOfDescription = 1; // 参数名称的位置
         for (int i = 0; i < fieldList.size(); i++) {
             OnlCgformField onlCgformField = fieldList.get(i);
             String dbFieldName = onlCgformField.getDbFieldName();
@@ -4356,6 +4357,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                     || "control_type".equals(dbFieldName) || "control_verify".equals(dbFieldName) || "control_values".equals(dbFieldName)
                     || "is_must".equals(dbFieldName) || "references_col".equals(dbFieldName)) {
                 dbFieldList.add(dbFieldName);
+                if ("nio_number".equals(dbFieldName)) {
+                    indexOfDescription = i;
+                }
 
                 if (CutEnum.CN.getValue().equals(cut)) {
                     dbFieldNameList.add(onlCgformField.getDbFieldTxt()); // 字段中文名
@@ -4417,6 +4421,26 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
         dbFieldList.addAll(dbFieldListConfig);
         dbFieldNameList.addAll(dbFieldNameListConfig);
 
+        // 认证类别列
+        List<String> dbFieldNameListCC = new LinkedList<>();
+        List<String> dbFieldListCC = new LinkedList<>();
+        // 查询所有认证类别
+        List<SysDictItem> sysDictItemList = sysDictItemService.selectItemsByDictCode("cert_category");
+        if (CutEnum.EN.getValue().equals(cut)) {
+            sysDictItemList.forEach(sysDictItem -> {
+                dbFieldListCC.add(sysDictItem.getItemValue());
+                dbFieldNameListCC.add(sysDictItem.getEnName() + " Number");
+            });
+
+        } else {
+            sysDictItemList.forEach(sysDictItem -> {
+                dbFieldListCC.add(sysDictItem.getItemValue());
+                dbFieldNameListCC.add(sysDictItem.getItemText() + "编号");
+            });
+        }
+        dbFieldList.addAll(dbFieldListCC);
+        dbFieldNameList.addAll(dbFieldNameListCC);
+
         String[] title = new String[3];
         String dbFieldStr = StringUtils.join(dbFieldList, ",");
         String dbFieldNameStr = StringUtils.join(dbFieldNameList, ",");
@@ -4595,6 +4619,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         ParamsManifestEO paramsManifestEO = paramsManifestEOService.getById(paramsManifestId);
+        String paramsTemplateId = paramsManifestEO.getParamsTemplateId();
+        Integer paramsTemplatePublishVersion = paramsManifestEO.getParamsTemplatePublishVersion();
 
         ParamsCollectManifestEO paramsCollectManifestEO = new ParamsCollectManifestEO();
         BeanUtils.copyProperties(paramsCollectManifestVO, paramsCollectManifestEO);
@@ -4832,6 +4858,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			result.add(record1);
 		}*/
 
+        List<String> nioNumberList = dataList.stream().map(m -> (String) m.getNioNumber()).collect(Collectors.toList());
+        List<CertCategoryParamsInfoPublishEO> certCategoryParamsInfoPublishEOList = certCategoryParamsInfoPublishEOService.queryListByVersionAndNio(paramsTemplateId, paramsTemplatePublishVersion, nioNumberList); //查询所有认证类别参数项
+
         for (ParamsCollectManifestEO collectManifestEO : exportDataList) {
             Map<String, Object> record1 = objectToMapDre(collectManifestEO);
             String controlType = (String) record1.get("control_type");
@@ -4844,6 +4873,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
             record1.put("control_type", controlTypeMap.get(controlType));
             record1.put("control_verify", controlVerifyMap.get(controlVerify));
 
+            // 认证类别列
+            List<CertCategoryParamsInfoPublishEO> certCategoryParamsInfoPublishEOS = certCategoryParamsInfoPublishEOList.stream().filter(e -> nioNumber.equals(e.getNioNumber())).collect(Collectors.toList());
+            if (CollectionUtil.isNotEmpty(certCategoryParamsInfoPublishEOS)) {
+                certCategoryParamsInfoPublishEOS.forEach(certCategoryParamsInfoPublishEO -> {
+                    record1.put(certCategoryParamsInfoPublishEO.getCertCategory(), certCategoryParamsInfoPublishEO.getParamsNumber());
+                });
+            }
+
             // 处理参考列，没引用过则不显示该列
             if (StringUtils.isNotEmpty(paramsManifestEO.getReferencesColName()) && StringUtils.isNotEmpty(collectManifestEO.getReferencesCol())) {
                 List<String> referencesColList = Arrays.asList(collectManifestEO.getReferencesCol().split("#"));
@@ -5480,6 +5517,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                         || "is_must".equals(key) || "references_col".equals(key)) {
                     continue;
                 }
+                if(key.length() < 15){
+                    continue;
+                }
                 //
                 ParamsConfigDataEO configDataEO = new ParamsConfigDataEO();
                 List<ParamsConfigDataEO> list = paramsConfigDataEOList.stream().filter(e -> collectManifestMap.get(nioNumber).equals(e.getParamsCollectManifestId())