u

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

@@ -50,11 +50,7 @@ public class DataAnalysisComponent {
     @Async
     public void quantitySummaryDataAnalysis(CbProjectBaseBo bo) throws Exception {
         //查询工料汇总导入文件
-        List<CbProjectFile> fileList = projectFileService.list(Wrappers.<CbProjectFile>lambdaQuery()
-                .eq(CbProjectFile::getProjectId, bo.getProjectId())
-                .eq(CbProjectFile::getCbType, CbProjectConstants.CB_TYPE_QUANTITY_SUMMARY)
-                .eq(CbProjectFile::getCbStage, bo.getCbStage())
-                .in(CbProjectFile::getFileParseStatus, Arrays.asList(1, 3)));
+        List<CbProjectFile> fileList = projectFileService.selectAnalysisList(bo.getProjectId(), CbProjectConstants.CB_TYPE_QUANTITY_SUMMARY, bo.getCbStage());
         if (ObjectUtils.isEmpty(fileList)) return;
         //文件处理
         for (CbProjectFile file : fileList) {

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/CbProjectFileMapper.java

@@ -2,6 +2,9 @@ package com.dsk.cscec.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.dsk.cscec.domain.CbProjectFile;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 项目成本文件表(CbProjectFile)表数据库访问层
@@ -11,5 +14,7 @@ import com.dsk.cscec.domain.CbProjectFile;
  */
 public interface CbProjectFileMapper extends BaseMapper<CbProjectFile> {
 
+    List<CbProjectFile> selectAnalysisList(@Param("projectId") Long projectId,@Param("cbType") Integer cbType,@Param("cbStage") Integer cbStage);
+
 }
 

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

@@ -6,6 +6,8 @@ import com.dsk.cscec.domain.bo.AddProjectFileUploadBo;
 import com.dsk.cscec.domain.vo.QueryProjectFileUploadDetailVo;
 import com.dsk.system.domain.vo.SysOssVo;
 
+import java.util.List;
+
 /**
  * 项目成本文件表(CbProjectFile)表服务接口
  *
@@ -44,4 +46,14 @@ public interface CbProjectFileService extends IService<CbProjectFile> {
      * @return 文件列表
      */
     QueryProjectFileUploadDetailVo getProjectFileUploadDetail(Long projectId);
+
+    /**
+     * 查询项目文件解析列表
+     * @param projectId 项目ID
+     * @param cbType 成本阶段(0:标前成本、1:标后成本、2:转固成本)
+     * @param cbStage 成本类型(0:直接费成本、1:工料汇总、2:措施项目、3:其他项目、4:现场经费、5:成本汇总)
+     * @return
+     */
+    List<CbProjectFile> selectAnalysisList(Long projectId, Integer cbType, Integer cbStage);
+
 }

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

@@ -162,6 +162,11 @@ public class CbProjectFileServiceImpl extends ServiceImpl<CbProjectFileMapper, C
         return draftDetailVo;
     }
 
+    @Override
+    public List<CbProjectFile> selectAnalysisList(Long projectId, Integer cbType, Integer cbStage) {
+        return baseMapper.selectAnalysisList(projectId, cbType, cbStage);
+    }
+
     /**
      * 校验项目是否存在
      *

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.dsk.cscec.mapper.CbProjectFileMapper">
+    <select id="selectAnalysisList" resultType="com.dsk.cscec.domain.CbProjectFile">
+        SELECT
+            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)) or del_flag = 1)
+        and project_id=#{projectId} and cb_stage =#{cbStage} and cb_type = #{cbType}
+    </select>
 </mapper>
\ No newline at end of file