项目台账fix bug

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/CbProjectRecordController.java

@@ -67,7 +67,7 @@ public class CbProjectRecordController extends BaseController {
      * 获取项目台账列表
      */
     @GetMapping("/getProjectList")
-    public TableDataInfo<CbProjectRecordSearchVo> getProjectList(@RequestBody CbProjectSearchBo searchBo, PageQuery pageQuery) {
+    public TableDataInfo<CbProjectRecordSearchVo> getProjectList(CbProjectSearchBo searchBo, PageQuery pageQuery) {
         return baseService.getProjectList(searchBo, pageQuery);
     }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/CbProjectRecord.java

@@ -44,9 +44,9 @@ public class CbProjectRecord extends BaseEntity implements Serializable {
      */
     private String ipmProjectNo;
     /**
-     * 是否获取项目详情(0:是、1:否)
+     * 是否获取项目详情
      */
-    private Integer isGetProjectDetail;
+    private Boolean isGetProjectDetail;
     /**
      * 文件名称
      */

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/AddCbProjectBo.java

@@ -20,10 +20,10 @@ public class AddCbProjectBo {
      */
     private String ipmProjectNo;
     /**
-     * 是否获取项目详情(0:否、1:是)
+     * 是否获取项目详情
      */
     @NotNull(message = "是否获取项目详情不能为空")
-    private Integer isGetProjectDetail;
+    private Boolean isGetProjectDetail;
     /**
      * 文件名称
      */

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/EditProjectInfoBo.java

@@ -25,10 +25,10 @@ public class EditProjectInfoBo {
      */
     private String ipmProjectNo;
     /**
-     * 是否获取项目详情(0:否、1:是)
+     * 是否获取项目详情
      */
     @NotNull(message = "是否获取项目详情不能为空")
-    private Integer isGetProjectDetail;
+    private Boolean isGetProjectDetail;
     /**
      * 文件名称
      */

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

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsk.common.core.domain.PageQuery;
 import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.common.helper.LoginHelper;
 import com.dsk.common.utils.StringUtils;
 import com.dsk.component.DataAnalysisComponent;
 import com.dsk.cscec.constant.CbProjectConstants;
@@ -20,13 +21,16 @@ import com.dsk.cscec.domain.bo.*;
 import com.dsk.cscec.domain.vo.CbProjectRecordSearchVo;
 import com.dsk.cscec.mapper.CbProjectFileMapper;
 import com.dsk.cscec.mapper.CbProjectRecordMapper;
+import com.dsk.cscec.service.CbProjectExpenseSummaryService;
 import com.dsk.cscec.service.CbProjectRecordService;
+import com.dsk.cscec.service.CbSummaryService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -43,6 +47,10 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
     private CbProjectFileMapper projectFileMapper;
     @Resource
     private DataAnalysisComponent dataAnalysisComponent;
+    @Resource
+    private CbSummaryService cbSummaryService;
+    @Resource
+    private CbProjectExpenseSummaryService projectExpenseSummaryService;
 
     /**
      * 新增项目
@@ -109,17 +117,21 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
         projectFileService.updateBatchById(projectFileList.stream().peek(projectFile -> projectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSING)).collect(Collectors.toList()));
 
         //TODO:调各个成本类型的解析文件方法
+        Integer cbStage = projectRecord.getCbStage();
+        String username = Objects.requireNonNull(LoginHelper.getLoginUser()).getUsername();
         //直接费成本
         //工料汇总
         CbProjectBaseBo projectBaseBo = new CbProjectBaseBo();
         projectBaseBo.setProjectId(projectId);
-        projectBaseBo.setCbStage(projectRecord.getCbStage());
+
+        projectBaseBo.setCbStage(cbStage);
         dataAnalysisComponent.quantitySummaryDataAnalysis(projectBaseBo);
         //措施项目
         //其他项目
         //现场经费
+        projectExpenseSummaryService.parseSceneExpenseData(projectId,cbStage,username);
         //成本汇总
-
+        cbSummaryService.importCbSummary(projectId);
     }
 
     /**