试验-接入成渝第三方接口开发

1、清除绑定信息

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

@@ -18,7 +18,7 @@ public interface TrialCyAccessoriesMapper extends BaseMapper<TrialCyAccessories>
     Boolean clearTrialAssociation(@Param("nodeId") Long nodeId,
                                   @Param("recordId") Long recordId);
 
-    List<String> selectFilePdfList(@Param("nodeId") Long nodeId,
+    List<Long> selectFilePdfList(@Param("nodeId") Long nodeId,
                                    @Param("types") Integer... types);
 }
 

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

@@ -19,7 +19,7 @@
     <delete id="clearTrialAssociation">
         delete from u_trial_file_pdf_record where node_id = #{nodeId} and record_id=#{recordId}
     </delete>
-    <select id="selectFilePdfList" resultType="java.lang.String">
+    <select id="selectFilePdfList" resultType="java.lang.Long">
         select record_id from u_trial_file_pdf_record where node_id = #{nodeId} and type in
           <foreach collection="types" item="type" open="(" close=")" separator=",">
               #{type}

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialCyAccessoriesServiceImpl.java

@@ -54,8 +54,7 @@ public class TrialCyAccessoriesServiceImpl extends ServiceImpl<TrialCyAccessorie
 
         baseMapper.clearTrialAssociation(nodeId, recordId);
         //重新生成pdf
-        List<String> listOne = baseMapper.selectFilePdfList(nodeId, 11);
-        List<String> listTwo = baseMapper.selectFilePdfList(nodeId, 11, 12);
+        List<Long> listOne = baseMapper.selectFilePdfList(nodeId, 11,12,13);
 
         InformationQuery informationQuery = informationQueryService.getBaseMapper().selectList(Wrappers.<InformationQuery>lambdaQuery()
                 .eq(InformationQuery::getWbsId, nodeId)
@@ -66,25 +65,10 @@ public class TrialCyAccessoriesServiceImpl extends ServiceImpl<TrialCyAccessorie
         List<String> pdfList = new ArrayList<>();
         //成渝自检
         if (CollectionUtil.isNotEmpty(listOne)) {
-            List<TrialCyFinishTestReport> trialCyFinishTestReports = trialCyFinishTestReportService.getBaseMapper().selectList(Wrappers.<TrialCyFinishTestReport>lambdaQuery()
-                    .in(TrialCyFinishTestReport::getTaskId, listOne));
-            trialCyFinishTestReports.forEach(f -> {
-                if (StringUtils.isNotBlank(f.getAssembleFile())) {
-                    pdfList.add(f.getAssembleFile());
-                }
-            });
+            List<String> pdfFiles = trialCyFinishTestReportService.selectViewPdfList(listOne);
+            pdfList.addAll(pdfFiles);
         }
 
-        //外委-第三方
-        if (CollectionUtil.isNotEmpty(listOne)) {
-            List<TrialCyThirdReport> trialCyThirdReports = trialCyThirdReportService.getBaseMapper().selectList(Wrappers.<TrialCyThirdReport>lambdaQuery()
-                    .in(TrialCyThirdReport::getId, listTwo));
-            trialCyThirdReports.forEach(f -> {
-                if (StringUtils.isNotBlank(f.getAssembleFile())) {
-                    pdfList.add(f.getAssembleFile());
-                }
-            });
-        }
 
         String pdfTrialUrl = informationQuery.getPdfTrialUrl();
         //删除之前的文件