u

dsk-module/dsk-biz-api/src/main/java/com/dsk/component/DataAnalysisComponent.java

@@ -49,11 +49,13 @@ public class DataAnalysisComponent {
      */
     @Async
     public void quantitySummaryDataAnalysis(CbProjectBaseBo bo) throws Exception {
+
         //查询工料汇总导入文件
         List<CbProjectFile> fileList = projectFileService.selectAnalysisList(bo.getProjectId(), CbProjectConstants.CB_TYPE_QUANTITY_SUMMARY, bo.getCbStage());
         if (ObjectUtils.isEmpty(fileList)) return;
         //文件处理
         for (CbProjectFile file : fileList) {
+            try {
                 //文件下载
                 InputStream inputStream = ossService.downFileIO(file.getFileOssId());
                 if (ObjectUtil.isNull(inputStream)) {
@@ -80,6 +82,7 @@ public class DataAnalysisComponent {
                 if (quantitySummaryList.isEmpty()) {
                     throw new ServiceException("表格中不存在有效数据!");
                 }
+
                 transactionTemplate.execute(status -> {
                     try {
 //                    //分批次插入
@@ -117,6 +120,12 @@ public class DataAnalysisComponent {
                     }
                     return Boolean.TRUE;
                 });
+            } catch (Exception e) {
+                file.setFileParseStatus(3);
+                file.setFailRemark(e.getMessage());
+                projectFileService.updateById(file);
             }
         }
+
+    }
 }

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/CbProjectFileMapper.xml

@@ -17,12 +17,11 @@
         id, project_id, cb_stage, cb_type, file_name, file_oss_id, file_oss_url, file_parse_status, fail_remark,
         del_flag, create_by, create_time, update_by, update_time
         FROM cb_project_file
-        WHERE (del_flag = 0 and file_parse_status = 1
-        and project_id=#{projectId}
+        WHERE del_flag = 0 and file_parse_status in (1,3) and project_id=#{projectId}
         <if test="cbStage != null">
             and cb_stage =#{cbStage}
         </if>
-        and cb_type = #{cbType})
+        and cb_type = #{cbType}
     </select>
 
     <update id="removeById">