项目台账解析流程优化

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbProjectRecordServiceImpl.java

@@ -54,6 +54,8 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
     private CbSceneExpenseChildrenService sceneExpenseChildrenService;
     @Resource
     private CbProjectOtherService projectOtherService;
+    @Resource
+    private ICbCostMeasureService costMeasureService;
 
     /**
      * 新增项目
@@ -129,6 +131,7 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
         projectBaseBo.setCbStage(cbStage);
         dataAnalysisComponent.quantitySummaryDataAnalysis(projectBaseBo);
         //措施项目
+        costMeasureService.parseCbCostMeasureFile(projectId);
         //其他项目
         projectOtherService.projectOtherDataAnalysis(projectBaseBo);
         //现场经费
@@ -149,8 +152,10 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
         List<CbProjectFile> projectFileList = projectFileMapper.selectList(new LambdaQueryWrapper<CbProjectFile>()
                 .eq(CbProjectFile::getProjectId, projectId)
                 .eq(CbProjectFile::getCbType, cbType)
-                //项目文件状态:准备中
-                .eq(CbProjectFile::getFileParseStatus, CbProjectConstants.PROJECT_FILE_STATUS_PREPARING));
+                //项目文件状态:准备中or解析失败
+                .eq(CbProjectFile::getFileParseStatus, CbProjectConstants.PROJECT_FILE_STATUS_PREPARING)
+                .or()
+                .eq(CbProjectFile::getFileParseStatus, CbProjectConstants.PROJECT_FILE_STATUS_PARSE_FAIL));
         Assert.isFalse(projectFileList.isEmpty(), cbTypeName + "至少需要上传1个文件");
         return projectFileList;
     }
@@ -345,7 +350,8 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
             //不允许删除正在解析中的项目
             Assert.isFalse(projectRecord.getProjectFileStatus().equals(CbProjectConstants.PROJECT_FILE_STATUS_PARSING)
                     , "存在解析中的项目,删除失败");
-            //TODO:各个成本类型数据和对应每月成本数据暂不做删除,项目台账列表查不出来自然也无法查看数据
+
+            //各个成本类型数据和对应每月成本数据暂不做删除,项目台账列表查不出来自然也无法查看数据
 
             //删除项目文件记录
             flag = projectFileMapper.delete(new LambdaQueryWrapper<CbProjectFile>()

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

@@ -17,7 +17,7 @@
         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 in (1,3)
+        WHERE (del_flag = 0 and file_parse_status = 1
         and project_id=#{projectId}
         <if test="cbStage != null">
             and cb_stage =#{cbStage}