台账管理-业内台账

1、判断附件是否完整 把table_file中的附件也要包含在内

blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/QueryProcessDataVO.java

@@ -54,6 +54,10 @@ public class QueryProcessDataVO {
      * 文件pdf路径
      */
     private String contractTableFileType;
+    /**
+     * 文件pdf路径
+     */
+    private String contractTableFileTypeTwo;
 
     /**
      * 附件报告

blade-service/blade-business/src/main/java/org/springblade/business/controller/NeiYeController.java

@@ -160,9 +160,15 @@ public class NeiYeController {
                             List<String> names = new ArrayList<>();
 
                             if (StringUtils.isNotEmpty(qdr.getContractTableFileType())) {
+                                if(StringUtils.isNotEmpty(qdr.getContractTableFileTypeTwo())){
+                                    qdr.setContractTableFileType(qdr.getContractTableFileType()+","+qdr.getContractTableFileTypeTwo());
+                                }
+
                                 List<String> contractFileType = Arrays.asList(qdr.getContractTableFileType().split(","));
+
+                                HashSet<String> strings = new HashSet<>(contractFileType);
                                 //后台配置的与合同段配置的附件类型比较 查到质检未配置的附件名称
-                                List<String> collect = privateFileType.stream().filter(fileType -> !contractFileType.contains(fileType)).collect(Collectors.toList());
+                                List<String> collect = privateFileType.stream().filter(fileType -> !strings.contains(fileType)).collect(Collectors.toList());
                                 if (CollectionUtil.isNotEmpty(collect)) {
                                     collect.forEach(f -> names.add("【" + dictMap.get(f) + "】"));
                                 } else {

blade-service/blade-business/src/main/java/org/springblade/business/mapper/InformationQueryMapper.xml

@@ -55,6 +55,7 @@
         <result column="pdfUrl" property="pdfUrl"/>
         <result column="privateTableFileType" property="privateTableFileType"/>
         <result column="contractTableFileType" property="contractTableFileType"/>
+        <result column="contractTableFileTypeTwo" property="contractTableFileTypeTwo"/>
         <result column="pdfUrl" property="pdfUrl"/>
     </resultMap>
 
@@ -443,6 +444,7 @@
                uiq.status,
                p.table_file_type									                                    AS privateTableFileType,
                (select GROUP_CONCAT(DISTINCT table_file_type) from u_trial_file_pdf_record where node_id = wtc.p_key_id) contractTableFileType,
+               (select GROUP_CONCAT(DISTINCT type) from m_table_file where tab_id = wtc.p_key_id and is_deleted = 0 and classify = #{classify}) contractTableFileTypeTwo,
                (
                    select case iq.status
                               WHEN 2 then 'true'
@@ -835,6 +837,7 @@
                uiq.pdf_url                                                                              AS pdfUrl,
                p.table_file_type									                                    AS privateTableFileType,
                (select GROUP_CONCAT(DISTINCT table_file_type) from u_trial_file_pdf_record where node_id = wtc.p_key_id) contractTableFileType,
+               (select GROUP_CONCAT(DISTINCT type) from m_table_file where tab_id = wtc.p_key_id and is_deleted = 0 and classify = #{classify}) contractTableFileTypeTwo,
                case
                    WHEN uiq.pdf_trial_url is null then 'false'
                    ELSE 'true' end                                                                      AS isExperiment