u

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/constant/CbProjectConstants.java

@@ -61,32 +61,32 @@ public interface CbProjectConstants {
     /**
      * 成本类型:直接费成本
      */
-    Integer CB_TYPE_DIRECT_EXPENSE = 0;
+    int CB_TYPE_DIRECT_EXPENSE = 0;
     String CB_TYPE_DIRECT_EXPENSE_NAME = "直接费成本";
     /**
      * 成本类型:工料汇总
      */
-    Integer CB_TYPE_QUANTITY_SUMMARY = 1;
+    int CB_TYPE_QUANTITY_SUMMARY = 1;
     String CB_TYPE_QUANTITY_SUMMARY_NAME = "工料汇总";
     /**
      * 成本类型:措施项目
      */
-    Integer CB_TYPE_MEASURE_PROJECT = 2;
+    int CB_TYPE_MEASURE_PROJECT = 2;
     String CB_TYPE_MEASURE_PROJECT_NAME = "措施项目";
     /**
      * 成本类型:其他项目
      */
-    Integer CB_TYPE_OTHER_PROJECT = 3;
+    int CB_TYPE_OTHER_PROJECT = 3;
     String CB_TYPE_OTHER_PROJECT_NAME = "其他项目";
     /**
      * 成本类型:现场经费
      */
-    Integer CB_TYPE_SCENE_EXPENSE = 4;
+    int CB_TYPE_SCENE_EXPENSE = 4;
     String CB_TYPE_SCENE_EXPENSE_NAME = "现场经费";
     /**
      * 成本类型:成本汇总
      */
-    Integer CB_TYPE_SUMMARY = 5;
+    int CB_TYPE_SUMMARY = 5;
     String CB_TYPE_SUMMARY_NAME = "成本汇总";
 
 }

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

@@ -8,6 +8,7 @@ import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.cscec.domain.CbProjectRecord;
 import com.dsk.cscec.domain.bo.*;
 import com.dsk.cscec.domain.vo.CbProjectCbStageNotDraftVo;
+import com.dsk.cscec.domain.vo.CbProjectInfoVo;
 import com.dsk.cscec.domain.vo.CbProjectRecordSearchVo;
 import com.dsk.cscec.service.CbProjectRecordService;
 import com.dsk.cscec.service.IDProjectService;
@@ -76,7 +77,7 @@ public class CbProjectRecordController extends BaseController {
      * 获取项目历史阶段信息(懒加载)
      */
     @GetMapping("/getProjectHistoryInfo")
-    public R<List<CbProjectRecord>> getProjectHistoryInfo(@RequestBody CbProjectHistorySearchBo searchBo) {
+    public R<List<CbProjectRecord>> getProjectHistoryInfo(CbProjectHistorySearchBo searchBo) {
         return R.ok(baseService.getProjectHistoryInfo(searchBo));
     }
 
@@ -136,5 +137,13 @@ public class CbProjectRecordController extends BaseController {
     public R<Void> deleteDraft(@NotNull(message = "项目ID不能为空") @PathVariable Long projectId) {
         return toAjax(baseService.deleteDraft(projectId));
     }
+
+    /**
+     * 获取工程项目信息
+     */
+    @GetMapping("/getCbProjectInfo/{projectId}")
+    public R<CbProjectInfoVo> getCbProjectInfo(@NotNull(message = "项目ID不能为空") @PathVariable Long projectId) {
+        return R.ok(dProjectService.getCbProjectInfo(projectId));
+    }
 }
 

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

@@ -72,6 +72,7 @@ public class CbProjectExpenseSummaryServiceImpl extends ServiceImpl<CbProjectExp
             InputStream inputStream = ossService.downFileIO(projectFile.getFileOssId());
             if (ObjectUtil.isNull(inputStream)) {
                 projectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_FAIL);
+                log.error("FileId:" + projectFile.getId() + ",文件数据不存在");
                 projectFile.setFailRemark("文件数据不存在");
                 projectFileMapper.updateById(projectFile);
                 continue;
@@ -80,6 +81,7 @@ public class CbProjectExpenseSummaryServiceImpl extends ServiceImpl<CbProjectExp
             List<CbProjectExpenseSummary> importList = new ExcelUtils<>(CbProjectExpenseSummary.class).importExcelAllSheet(inputStream, 0);
             if (importList.isEmpty()) {
                 projectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_FAIL);
+                log.error("FileId:" + projectFile.getId() + ",表格中不存在待导入数据");
                 projectFile.setFailRemark("表格中不存在待导入数据!");
                 projectFileMapper.updateById(projectFile);
                 continue;
@@ -100,7 +102,8 @@ public class CbProjectExpenseSummaryServiceImpl extends ServiceImpl<CbProjectExp
                     .collect(Collectors.toList());
             if (summaryList.size() != importList.size()) {
                 projectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_FAIL);
-                projectFile.setFailRemark("表格中存在\"名称\"列为空数据!");
+                log.error("FileId:" + projectFile.getId() + ",表格中存在\"名称\"列为空数据!");
+                projectFile.setFailRemark("表格中存在\"名称\"列为空数据");
                 projectFileMapper.updateById(projectFile);
                 continue;
             }

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

@@ -113,6 +113,7 @@ public class CbSceneExpenseChildrenServiceImpl extends ServiceImpl<CbSceneExpens
             InputStream inputStream = ossService.downFileIO(projectFile.getFileOssId());
             if (ObjectUtil.isNull(inputStream)) {
                 projectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_FAIL);
+                log.error("FileId:" + projectFile.getId() + ",文件数据不存在");
                 projectFile.setFailRemark("文件数据不存在");
                 projectFileMapper.updateById(projectFile);
                 continue;
@@ -121,6 +122,7 @@ public class CbSceneExpenseChildrenServiceImpl extends ServiceImpl<CbSceneExpens
             List<CbSceneExpenseChildrenImportBo> importList = new ExcelUtils<>(CbSceneExpenseChildrenImportBo.class).importExcelAllSheet(inputStream, 0);
             if (importList.isEmpty()) {
                 projectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_FAIL);
+                log.error("FileId:" + projectFile.getId() + ",表格中不存在待导入数据");
                 projectFile.setFailRemark("表格中不存在待导入数据");
                 projectFileMapper.updateById(projectFile);
                 continue;
@@ -154,7 +156,8 @@ public class CbSceneExpenseChildrenServiceImpl extends ServiceImpl<CbSceneExpens
                     .collect(Collectors.toList());
             if (summaryList.size() != importList.size()) {
                 projectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_FAIL);
-                projectFile.setFailRemark("表格中存在\"名称\"列为空数据!");
+                log.error("FileId:" + projectFile.getId() + ",表格中存在\"名称\"列为空数据");
+                projectFile.setFailRemark("表格中存在\"名称\"列为空数据");
                 projectFileMapper.updateById(projectFile);
                 continue;
             }