Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

dsk-admin/src/main/resources/application.yml

@@ -186,16 +186,14 @@ tenant:
     - d_customer_tax_certificate
     - f_supplier_limited
     - f_ads_bsi_kpi_proj_two
-    - cb_account_summary
-    - cb_account_summary_actual
+    - cb_summary
+    - cb_summary_actual
     - cb_cost_measure
     - cb_cost_measure_actual
     - cb_direct_expense
     - cb_project_expense_summary
     - cb_project_file
     - cb_project_record
-    - cb_project_summary
-    - cb_project_summary_actual
     - cb_quantity_summary
     - cb_quantity_summary_actual
     - cb_scene_expense_children

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

+package com.dsk.component;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.dsk.common.excel.ExcelUtils;
+import com.dsk.common.exception.ServiceException;
+import com.dsk.cscec.constant.CbProjectConstants;
+import com.dsk.cscec.domain.CbProjectFile;
+import com.dsk.cscec.domain.CbQuantitySummary;
+import com.dsk.cscec.domain.bo.CbProjectBaseBo;
+import com.dsk.cscec.service.CbProjectFileService;
+import com.dsk.cscec.service.ICbQuantitySummaryActualService;
+import com.dsk.cscec.service.ICbQuantitySummaryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+
+import java.io.FileInputStream;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 数据解析组件
+ *
+ * @Author lcl
+ * @Data 2024/2/7 17:43
+ */
+@Component
+public class DataAnalysisComponent {
+
+    @Autowired
+    private ICbQuantitySummaryService quantitySummaryService;
+
+    /**
+     * 工料汇总数据解析
+     */
+    @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()));
+        if (ObjectUtils.isEmpty(fileList)) return;
+        //文件处理
+        for (CbProjectFile file : fileList) {
+            if (file.getDelFlag() == 0) {
+                if (file.getFileParseStatus() == 3) break;
+                //文件下载
+                //解析数据
+                List<CbQuantitySummary> importList = new ExcelUtils<>(CbQuantitySummary.class).importExcelAllSheet(new FileInputStream(""), 1);
+                if (importList.isEmpty()) {
+                    throw new ServiceException("表格中不存在待导入数据!");
+                }
+                importList = importList.stream().parallel()
+                        .filter(item -> !ObjectUtils.isEmpty(item.getCbName()))
+                        .peek(item -> {
+                            item.setProjectId(1L);
+                            item.setCbStage(0);
+                            item.setCbProjectFileId(1L);
+                        }).collect(Collectors.toList());
+                if (importList.isEmpty()) {
+                    throw new ServiceException("表格中不存在有效数据数据!");
+                }
+                //分批次插入
+                if (importList.size() > 1000) {
+                    int index = 0;
+                    int sum = importList.size();
+                    while (index < sum) {
+                        List<CbQuantitySummary> divideList = importList.subList(index, Math.max((index + 1) * 1000, sum));
+                        boolean b = quantitySummaryService.saveBatch(divideList);
+                        if (!b) {
+                            throw new ServiceException("数据插入失败！");
+                        }
+                        index += 1000;
+                    }
+                } else {
+                    boolean b = quantitySummaryService.saveBatch(importList);
+                    if (!b) {
+                        throw new ServiceException("数据插入失败！");
+                    }
+                }
+            } else {
+                quantitySummaryService.remove(Wrappers.<CbQuantitySummary>lambdaQuery().eq(CbQuantitySummary::getCbProjectFileId, file.getId()));
+            }
+        }
+    }
+
+    @Autowired
+    private CbProjectFileService projectFileService;
+}

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

@@ -20,26 +20,22 @@ public interface CbProjectConstants {
      * 成本阶段:转固
      */
     Integer CB_STAGE_TO_SOLID = 2;
-    /**
-     * 项目文件状态:未上传
-     */
-    Integer PROJECT_FILE_STATUS_NOT_UPLOAD = 0;
     /**
      * 项目文件状态:待解析
      */
-    Integer PROJECT_FILE_STATUS_NOT_PARSE = 1;
+    Integer PROJECT_FILE_STATUS_WAIT_PARSE = 0;
     /**
      * 项目文件状态:解析中
      */
-    Integer PROJECT_FILE_STATUS_PARSING = 2;
+    Integer PROJECT_FILE_STATUS_PARSING = 1;
     /**
      * 项目文件状态:解析成功
      */
-    Integer PROJECT_FILE_STATUS_PARSE_SUCCESS = 3;
+    Integer PROJECT_FILE_STATUS_PARSE_SUCCESS = 2;
     /**
      * 项目文件状态:解析失败
      */
-    Integer PROJECT_FILE_STATUS_PARSE_FAIL = 4;
+    Integer PROJECT_FILE_STATUS_PARSE_FAIL = 3;
     /**
      * 删除状态:未删除
      */
@@ -57,7 +53,7 @@ public interface CbProjectConstants {
      */
     Integer NOT_GET_PROJECT_DETAIL = 1;
 
-    //成本类型（0:直接费成本、1:工料汇总、2:措施项目、3:其他项目、4:现场经费、5:成本汇总、6:未确定）
+    //成本类型（0:直接费成本、1:工料汇总、2:措施项目、3:其他项目、4:现场经费、5:成本汇总）
     /**
      * 成本类型:直接费成本
      */
@@ -81,10 +77,6 @@ public interface CbProjectConstants {
     /**
      * 成本类型:成本汇总
      */
-    Integer CB_TYPE_ACCOUNT_SUMMARY = 5;
-    /**
-     * 成本类型:未确定
-     */
-    Integer CB_TYPE_NOT_CONFIRM = 6;
+    Integer CB_TYPE_SUMMARY = 5;
 
 }

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

-package com.dsk.cscec.controller;
-
-
-import com.dsk.common.core.controller.BaseController;
-import com.dsk.cscec.service.CbAccountSummaryService;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-/**
- * 成本汇总-成本科目汇总(CbAccountSummary)表控制层
- *
- * @author
- * @since 2024-02-05
- */
-@RestController
-@RequestMapping("/cbAccountSummary")
-public class CbAccountSummaryController extends BaseController {
-    /**
-     * 服务对象
-     */
-    @Resource
-    private CbAccountSummaryService cbAccountSummaryService;
-
-}

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

+package com.dsk.cscec.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaIgnore;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.excel.EasyExcel;
+import com.dsk.common.annotation.Log;
+import com.dsk.common.constant.GlobalConstants;
+import com.dsk.common.core.domain.PageQuery;
+import com.dsk.common.core.domain.R;
+import com.dsk.common.core.domain.entity.SysDictData;
+import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.common.enums.BusinessType;
+import com.dsk.common.excel.ExcelResult;
+import com.dsk.common.helper.LoginHelper;
+import com.dsk.common.utils.poi.ExcelUtil;
+import com.dsk.common.utils.redis.RedisUtils;
+import com.dsk.cscec.domain.CbCostMeasure;
+import com.dsk.cscec.domain.bo.CbCostMeasureActualBo;
+import com.dsk.cscec.domain.bo.CbCostMeasureActualPushBo;
+import com.dsk.cscec.domain.bo.CbCostMeasureActualSaveBo;
+import com.dsk.cscec.domain.vo.CbCostMeasureActualVo;
+import com.dsk.cscec.domain.vo.CbCostMeasuresImportVo;
+import com.dsk.cscec.domain.vo.CbCostMeasuresItemVo;
+import com.dsk.cscec.listener.ProjectCostMeasureImportListener;
+import com.dsk.cscec.service.ICbCostMeasureService;
+import com.dsk.system.domain.vo.SysUserImportVo;
+import com.dsk.system.listener.SysUserImportListener;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 措施费导入
+ *
+ * @author tanyang
+ * @create 2024-02-04 11:44
+ **/
+@RequestMapping("/cb/cost/measures")
+@RestController
+public class CbCostMeasureController {
+
+    @Autowired
+    private ICbCostMeasureService cbCostMeasureService;
+
+
+    /**
+     * 措施费一级大类
+     * 根据项目查询措施费一级大类
+     *
+     * @param projectId 项目ID
+     * @return {@link R}<{@link List}<{@link Map}<{@link String}, {@link Object}>>>
+     */
+    @SaIgnore
+    @GetMapping(value = "/type/{projectId}")
+    public R<List<Map<String, Object>>> dictType(@PathVariable Long projectId) {
+        List<Map<String, Object>> data = cbCostMeasureService.listByLevel(projectId,0);
+        if (ObjectUtil.isNull(data)) {
+            data = new ArrayList<>();
+        }
+        return R.ok(data);
+    }
+
+
+    /**
+     * 措施费列表
+     * 查询措施费列表
+     *
+     * @param cbCostMeasure CB成本衡量标准
+     * @return {@link R}<{@link List}<{@link CbCostMeasureActualVo}>>
+     */
+//    @SaCheckPermission("cb:costmeasures:list")
+    @SaIgnore
+    @GetMapping("/list")
+    public R<List<CbCostMeasureActualVo>> list(CbCostMeasureActualBo cbCostMeasure) {
+        List<CbCostMeasureActualVo> data= cbCostMeasureService.selectDataList(cbCostMeasure);
+        if (ObjectUtil.isNull(data)) {
+            data = new ArrayList<>();
+        }
+        return R.ok(data);
+    }
+
+
+
+
+    /**
+     * 批量保存或修改每月措施费
+     */
+//    @SaCheckPermission("cb:costmeasures:actual:saveBatch")
+    @SaIgnore
+    @PostMapping("/saveBatch")
+    public R saveBatch(@RequestBody List<CbCostMeasureActualSaveBo> boList) {
+        Assert.notEmpty(boList,"措施费填写信息不能为空！");
+        cbCostMeasureService.saveBatchCostMeasureActual(boList);
+        return R.ok();
+    }
+
+
+    /**
+     * 推送工程量
+     * 措施费-推送每月工程量
+     *
+     * @param pushBo 推送BO
+     * @return {@link R}<{@link List}<{@link CbCostMeasureActualVo}>>
+     */
+//    @SaCheckPermission("cb:costmeasures:actual:push")
+    @SaIgnore
+    @PostMapping("/push/project/volume")
+    public R pushProjectVolume(@RequestBody CbCostMeasureActualPushBo pushBo) {
+        Assert.notNull(pushBo,"推送工程量信息不能为空！");
+        cbCostMeasureService.pushCostMeasureActual(pushBo);
+        return R.ok();
+    }
+
+
+
+
+    /**
+     * 获取批量措施费列表
+     */
+    @Log(title = "措施费导出", businessType = BusinessType.EXPORT)
+//    @SaCheckPermission("system:user:export")
+    @PostMapping("/export")
+    public void exportProjectMeasures(HttpServletResponse response) {
+        String BATCH_IMPORT_FAIL_USERS = GlobalConstants.GLOBAL_REDIS_KEY + "batch_import_fail_users";
+        String key = BATCH_IMPORT_FAIL_USERS + LoginHelper.getUserId();
+        ExcelUtil.exportExcel(RedisUtils.getCacheList(key), "措施费", CbCostMeasuresImportVo.class, response);
+        RedisUtils.deleteObject(key);
+    }
+
+    /**
+     * 导入数据
+     *
+     * @param file          导入文件
+     * @param projectId     项目id
+     */
+//    @SaIgnore
+    @Log(title = "措施费导入", businessType = BusinessType.IMPORT)
+//    @SaCheckPermission("system:user:import")
+    @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public R<Void> importData(@RequestPart("file") MultipartFile file, Long projectId) throws Exception {
+        cbCostMeasureService.importExcelData(file,projectId);
+        return R.ok();
+    }
+
+
+
+    /**
+     * 导入数据
+     *
+     * @param file          导入文件
+     * @param projectId     项目id
+     */
+    @SaIgnore
+    @Log(title = "措施费汇总导入", businessType = BusinessType.IMPORT)
+//    @SaCheckPermission("system:user:import")
+    @PostMapping(value = "/summary/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public R<Void> importSummaryData(@RequestPart("file") MultipartFile file, Long projectId) throws Exception {
+        Integer dataType=2;
+        cbCostMeasureService.importExcelSummaryData(file,projectId,dataType);
+        return R.ok();
+    }
+
+
+    public static void main(String[] args) throws FileNotFoundException {
+        List list =new ArrayList<>();
+
+        File file=new File("E:\\dingding\\202401\\导入表格\\措施费\\大型机械费.xlsx");
+        FileInputStream inputStream=new FileInputStream(file);
+
+
+        ExcelResult<CbCostMeasuresImportVo> result = ExcelUtil.importExcel(inputStream, CbCostMeasuresImportVo.class, new ProjectCostMeasureImportListener(1L,1));
+        String analysis = result.getAnalysis();
+        List<CbCostMeasuresImportVo> list1 = result.getList();
+
+
+        System.out.println(">>>>>>>>>>"+analysis);
+//        System.out.println(JSONUtil.toJsonStr(list));
+
+    }
+
+
+}

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

 package com.dsk.cscec.controller;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.dsk.common.annotation.Log;
+import com.dsk.common.core.controller.BaseController;
+import com.dsk.common.core.domain.R;
+import com.dsk.common.enums.BusinessType;
+import com.dsk.common.exception.ServiceException;
+import com.dsk.cscec.domain.bo.AddProjectFileUploadBo;
+import com.dsk.cscec.domain.bo.QueryProjectFileUploadDetailBo;
+import com.dsk.cscec.domain.vo.DraftDialogListVo;
+import com.dsk.cscec.domain.vo.QueryProjectFileUploadDetailVo;
 import com.dsk.cscec.service.CbProjectFileService;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.dsk.system.domain.vo.SysOssVo;
+import com.dsk.system.service.ISysOssService;
+import org.springframework.http.MediaType;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import javax.validation.constraints.NotNull;
+import java.io.UnsupportedEncodingException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 项目成本文件表(CbProjectFile)表控制层
@@ -14,13 +34,66 @@ import javax.annotation.Resource;
  */
 @RestController
 @RequestMapping("cbProjectFile")
-public class CbProjectFileController {
+public class CbProjectFileController extends BaseController {
     /**
      * 服务对象
      */
     @Resource
     private CbProjectFileService baseService;
+    @Resource
+    private ISysOssService iSysOssService;
 
+    /**
+     * 上传项目台账文件
+     */
+    @Log(title = "项目台账上传OSS对象存储", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/uploadCbProjectFile", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public R<Map<String, String>> uploadCbProjectFile(@Validated @ModelAttribute AddProjectFileUploadBo fileUploadBo) throws UnsupportedEncodingException {
+        MultipartFile file = fileUploadBo.getFile();
+        if (ObjectUtil.isNull(file)) {
+            return R.fail("上传文件不能为空");
+        }
+        SysOssVo oss = iSysOssService.upload(file);
+        //添加项目上传文件记录
+        try {
+            baseService.addProjectFile(fileUploadBo, oss);
+        } catch (ServiceException e) {
+            //删除oss中的文件
+            iSysOssService.deleteWithValidByIds(Collections.singletonList(oss.getOssId()), true);
+            throw e;
+        }
+        Map<String, String> map = new HashMap<>(2);
+        map.put("fileName", oss.getOriginalName());
+        map.put("fileOssId", oss.getOssId().toString());
+        map.put("fileOssUrl", oss.getUrl());
+        return R.ok(map);
+    }
 
-}
+    /**
+     * 删除项目台账文件
+     */
+    @DeleteMapping("/deleteCbProjectFile/{fileId}")
+    public R<Void> deleteCbProjectFile(@NotNull(message = "文件ID不能为空") @PathVariable Long fileId) {
+        return toAjax(baseService.deleteProjectFile(fileId));
+    }
 
+    /**
+     * 获取草稿弹窗列表
+     */
+    @GetMapping("/getDraftDialogList")
+    public R<List<DraftDialogListVo>> getDraftDialogList() {
+        List<DraftDialogListVo> draftList = baseService.getDraftDialogList();
+        if (draftList.isEmpty()) {
+            return R.ok("暂无草稿记录");
+        }
+        return R.ok(draftList);
+    }
+
+    /**
+     * 获取项目文件上传详情
+     */
+    @GetMapping("/getProjectFileUploadDetail")
+    public R<QueryProjectFileUploadDetailVo> getProjectFileUploadDetail(@Validated @RequestBody QueryProjectFileUploadDetailBo uploadDetailBo) {
+        return R.ok(baseService.getProjectFileUploadDetail(uploadDetailBo));
+    }
+}
\ No newline at end of file

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

 package com.dsk.cscec.controller;
 
+import cn.hutool.core.lang.Assert;
+import com.dsk.common.core.controller.BaseController;
+import com.dsk.common.core.domain.R;
+import com.dsk.cscec.domain.CbProjectRecord;
+import com.dsk.cscec.domain.bo.AddCbProjectBo;
+import com.dsk.cscec.domain.bo.ImportCbProjectDataBo;
 import com.dsk.cscec.service.CbProjectRecordService;
+import com.dsk.cscec.service.IDProjectService;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.validation.constraints.NotBlank;
 
 /**
  * 项目台账表(CbProjectRecord)表控制层
@@ -13,12 +22,41 @@ import javax.annotation.Resource;
  */
 @RestController
 @RequestMapping("cbProjectRecord")
-public class CbProjectRecordController {
+public class CbProjectRecordController extends BaseController {
     /**
      * 服务对象
      */
     @Resource
     private CbProjectRecordService baseService;
+    @Resource
+    private IDProjectService dProjectService;
+
+    /**
+     * 校验项目编码是否存在
+     */
+    @GetMapping("/checkProjectCodeExist/{projectCode}")
+    public R<Boolean> checkProjectCodeExist(@NotBlank(message = "项目编码不能为空") @PathVariable String projectCode) {
+        return R.ok(dProjectService.checkProjectCodeExist(projectCode));
+    }
+
+    /**
+     * 新增项目
+     */
+    @PostMapping("/addProject")
+    public R<CbProjectRecord> addProject(@Validated @RequestBody AddCbProjectBo addCbProjectBo) {
+        CbProjectRecord projectRecord = baseService.addProject(addCbProjectBo);
+        Assert.notNull(projectRecord, "新增项目失败,请联系管理员");
+        return R.ok(projectRecord);
+    }
+
+    /**
+     * 根据项目文件导入数据
+     */
+    @PostMapping("/importData")
+    public R<Void> importData(@Validated @RequestBody ImportCbProjectDataBo importDataBo){
+        baseService.importData(importDataBo);
+        return R.ok("解析成本数据过程需3~10分钟，稍后可到项目列表查看导入结果");
+    }
 
 }
 

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

-package com.dsk.cscec.controller;
-
-
-import com.dsk.common.core.controller.BaseController;
-import com.dsk.cscec.service.CbProjectSummaryService;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-/**
- * 成本汇总-项目汇总(CbProjectSummary)表控制层
- *
- * @author
- * @since 2024-02-05
- */
-@RestController
-@RequestMapping("/cbProjectSummary")
-public class CbProjectSummaryController extends BaseController {
-    /**
-     * 服务对象
-     */
-    @Resource
-    private CbProjectSummaryService cbProjectSummaryService;
-
-
-}

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

 package com.dsk.cscec.controller;
 
 
+import com.dsk.common.annotation.RepeatSubmit;
 import com.dsk.common.core.controller.BaseController;
 import com.dsk.common.core.domain.R;
-import com.dsk.common.excel.ExcelUtils;
-import com.dsk.common.exception.ServiceException;
-import com.dsk.cscec.domain.CbQuantitySummary;
+import com.dsk.cscec.domain.CbQuantitySummaryActual;
 import com.dsk.cscec.domain.bo.CbProjectBaseBo;
+import com.dsk.cscec.domain.bo.CbQuantitySummaryListBo;
+import com.dsk.cscec.domain.vo.CbQuantitySummaryListVo;
 import com.dsk.cscec.service.ICbQuantitySummaryService;
-import com.dsk.system.domain.vo.SysUserImportVo;
 import lombok.RequiredArgsConstructor;
-import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import sun.reflect.generics.tree.Tree;
 
 import java.util.List;
 import java.util.Map;
-import java.util.TreeMap;
-import java.util.stream.Collectors;
 
 /**
  * 成本-工料汇总基本表(CbQuantitySummary)表控制层
@@ -35,10 +31,11 @@ public class CbQuantitySummaryController extends BaseController {
 
     /**
      * 工料汇总科目树
+     *
      * @return
      */
     @GetMapping(value = "/subjectTree")
-    public R<Map<String, Object>> subjectTree(@PathVariable CbProjectBaseBo bo){
+    public R<Map<String, Object>> subjectTree(CbProjectBaseBo bo) {
         return R.ok(baseService.subjectTree(bo));
     }
 
@@ -46,30 +43,36 @@ public class CbQuantitySummaryController extends BaseController {
      * 已记录月份集合
      */
     @GetMapping(value = "/monthList")
-    public R<List<String>> monthList(@PathVariable CbProjectBaseBo bo){
+    public R<List<String>> monthList(CbQuantitySummaryListBo bo) {
         return R.ok(baseService.monthList(bo));
     }
 
     /**
-     * 数据导入
+     * 科目月份列表
      */
-    @PostMapping(value = "/importData")
-    public R<Void> importFile(@RequestPart("file") MultipartFile file) throws Exception {
-        //识别Excel内容
-        List<CbQuantitySummary> importList = new ExcelUtils<>(CbQuantitySummary.class).importExcelAllSheet(file.getInputStream(), 1);
-        if (importList.isEmpty()) {
-            throw new ServiceException("表格中不存在待导入数据!");
+    @GetMapping(value = "/subjectList")
+    public R<List<CbQuantitySummaryListVo>> subjectList(CbQuantitySummaryListBo bo) {
+        return R.ok(baseService.subjectList(bo));
     }
-        importList = importList.stream().parallel()
-                .filter(item -> !ObjectUtils.isEmpty(item.getCbName()))
-                .peek(item -> {
-                    item.setProjectId(1L);
-                    item.setCbStage(0);
-                }).collect(Collectors.toList());
-        if (importList.isEmpty()) {
-            throw new ServiceException("表格中不存在有效数据数据!");
+
+    /**
+     * 更新月成本信息
+     */
+    @PutMapping(value = "/updateActual")
+    @RepeatSubmit
+    public R<Void> updateActual(@RequestBody List<CbQuantitySummaryActual> list) {
+        baseService.updateActual(list);
+        return R.ok();
     }
-        return toAjax(baseService.saveBatch(importList));
+
+    /**
+     * 数据推送
+     */
+    @PutMapping(value = "/pushData")
+    @RepeatSubmit
+    public R<Void> pushData(@RequestBody CbQuantitySummaryActual bo) {
+        baseService.pushData(bo);
+        return R.ok();
     }
 
 }

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

+package com.dsk.cscec.controller;
+
+
+import com.dsk.common.core.controller.BaseController;
+import com.dsk.common.core.domain.R;
+import com.dsk.cscec.domain.bo.CbSummaryActualBo;
+import com.dsk.cscec.domain.bo.CbSummaryActualListBo;
+import com.dsk.cscec.domain.bo.CbSummaryBo;
+import com.dsk.cscec.service.CbSummaryService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 成本汇总(CbSummary)表控制层
+ *
+ * @author cyf
+ * @since 2024-02-06
+ */
+@RestController
+@RequestMapping("/cbSummary")
+public class CbSummaryController extends BaseController {
+    /**
+     * 服务对象
+     */
+    @Resource
+    private CbSummaryService cbSummaryService;
+
+
+    /**
+     * 成本汇总左侧列表
+     *
+     * @param bo
+     * @return
+     */
+    @GetMapping("/cbNameList")
+    public R<List<Map<String, Object>>> getCbNameList(CbSummaryBo bo) {
+        return R.ok(cbSummaryService.getCbNameList(bo));
+    }
+
+    //成本汇总数据列表
+    @GetMapping("/list")
+    public R getList(CbSummaryActualListBo bo) {
+        return R.ok(cbSummaryService.getActualList(bo));
+    }
+
+    /**
+     * 已添加成本月份
+     *
+     * @param bo
+     * @return
+     */
+    @GetMapping("/expenseDateList")
+    public R<List<String>> getExpenseDateList(@Validated CbSummaryBo bo) {
+        return R.ok(cbSummaryService.getExpenseDateList(bo));
+    }
+
+    /**
+     * 编辑成本
+     *
+     * @param boList
+     * @return
+     */
+    @PutMapping("/editActual")
+    public R editActual(@RequestBody List<CbSummaryActualBo> boList) {
+        return cbSummaryService.insertOrUpdateActual(boList) == true ? R.ok() : R.fail();
+    }
+
+    //锁定成本-至少有一条实际数据？
+
+    //导出excel-缺模板
+}

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

+package com.dsk.cscec.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+    * 项目每月实际措施费
+    */
+@Data
+@TableName(value="cb_cost_measure")
+public class CbCostMeasure {
+    /**
+    * 主键
+    */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+    * 项目ID
+    */
+    private Long projectId;
+
+    /**
+    * 成本阶段( 0:标前成本、1:标后成本、2:转固成本)
+    */
+    private Integer cbStage;
+
+    /**
+    * 父项id
+    */
+    private Long parentId;
+
+    /**
+    * 层级数
+    */
+    private Integer level;
+
+    private String number;
+
+    private String no;
+
+    /**
+    * 清单内容
+    */
+    private String itemContent;
+
+    /**
+    * 工作内容、做法/规格型号/施工现场配置说明
+    */
+    private String workContent;
+
+    /**
+    * 单位
+    */
+    private String unit;
+
+    /**
+    * 工程量
+    */
+    private BigDecimal quantity;
+
+    /**
+    * 不含税单价
+    */
+    private String unitPriceExcludingTax;
+
+    /**
+    * 使用时间
+    */
+    private String usageTime;
+
+    /**
+    * 不含税合价
+    */
+    private String amountExcludingTax;
+
+    /**
+    * 税率(%)
+    */
+    private String taxRate;
+
+    /**
+    * 含税合价
+    */
+    private String amountIncludingTax;
+
+    /**
+    * 摊销比例(%)
+    */
+    private String amortizationRatio;
+
+    /**
+    * 摊销后不含税合价
+    */
+    private String amountExcludeTaxAmortized;
+
+    /**
+    * 摊销后含税合价
+    */
+    private String amountIncludeTaxAmortized;
+
+    /**
+    * 税金（元）
+    */
+    private String taxAmount;
+
+    /**
+    * 备注
+    */
+    private String remarks;
+
+    /**
+    * 成本科目
+    */
+    private String costSubject;
+
+    /**
+    * 税金类型
+    */
+    private String taxType;
+
+
+    /**
+     * 数据来源（0:导入，1:手动添加）
+     */
+    private Integer dataSource;
+
+
+    /**
+    * 创建时间
+    */
+    private Date createTime;
+
+    /**
+    * 更新时间
+    */
+    private Date updateTime;
+}
\ No newline at end of file

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

+package com.dsk.cscec.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Data;
+
+@Data
+@TableName(value = "cb_cost_measure_actual")
+public class CbCostMeasureActual {
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.INPUT)
+    private Long id;
+
+    /**
+     * 计划成本措施费id
+     */
+    @TableField(value = "plan_measure_id")
+    private Long planMeasureId;
+
+    /**
+     * 本月发生成本比例
+     */
+    @TableField(value = "month_cost_rate")
+    private BigDecimal monthCostRate;
+
+    /**
+     * 成本合价
+     */
+    @TableField(value = "cost_effective")
+    private BigDecimal costEffective;
+
+    /**
+     * 截止本月工程量
+     */
+    @TableField(value = "current_project_volume")
+    private BigDecimal currentProjectVolume;
+
+    /**
+     * 推送工程量
+     */
+    @TableField(value = "submit_project_volume")
+    private BigDecimal submitProjectVolume;
+
+    /**
+     * 年月
+     */
+    @TableField(value = "`month`")
+    private String month;
+
+    /**
+     * 推送时间
+     */
+    @TableField(value = "push_time")
+    private Date pushTime;
+
+    /**
+     * 推送数据json
+     */
+    @TableField(value = "push_data_json")
+    private String pushDataJson;
+
+    /**
+     * 是否删除
+     */
+    @TableField(value = "del_flag")
+    private Integer delFlag;
+
+    /**
+     * 修改人
+     */
+    @TableField(value = "update_user")
+    private String updateUser;
+
+    /**
+     * 修改人id
+     */
+    @TableField(value = "update_id")
+    private Long updateId;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "update_time")
+    private Date updateTime;
+
+    public static final String COL_ID = "id";
+
+    public static final String COL_PLAN_MEASURE_ID = "plan_measure_id";
+
+    public static final String COL_MONTH_COST_RATE = "month_cost_rate";
+
+    public static final String COL_COST_EFFECTIVE = "cost_effective";
+
+    public static final String COL_CURRENT_PROJECT_VOLUME = "current_project_volume";
+
+    public static final String COL_SUBMIT_PROJECT_VOLUME = "submit_project_volume";
+
+    public static final String COL_MONTH = "month";
+
+    public static final String COL_PUSH_TIME = "push_time";
+
+    public static final String COL_PUSH_DATA_JSON = "push_data_json";
+
+    public static final String COL_DEL_FLAG = "del_flag";
+
+    public static final String COL_UPDATE_USER = "update_user";
+
+    public static final String COL_UPDATE_ID = "update_id";
+
+    public static final String COL_CREATE_TIME = "create_time";
+
+    public static final String COL_UPDATE_TIME = "update_time";
+}
\ No newline at end of file

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

+package com.dsk.cscec.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import lombok.Data;
+
+/**
+    * 项目费用汇总表
+    */
+@Data
+@TableName(value = "cb_project_expense_summary")
+public class CbProjectExpenseSummary {
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 项目ID
+     */
+    @TableField(value = "project_id")
+    private Long projectId;
+
+    /**
+     * 成本阶段(0:标前成本、1:标后成本、2:转固成本)
+     */
+    @TableField(value = "cb_stage")
+    private Integer cbStage;
+
+    /**
+     * 序号
+     */
+    @TableField(value = "`number`")
+    private String number;
+
+    /**
+     * 数据类型(0:现场经费、1:其他费用)
+     */
+    @TableField(value = "data_type")
+    private Integer dataType;
+
+    /**
+     * 名称
+     */
+    @TableField(value = "expense_name")
+    private String expenseName;
+
+    /**
+     * 数值
+     */
+    @TableField(value = "expense_value")
+    private String expenseValue;
+
+    /**
+     * 占比
+     */
+    @TableField(value = "proportion")
+    private String proportion;
+
+    /**
+     * 删除状态(0:否、2:是)
+     */
+    @TableField(value = "del_flag")
+    private Integer delFlag;
+
+    /**
+     * 创建者
+     */
+    @TableField(value = "create_by")
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    private Date createTime;
+
+    public static final String COL_ID = "id";
+
+    public static final String COL_PROJECT_ID = "project_id";
+
+    public static final String COL_CB_STAGE = "cb_stage";
+
+    public static final String COL_NUMBER = "number";
+
+    public static final String COL_DATA_TYPE = "data_type";
+
+    public static final String COL_EXPENSE_NAME = "expense_name";
+
+    public static final String COL_EXPENSE_VALUE = "expense_value";
+
+    public static final String COL_PROPORTION = "proportion";
+
+    public static final String COL_DEL_FLAG = "del_flag";
+
+    public static final String COL_CREATE_BY = "create_by";
+
+    public static final String COL_CREATE_TIME = "create_time";
+}
\ No newline at end of file

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

@@ -47,7 +47,7 @@ public class CbProjectFile extends BaseEntity implements Serializable {
      */
     private String fileOssUrl;
     /**
-     * 文件解析状态（0:待解析、1:解析中、2:解析成功、3:解析失败）
+     * 项目文件状态(0:待解析、1:解析中、2:解析成功、3:解析失败)
      */
     private Integer fileParseStatus;
     /**

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

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

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

@@ -3,6 +3,7 @@ package com.dsk.cscec.domain;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.io.Serializable;
@@ -32,7 +33,7 @@ public class CbQuantitySummary implements Serializable {
      * 序号
      */
     @Excel(name = "序号")
-    private String number;
+    private Integer number;
     /**
      * 成本阶段(0：标前成本 1：标后成本 2：转固成本)
      */
@@ -130,6 +131,15 @@ public class CbQuantitySummary implements Serializable {
      * 创建时间
      */
     private Date createTime;
+    /**
+     * 项目成本文件id
+     */
+    private Long cbProjectFileId;
+    /**
+     * 删除状态(0:否、2:是)
+     */
+    @TableLogic(value = "0", delval = "2")
+    private Integer delFalg;
 
 }
 

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

@@ -2,6 +2,7 @@ package com.dsk.cscec.domain;
 
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
@@ -21,8 +22,8 @@ public class CbQuantitySummaryActual implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "id")
-    private Long id;
+    @TableId(value = "id", type = IdType.INPUT)
+    private String id;
     /**
      * 成本汇总基本数据id
      */
@@ -32,9 +33,9 @@ public class CbQuantitySummaryActual implements Serializable {
      */
     private Double quantities;
     /**
-     * 单位
+     * 本月用料单位
      */
-    private String unit;
+    private String quantitiesUnit;
     /**
      * 换算后本月用料
      */
@@ -47,6 +48,9 @@ public class CbQuantitySummaryActual implements Serializable {
      * 采购单价
      */
     private Double purchaseUnitPrice;
+    /**
+     * 创建时间
+     */
     private Date createTime;
     /**
      * 推送时间
@@ -57,9 +61,21 @@ public class CbQuantitySummaryActual implements Serializable {
      */
     private String recordDate;
     /**
-     * 推送数据json
+     * 推送工程量
+     */
+    private Double pushQuantities;
+    /**
+     *  IPM项目编码
+     */
+    private String ipmProjectCode;
+    /**
+     * IPM合同编码
+     */
+    private String ipmContractCode;
+    /**
+     * IPM作业编码
      */
-    private String pushDataJson;
+    private String ipmBizCode;
 
 }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/CbProjectSummary.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/CbSummary.java

 package com.dsk.cscec.domain;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 成本汇总-项目汇总(CbProjectSummary)实体类
+ * 成本汇总(CbSummary)实体类
  *
- * @author
- * @since 2024-02-05
+ * @author cyf
+ * @since 2024-02-06
  */
 @Data
-public class CbProjectSummary implements Serializable {
-    private static final long serialVersionUID = -88742338054342512L;
+public class CbSummary implements Serializable {
+    private static final long serialVersionUID = -20126964599875841L;
     /**
      * 主键id
      */
-    private Integer id;
+    @TableId(value = "id")
+    private Long id;
     /**
      * 父级id
      */
-    private Integer parentId;
+    private Long parentId;
     /**
      * 层级
      */
@@ -33,19 +35,23 @@ public class CbProjectSummary implements Serializable {
     /**
      * 项目id
      */
-    private Integer projectId;
+    private Long projectId;
     /**
      * 成本阶段( 0:标前成本、1:标后成本、2:转固成本)
      */
     private Integer cbStage;
+    /**
+     * 项目成本文件id
+     */
+    private Long cbProjectFileId;
     /**
      * 序号
      */
     private String number;
     /**
-     * 名称
+     * 名称/成本科目
      */
-    private String name;
+    private String cbName;
     /**
      * 不含税成本合价
      */
@@ -74,5 +80,13 @@ public class CbProjectSummary implements Serializable {
      * 创建时间
      */
     private Date createTime;
+    /**
+     * 删除状态(0:否、2:是)
+     */
+    private Integer delFlag;
+    /**
+     * 成本类型（1项目汇总，2成本科目汇总）
+     */
+    private Integer cbType;
 
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/CbProjectSummaryActual.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/CbSummaryActual.java

 package com.dsk.cscec.domain;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
- * 成本汇总-项目汇总-每月费用(CbProjectSummaryActual)实体类
+ * 成本汇总-每月费用(CbSummaryActual)实体类
  *
- * @author
- * @since 2024-02-05
+ * @author cyf
+ * @since 2024-02-06
  */
 @Data
-public class CbProjectSummaryActual implements Serializable {
-    private static final long serialVersionUID = -59313083994798297L;
+public class CbSummaryActual implements Serializable {
+    private static final long serialVersionUID = -85978330087467049L;
     /**
      * 主键id
      */
-    private Integer id;
+    @TableId(value = "id")
+    private Long id;
     /**
-     * 项目汇总id
+     * 成本汇总id
      */
-    private Integer cbProjectSummaryId;
+    private Long cbSummaryId;
     /**
      * 本月费用（含税）
      */
-    private Double taxInclusiveExpense;
+    private BigDecimal taxInclusiveExpense;
     /**
      * 本月费用（不含税）
      */
-    private Double taxExclusiveExpense;
+    private BigDecimal taxExclusiveExpense;
     /**
      * 费用日期
      */
     private String expenseDate;
     /**
-     * 是否锁定
+     * 是否锁定（0否，1是）
      */
     private Integer lockStatus;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 删除状态(0:否、2:是)
+     */
+    private Integer delFlag;
 
 }

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

+package com.dsk.cscec.domain.bo;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author sxk
+ * @date 2024.02.05
+ * @time 15:26
+ */
+@Data
+public class AddCbProjectBo {
+    /**
+     * 项目名称
+     */
+    private String projectName;
+    /**
+     * IPM项目编码
+     */
+    private String ipmProjectNo;
+    /**
+     * 是否获取项目详情(0:否、1:是)
+     */
+    @NotNull(message = "是否获取项目详情不能为空")
+    private Integer isGetProjectDetail;
+    /**
+     * 文件名称
+     */
+    private String projectFileName;
+    /**
+     * 成本阶段(0:标前成本、1:标后成本、2:转固成本)
+     */
+    @NotNull(message = "未选择成本阶段")
+    private Integer cbStage;
+}

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

+package com.dsk.cscec.domain.bo;
+
+import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author sxk
+ * @date 2024.02.06
+ * @time 16:07
+ */
+@Data
+public class AddProjectFileUploadBo {
+    private MultipartFile file;
+    @NotNull(message = "项目ID不能为空")
+    private Long projectId;
+    @NotNull(message = "成本阶段不能为空")
+    private Integer cbStage;
+    @NotNull(message = "成本类型不能为空")
+    private Integer cbType;
+}

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

+package com.dsk.cscec.domain.bo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class CbCostMeasureActualBo {
+    /**
+     * 措施费用项id
+     */
+    private Long id;
+
+
+    /**
+     * 年月
+     */
+    private String month;
+
+    /**
+     * 项目id
+     */
+    private Long projectId;
+
+    /**
+     * 成本阶段( 0:标前成本、1:标后成本、2:转固成本)
+     */
+    private Integer cbStage;
+
+
+
+}
\ No newline at end of file

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

+package com.dsk.cscec.domain.bo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class CbCostMeasureActualPushBo {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+
+    /**
+     * 截止本月工程量
+     */
+    @TableField(value = "current_project_volume")
+    private BigDecimal currentProjectVolume;
+
+    /**
+     * 推送工程量
+     */
+    @TableField(value = "submit_project_volume")
+    private BigDecimal submitProjectVolume;
+
+    /**
+     * 年月
+     */
+    @TableField(value = "`month`")
+    private String month;
+
+    /**
+     * 推送时间
+     */
+    @TableField(value = "push_time")
+    private Date pushTime;
+
+    /**
+     * 推送数据json
+     */
+    @TableField(value = "push_data_json")
+    private String pushDataJson;
+
+    /**
+     * IPM项目编码
+     */
+    private String ipmProjectCode;
+
+    /**
+     * IPM合同编码
+     */
+    private String ipmContractCode;
+
+
+
+    /**
+     * IPM作业编码
+     */
+    private String ipmBizCode;
+
+
+
+
+
+}
\ No newline at end of file

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

+package com.dsk.cscec.domain.bo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class CbCostMeasureActualSaveBo {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 计划成本措施费id
+     */
+    @TableField(value = "plan_measure_id")
+    private Long planMeasureId;
+
+    /**
+     * 本月发生成本比例
+     */
+    @TableField(value = "month_cost_rate")
+    private BigDecimal monthCostRate;
+
+    /**
+     * 成本合价
+     */
+    @TableField(value = "cost_effective")
+    private BigDecimal costEffective;
+
+    /**
+     * 截止本月工程量
+     */
+    @TableField(value = "current_project_volume")
+    private BigDecimal currentProjectVolume;
+
+    /**
+     * 推送工程量
+     */
+    @TableField(value = "submit_project_volume")
+    private BigDecimal submitProjectVolume;
+
+    /**
+     * 年月
+     */
+    @TableField(value = "`month`")
+    private String month;
+
+    /**
+     * 推送时间
+     */
+    @TableField(value = "push_time")
+    private Date pushTime;
+
+    /**
+     * 推送数据json
+     */
+    @TableField(value = "push_data_json")
+    private String pushDataJson;
+
+    /**
+     * 修改人
+     */
+    @TableField(value = "update_user")
+    private String updateUser;
+
+    /**
+     * 修改人id
+     */
+    @TableField(value = "update_id")
+    private String updateId;
+
+
+
+
+}
\ No newline at end of file

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

+package com.dsk.cscec.domain.bo;
+
+import lombok.Data;
+
+/**
+ * @Author lcl
+ * @Data 2024/2/6 13:37
+ */
+@Data
+public class CbQuantitySummaryListBo extends CbProjectBaseBo {
+
+    /**
+     * 成本科目
+     */
+    private String cbSubjectName;
+    /**
+     * 记录月份
+     */
+    private String recordDate;
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/CbAccountSummaryActual.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/CbSummaryActualBo.java

-package com.dsk.cscec.domain;
+package com.dsk.cscec.domain.bo;
 
+import com.dsk.common.core.domain.BaseEntity;
 import lombok.Data;
 
-import java.io.Serializable;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 
 /**
- * 成本汇总-成本科目汇总-每月费用(CbAccountSummaryActual)实体类
+ * 成本汇总-每月费用Bo
  *
- * @author
- * @since 2024-02-05
+ * @author cyf
+ * @since 2024-02-06
  */
 @Data
-public class CbAccountSummaryActual implements Serializable {
-    private static final long serialVersionUID = 847656665993804445L;
+public class CbSummaryActualBo extends BaseEntity {
     /**
      * 主键id
      */
-    private Integer id;
+    private Long id;
     /**
-     * 成本科目汇总id
+     * 成本汇总id
      */
-    private Integer cbAccountSummaryId;
+    @NotNull(message = "成本汇总id不能为空")
+    private Long cbSummaryId;
     /**
      * 本月费用（含税）
      */
-    private Double taxInclusiveExpense;
+    private BigDecimal taxInclusiveExpense;
     /**
      * 本月费用（不含税）
      */
-    private Double taxExclusiveExpense;
+    private BigDecimal taxExclusiveExpense;
     /**
      * 费用日期
      */
+    @NotEmpty(message = "费用日期不能为空")
     private String expenseDate;
-    /**
-     * 是否锁定
-     */
-    private Integer lockStatus;
 
 }

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

+package com.dsk.cscec.domain.bo;
+
+import com.dsk.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 成本汇总-列表查询Bo
+ *
+ * @author cyf
+ * @since 2024-02-06
+ */
+@Data
+public class CbSummaryActualListBo extends BaseEntity {
+    /**
+     * 主键id
+     */
+    private Long id;
+    /**
+     * 成本类型（1项目汇总，2成本科目汇总）
+     */
+    private Integer cbType;
+    /**
+     * 费用日期
+     */
+    private String expenseDate;
+
+}

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

+package com.dsk.cscec.domain.bo;
+
+import com.dsk.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 成本汇总Bo
+ *
+ * @author cyf
+ * @since 2024-02-06
+ */
+@Data
+public class CbSummaryBo extends BaseEntity {
+    /**
+     * 主键id
+     */
+    private Long id;
+    /**
+     * 父级id
+     */
+    private Long parentId;
+    /**
+     * 层级
+     */
+    private Integer level;
+    /**
+     * 项目id
+     */
+    private Long projectId;
+    /**
+     * 成本阶段( 0:标前成本、1:标后成本、2:转固成本)
+     */
+    private Integer cbStage;
+    /**
+     * 项目成本文件id
+     */
+    private Long cbProjectFileId;
+    /**
+     * 成本类型（1项目汇总，2成本科目汇总）
+     */
+    private Integer cbType;
+
+}

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

+package com.dsk.cscec.domain.bo;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author sxk
+ * @date 2024.02.07
+ * @time 11:28
+ */
+@Data
+public class ImportCbProjectDataBo {
+    /**
+     * 项目ID
+     */
+    @NotNull(message = "项目ID不能为空")
+    private Long projectId;
+    /**
+     * 成本阶段(0:标前成本、1:标后成本、2:转固成本)
+     */
+    @NotNull(message = "成本阶段不能为空")
+    private Integer cbStage;
+}

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

+package com.dsk.cscec.domain.bo;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author sxk
+ * @date 2024.02.06
+ * @time 14:17
+ */
+@Data
+public class QueryProjectFileUploadDetailBo {
+    /**
+     * 项目ID
+     */
+    @NotNull(message = "项目ID不能为空")
+    private Long projectId;
+    /**
+     * 成本阶段(0:标前成本、1:标后成本、2:转固成本)
+     */
+    @NotNull(message = "成本阶段不能为空")
+    private Integer cbStage;
+}

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

+package com.dsk.cscec.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class CbCostMeasureActualVo {
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 序号
+     */
+    private String number;
+
+    /**
+     * 清单内容
+     */
+    private String itemContent; // 清单内容
+
+    /**
+     * 工作内容
+     */
+    private String workContent; // 工作内容、做法/规格型号/施工现场配置说明
+
+    /**
+     * 单位
+     */
+    private String unit; // 单位
+
+    /**
+     * 工程量
+     */
+    private BigDecimal quantity; // 工程量
+
+    /**
+     * 不含税单价
+     */
+    private String unitPriceExcludingTax; // 不含税单价
+
+    /**
+     * 使用时间
+     */
+    private String usageTime; // 使用时间
+
+    /**
+     * 不含税合价
+     */
+    private String amountExcludingTax; //
+
+    /**
+     * 税率(%)
+     */
+    private String taxRate; // 税率(%)
+
+    /**
+     * 含税合价
+     */
+    private String amountIncludingTax; //
+
+    /**
+     * 摊销比例(%)
+     */
+    private String amortizationRatio; //
+
+    /**
+     * 摊销后不含税合价
+     */
+    private String amountExcludeTaxAmortized; //
+
+    /**
+     * 摊销后含税合价
+     */
+    private String amountIncludeTaxAmortized; //
+
+    /**
+     * 税金（元）
+     */
+    private String taxAmount; //
+
+    /**
+     * 备注
+     */
+    private String remarks; //
+
+    /**
+     * 成本科目
+     */
+    private String costSubject; // 成本科目
+
+    /**
+     * 税金类型
+     */
+    private String taxType; //
+
+    /**
+     * 计划成本措施费id
+     */
+    private Long planMeasureId;
+
+    /**
+     * 本月发生成本比例
+     */
+    private BigDecimal monthCostRate;
+
+    /**
+     * 成本合价
+     */
+    private BigDecimal costEffective;
+
+    /**
+     * 截止本月工程量
+     */
+    private BigDecimal currentProjectVolume;
+
+    /**
+     * 推送工程量
+     */
+    private BigDecimal submitProjectVolume;
+
+    /**
+     * 年月
+     */
+    private String month;
+
+    /**
+     * 推送时间
+     */
+    private Date pushTime;
+
+
+    /**
+     * 修改人
+     */
+    @TableField(value = "update_user")
+    private String updateUser;
+
+    /**
+     * 修改人id
+     */
+    @TableField(value = "update_id")
+    private String updateId;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "update_time")
+    private Date updateTime;
+
+    public static final String COL_ID = "id";
+
+    public static final String COL_PLAN_MEASURE_ID = "plan_measure_id";
+
+    public static final String COL_MONTH_COST_RATE = "month_cost_rate";
+
+    public static final String COL_COST_EFFECTIVE = "cost_effective";
+
+    public static final String COL_CURRENT_PROJECT_VOLUME = "current_project_volume";
+
+    public static final String COL_SUBMIT_PROJECT_VOLUME = "submit_project_volume";
+
+    public static final String COL_MONTH = "month";
+
+    public static final String COL_PUSH_TIME = "push_time";
+
+    public static final String COL_PUSH_DATA_JSON = "push_data_json";
+
+    public static final String COL_DEL_FLAG = "del_flag";
+
+    public static final String COL_UPDATE_USER = "update_user";
+
+    public static final String COL_UPDATE_ID = "update_id";
+
+    public static final String COL_CREATE_TIME = "create_time";
+
+    public static final String COL_UPDATE_TIME = "update_time";
+}
\ No newline at end of file

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

+package com.dsk.cscec.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 措施费导入数据
+ *
+ * @author tanyang
+ * @create 2024-02-04 13:49
+ **/
+@Data
+public class CbCostMeasuresImportVo {
+
+
+
+        @ExcelProperty(value = "序号")
+        private String number; // 清单内容
+
+        @ExcelProperty(value = "清单内容")
+        private String itemContent; // 清单内容
+
+        @ExcelProperty(value = "工作内容")
+        private String workContent; // 工作内容、做法/规格型号/施工现场配置说明
+
+        @ExcelProperty(value = "单位")
+        private String unit; // 单位
+
+        @ExcelProperty(value = "工程量")
+        private BigDecimal quantity; // 工程量
+
+        @ExcelProperty(value = "不含税单价")
+        private String unitPriceExcludingTax; // 不含税单价
+
+        @ExcelProperty(value = "使用时间")
+        private String usageTime; // 使用时间
+
+        @ExcelProperty(value = "不含税合价")
+        private String amountExcludingTax; // 不含税合价
+
+        @ExcelProperty(value = "税率(%)")
+        private String taxRate; // 税率(%)
+
+        @ExcelProperty(value = "含税合价")
+        private String amountIncludingTax; // 含税合价
+
+        @ExcelProperty(value = "摊销比例(%)")
+        private String amortizationRatio; // 摊销比例(%)
+
+        @ExcelProperty(value = "摊销后不含税合价")
+        private String amountExcludeTaxAmortized; // 摊销后不含税合价
+
+        @ExcelProperty(value = "摊销后含税合价")
+        private String amountIncludeTaxAmortized; // 摊销后含税合价
+
+        @ExcelProperty(value = "税金（元）")
+        private String taxAmount; // 税金（元）
+
+        @ExcelProperty(value = "备注")
+        private String remarks; // 备注
+
+        @ExcelProperty(value = "成本科目")
+        private String costSubject; // 成本科目
+
+        @ExcelProperty(value = "税金类型")
+        private String taxType; // 税金类型
+
+
+        //        @ExcelProperty(value = "主键")
+        private Long id; // 主键
+
+//        @ExcelProperty(value = "项目ID")
+        private Long cbProjectId; // 项目ID
+
+        private Long parentId; // 父项id
+
+        private Integer level; // 层级数
+
+        private String no; // 处理后内容
+
+}

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

+package com.dsk.cscec.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 措施费导入数据
+ *
+ * @author tanyang
+ * @create 2024-02-04 13:49
+ **/
+@Data
+public class CbCostMeasuresItemVo {
+
+
+    private String itemContent; // 清单内容
+
+
+    private Long id; // 主键
+
+
+}

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

+package com.dsk.cscec.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 措施费导入数据
+ *
+ * @author tanyang
+ * @create 2024-02-04 13:49
+ **/
+@Data
+public class CbProjectExpenseSummaryImportVo {
+
+
+
+        @ExcelProperty(value = "名称")
+        private String expenseName; // 名称
+
+        @ExcelProperty(value = "数值")
+        private String expenseValue; // 数值
+
+        @ExcelProperty(value = "占比")
+        private String proportion; // 占比
+
+
+//        @ExcelProperty(value = "序号")
+        private String number; // 清单内容
+
+        private Long id; // 主键
+
+        private Long cbProjectId; // 项目ID
+
+        private Long parentId; // 父项id
+
+        private Integer dataType; // 数据类型(0:现场经费、1:其他费用、2:措施费)
+
+        private String no; // 处理后内容
+
+}

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

+package com.dsk.cscec.domain.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author lcl
+ * @Data 2024/2/6 14:46
+ */
+@Data
+public class CbQuantitySummaryListVo {
+
+    private Long id;
+    /**
+     * 成本科目名称（合约规划）
+     */
+    private String cbSubjectName;
+    /**
+     * 公司编码
+     */
+    private String companyNo;
+    /**
+     * 集团编码
+     */
+    private String orgNo;
+    /**
+     * 成本名称
+     */
+    private String cbName;
+    /**
+     * 工作内容
+     */
+    private String jobContent;
+    /**
+     * 计算规则
+     */
+    private String calculationRule;
+    /**
+     * 计量单位
+     */
+    private String unit;
+    /**
+     * 材料说明
+     */
+    private String materialDescription;
+    /**
+     * 指导价格
+     */
+    private String guidePrice;
+    /**
+     * 投标选用单价（不含税）
+     */
+    private Double bidUnitPrice;
+    /**
+     * 单价差额
+     */
+    private Double unitPriceDifference;
+    /**
+     * 数量
+     */
+    private Double quantity;
+    /**
+     * 合价(不含税)
+     */
+    private Double combinedPrice;
+    /**
+     * 合价（含税）
+     */
+    private Double combinedPriceTax;
+    /**
+     * 品牌名称
+     */
+    private String brandName;
+    /**
+     * 投标选用来源
+     */
+    private String bidSource;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 工程量（本月用料）
+     */
+    private Double quantities;
+    /**
+     * 单位
+     */
+    private String quantitiesUnit;
+    /**
+     * 换算后本月用料
+     */
+    private Double conversionQuantities;
+    /**
+     * 换算单位
+     */
+    private String conversionUnit;
+    /**
+     * 采购单价
+     */
+    private Double purchaseUnitPrice;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 截至本月总量
+     */
+    private Double totalQuantities;
+    /**
+     * 本月已填写成本Id
+     */
+    private String actualId;
+    /**
+     * 推送工程量
+     */
+    private Double pushQuantities;
+    /**
+     *  IPM项目编码
+     */
+    private String ipmProjectCode;
+    /**
+     * IPM合同编码
+     */
+    private String ipmContractCode;
+    /**
+     * IPM作业编码
+     */
+    private String ipmJobCode;
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/CbAccountSummary.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/CbSummaryActualListVo.java

-package com.dsk.cscec.domain;
+package com.dsk.cscec.domain.vo;
 
+import com.dsk.common.core.domain.BaseEntity;
 import lombok.Data;
 
-import java.io.Serializable;
-import java.util.Date;
+import java.math.BigDecimal;
+import java.util.List;
 
 /**
- * 成本汇总-成本科目汇总(CbAccountSummary)实体类
+ * 成本汇总Bo
  *
- * @author
- * @since 2024-02-05
+ * @author cyf
+ * @since 2024-02-06
  */
 @Data
-public class CbAccountSummary implements Serializable {
-    private static final long serialVersionUID = 292585790421593142L;
+public class CbSummaryActualListVo extends BaseEntity {
     /**
      * 主键id
      */
-    private Integer id;
-    /**
-     * 父级id
-     */
-    private Integer parentId;
-    /**
-     * 层级
-     */
-    private Integer level;
-    /**
-     * 排序
-     */
-    private Integer sort;
+    private Long id;
     /**
      * 项目id
      */
-    private Integer projectId;
+    private Long projectId;
     /**
      * 成本阶段( 0:标前成本、1:标后成本、2:转固成本)
      */
@@ -43,9 +31,9 @@ public class CbAccountSummary implements Serializable {
      */
     private String number;
     /**
-     * 成本科目
+     * 名称/成本科目
      */
-    private String cbAccount;
+    private String cbName;
     /**
      * 不含税成本合价
      */
@@ -71,8 +59,25 @@ public class CbAccountSummary implements Serializable {
      */
     private String remark;
     /**
-     * 创建时间
+     * 费用id
+     */
+    private Long actualId;
+    /**
+     * 本月费用（含税）
+     */
+    private BigDecimal taxInclusiveExpense;
+    /**
+     * 本月费用（不含税）
+     */
+    private BigDecimal taxExclusiveExpense;
+    /**
+     * 费用日期
+     */
+    private String expenseDate;
+    /**
+     * 是否锁定（0否，1是）
      */
-    private Date createTime;
+    private Integer lockStatus;
 
+    private List<CbSummaryActualListVo> children;
 }

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

+package com.dsk.cscec.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 成本汇总(CbSummary)-项目汇总导入Vo
+ *
+ * @author cyf
+ * @since 2024-02-06
+ */
+@Data
+@NoArgsConstructor
+public class CbSummaryProjectImportVo implements Serializable {
+    private static final long serialVersionUID = -20126964599875841L;
+
+    /**
+     * 序号
+     */
+    @ExcelProperty(value = "序号")
+    private String number;
+    /**
+     * 名称
+     */
+    @ExcelProperty(value = "名称")
+    private String cbName;
+    /**
+     * 不含税成本合价
+     */
+    @ExcelProperty(value = "不含税成本合价")
+    private String taxExclusiveTotal;
+    /**
+     * 成本税金合价
+     */
+    @ExcelProperty(value = "成本税金合价")
+    private String cbTaxesTotal;
+    /**
+     * 含税成本合价
+     */
+    @ExcelProperty(value = "含税成本合价")
+    private String taxInclusiveTotal;
+    /**
+     * 成本占比
+     */
+    @ExcelProperty(value = "成本占比")
+    private String cbProportion;
+    /**
+     * 含税成本平米指标
+     */
+    @ExcelProperty(value = "含税成本平米指标")
+    private String taxInclusivePmTarget;
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+}

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

+package com.dsk.cscec.domain.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author sxk
+ * @date 2024.02.07
+ * @time 16:28
+ */
+@Data
+public class DraftDialogListVo {
+    /**
+     * 项目ID
+     */
+    private Long projectId;
+    /**
+     * 项目名称
+     */
+    private String projectName;
+    /**
+     * 成本阶段(0:标前成本、1:标后成本、2:转固成本)
+     */
+    private Integer cbStage;
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+}
\ No newline at end of file

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

+package com.dsk.cscec.domain.vo;
+
+import com.dsk.cscec.domain.CbProjectFile;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author sxk
+ * @date 2024.02.08
+ * @time 10:24
+ */
+@Data
+public class QueryProjectFileUploadDetailVo {
+    /**
+     * 项目ID
+     */
+    private Long projectId;
+    /**
+     * 直接费成本
+     */
+    private List<CbProjectFile> directExpense = new ArrayList<>();
+    /**
+     * 工料汇总
+     */
+    private List<CbProjectFile> quantitySummary = new ArrayList<>();
+    /**
+     * 措施项目
+     */
+    private List<CbProjectFile> measureProject = new ArrayList<>();
+    /**
+     * 其他项目
+     */
+    private List<CbProjectFile> otherProject = new ArrayList<>();
+    /**
+     * 现场经费
+     */
+    private List<CbProjectFile> sceneExpense = new ArrayList<>();
+    /**
+     * 成本汇总
+     */
+    private List<CbProjectFile> cbSummary = new ArrayList<>();
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/listener/ProjectCostMeasureSummaryImportListener.java

+package com.dsk.cscec.listener;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ReUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.dsk.common.excel.ExcelListener;
+import com.dsk.common.excel.ExcelResult;
+import com.dsk.common.exception.ServiceException;
+import com.dsk.common.helper.LoginHelper;
+import com.dsk.common.utils.spring.SpringUtils;
+import com.dsk.cscec.domain.CbProjectExpenseSummary;
+import com.dsk.cscec.domain.vo.CbCostMeasuresImportVo;
+import com.dsk.cscec.domain.vo.CbProjectExpenseSummaryImportVo;
+import com.dsk.cscec.service.CbProjectExpenseSummaryService;
+import com.dsk.cscec.service.impl.CbCostMeasureServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Pattern;
+
+/**
+ * 系统用户自定义导入
+ *
+ * @author Lion Li
+ */
+@Slf4j
+public class ProjectCostMeasureSummaryImportListener extends AnalysisEventListener<CbProjectExpenseSummaryImportVo> implements ExcelListener<CbProjectExpenseSummaryImportVo> {
+
+    private final CbProjectExpenseSummaryService cbProjectExpenseSummaryService;
+//
+//    private final String password;
+
+    private final Long projectId;
+    private final Integer cbStage;
+    private final Integer dataType;
+
+    private List<CbProjectExpenseSummaryImportVo> dataList = new ArrayList<>();
+
+//    private final String operName;
+
+    private int successNum = 0;
+    private int failureNum = 0;
+    private final StringBuilder successMsg = new StringBuilder();
+    private final StringBuilder failureMsg = new StringBuilder();
+
+    public ProjectCostMeasureSummaryImportListener(Long projectId, Integer cbStage,Integer dataType) {
+        this.cbProjectExpenseSummaryService = SpringUtils.getBean(CbProjectExpenseSummaryService.class);
+        this.cbStage = cbStage;
+        this.projectId = projectId;
+        this.dataType=dataType;
+    }
+
+    @Override
+    public void invoke(CbProjectExpenseSummaryImportVo importVo, AnalysisContext context) {
+
+        CbProjectExpenseSummary cbProjectExpenseSummary=new CbProjectExpenseSummary();
+        BeanUtil.copyProperties(importVo,cbProjectExpenseSummary);
+        cbProjectExpenseSummary.setProjectId(projectId);
+        cbProjectExpenseSummary.setCbStage(cbStage);
+        cbProjectExpenseSummary.setDataType(dataType);
+        cbProjectExpenseSummary.setCreateBy(LoginHelper.getUsername());
+        cbProjectExpenseSummaryService.save(cbProjectExpenseSummary);
+
+    }
+
+    @Override
+    public void doAfterAllAnalysed(AnalysisContext context) {
+
+    }
+
+    @Override
+    public ExcelResult<CbProjectExpenseSummaryImportVo> getExcelResult() {
+        return new ExcelResult<CbProjectExpenseSummaryImportVo>() {
+
+            @Override
+            public String getAnalysis() {
+                if (failureNum > 0) {
+                    failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
+                    throw new ServiceException(failureMsg.toString());
+                } else {
+                    successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+                }
+                return successMsg.toString();
+            }
+
+            @Override
+            public List<CbProjectExpenseSummaryImportVo> getList() {
+                return dataList;
+            }
+
+            @Override
+            public List<String> getErrorList() {
+                return null;
+            }
+        };
+    }
+
+}

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

-package com.dsk.cscec.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsk.cscec.domain.CbAccountSummaryActual;
-
-/**
- * 成本汇总-成本科目汇总-每月费用(CbAccountSummaryActual)表数据库访问层
- *
- * @author
- * @since 2024-02-05
- */
-public interface CbAccountSummaryActualMapper extends BaseMapper<CbAccountSummaryActual> {
-
-}

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

-package com.dsk.cscec.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsk.cscec.domain.CbAccountSummary;
-
-/**
- * 成本汇总-成本科目汇总(CbAccountSummary)表数据库访问层
- *
- * @author
- * @since 2024-02-05
- */
-public interface CbAccountSummaryMapper extends BaseMapper<CbAccountSummary> {
-
-}

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

+package com.dsk.cscec.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsk.cscec.domain.CbCostMeasureActual;
+import com.dsk.cscec.domain.bo.CbCostMeasureActualBo;
+import com.dsk.cscec.domain.vo.CbCostMeasureActualVo;
+
+import java.util.List;
+
+public interface CbCostMeasureActualMapper extends BaseMapper<CbCostMeasureActual> {
+    int insertSelective(CbCostMeasureActual record);
+
+    int updateByPrimaryKeySelective(CbCostMeasureActual record);
+
+    List<CbCostMeasureActualVo> selectDataList(CbCostMeasureActualBo costMeasureActualBo);
+}
\ No newline at end of file

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

+package com.dsk.cscec.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dsk.common.core.domain.entity.SysDictData;
+import com.dsk.cscec.domain.CbCostMeasure;
+import com.dsk.cscec.domain.CbQuantitySummary;
+import com.dsk.cscec.domain.bo.CbCostMeasureActualBo;
+import com.dsk.cscec.domain.vo.CbCostMeasureActualVo;
+
+import java.util.List;
+
+public interface CbCostMeasureMapper extends BaseMapper<CbCostMeasure> {
+
+    List<CbCostMeasureActualVo> selectListByProjectAndNo(CbCostMeasureActualBo cbCostMeasure);
+}
\ No newline at end of file

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

+package com.dsk.cscec.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsk.cscec.domain.CbProjectExpenseSummary;
+
+public interface CbProjectExpenseSummaryMapper extends BaseMapper<CbProjectExpenseSummary> {
+}
\ No newline at end of file

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

@@ -2,6 +2,10 @@ package com.dsk.cscec.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.dsk.cscec.domain.CbProjectFile;
+import com.dsk.cscec.domain.vo.DraftDialogListVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 项目成本文件表(CbProjectFile)表数据库访问层
@@ -10,7 +14,11 @@ import com.dsk.cscec.domain.CbProjectFile;
  * @since 2024-02-05 14:01:03
  */
 public interface CbProjectFileMapper extends BaseMapper<CbProjectFile> {
-
-
+    /**
+     * 获取草稿弹窗列表
+     *
+     * @return 草稿弹窗列表
+     */
+    List<DraftDialogListVo> getDraftDialogList(@Param("projectFileStatusWaitParse") Integer projectFileStatusWaitParse,@Param("deleteFlagExist")Integer deleteFlagExist);
 }
 

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

-package com.dsk.cscec.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsk.cscec.domain.CbProjectSummaryActual;
-
-/**
- * 成本汇总-项目汇总-每月费用(CbProjectSummaryActual)表数据库访问层
- *
- * @author
- * @since 2024-02-05
- */
-public interface CbProjectSummaryActualMapper extends BaseMapper<CbProjectSummaryActual> {
-
-}

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

-package com.dsk.cscec.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsk.cscec.domain.CbProjectSummary;
-
-/**
- * 成本汇总-项目汇总(CbProjectSummary)表数据库访问层
- *
- * @author
- * @since 2024-02-05
- */
-public interface CbProjectSummaryMapper extends BaseMapper<CbProjectSummary> {
-
-}

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

 package com.dsk.cscec.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsk.common.core.mapper.BaseMapperPlus;
 import com.dsk.cscec.domain.CbQuantitySummary;
 import com.dsk.cscec.domain.bo.CbProjectBaseBo;
+import com.dsk.cscec.domain.bo.CbQuantitySummaryListBo;
+import com.dsk.cscec.domain.vo.CbQuantitySummaryListVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -15,12 +18,16 @@ import java.util.Map;
  * @author lcl
  * @since 2024-02-05 11:06:56
  */
-public interface CbQuantitySummaryMapper extends BaseMapper<CbQuantitySummary> {
+public interface CbQuantitySummaryMapper extends BaseMapperPlus<CbQuantitySummaryMapper,CbQuantitySummary,CbQuantitySummary> {
 
 
     List<Map<String, Object>> selectSubject(CbProjectBaseBo bo);
 
     int selectOtherSubjectCount(CbProjectBaseBo bo);
 
+    List<String> selectMonthList(CbQuantitySummaryListBo bo);
+
+    List<CbQuantitySummaryListVo> selectListBySubject(CbQuantitySummaryListBo bo);
+
 }
 

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

+package com.dsk.cscec.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsk.cscec.domain.CbSummaryActual;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 成本汇总-每月费用(CbSummaryActual)表数据库访问层
+ *
+ * @author cyf
+ * @since 2024-02-06
+ */
+public interface CbSummaryActualMapper extends BaseMapper<CbSummaryActual> {
+    /**
+     * 批量新增或按主键更新数据（MyBatis原生foreach方法）
+     *
+     * @param entities List<CbSummaryActual> 实例对象列表
+     * @return 影响行数
+     */
+    int insertOrUpdateBatch(@Param("entities") List<CbSummaryActual> entities);
+
+}

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

+package com.dsk.cscec.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsk.cscec.domain.CbSummary;
+import com.dsk.cscec.domain.bo.CbSummaryBo;
+import com.dsk.cscec.domain.vo.CbSummaryActualListVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 成本汇总(CbSummary)表数据库访问层
+ *
+ * @author cyf
+ * @since 2024-02-06
+ */
+public interface CbSummaryMapper extends BaseMapper<CbSummary> {
+
+    List<CbSummaryActualListVo> getByParentId(@Param("parentId") Long parentId, @Param("expenseDate") String expenseDate);
+
+    /**
+     * 获取已添加成本月份
+     *
+     * @param bo
+     * @return
+     */
+    List<String> getExpenseDateList(@Param("bo") CbSummaryBo bo);
+
+    /**
+     * 根据level获取名称/成本科目
+     *
+     * @param bo
+     * @return
+     */
+    List<Map<String, Object>> selectByLevel(@Param("bo") CbSummaryBo bo);
+}

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

-package com.dsk.cscec.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsk.cscec.domain.CbAccountSummaryActual;
-
-/**
- * 成本汇总-成本科目汇总-每月费用(CbAccountSummaryActual)表服务接口
- *
- * @author
- * @since 2024-02-05
- */
-public interface CbAccountSummaryActualService extends IService<CbAccountSummaryActual> {
-
-}

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

-package com.dsk.cscec.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsk.cscec.domain.CbAccountSummary;
-
-/**
- * 成本汇总-成本科目汇总(CbAccountSummary)表服务接口
- *
- * @author
- * @since 2024-02-05
- */
-public interface CbAccountSummaryService extends IService<CbAccountSummary> {
-
-}

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

+package com.dsk.cscec.service;
+
+import com.dsk.cscec.domain.CbProjectExpenseSummary;
+import com.baomidou.mybatisplus.extension.service.IService;
+public interface CbProjectExpenseSummaryService extends IService<CbProjectExpenseSummary>{
+
+
+}

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

@@ -2,6 +2,13 @@ package com.dsk.cscec.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.dsk.cscec.domain.CbProjectFile;
+import com.dsk.cscec.domain.bo.AddProjectFileUploadBo;
+import com.dsk.cscec.domain.bo.QueryProjectFileUploadDetailBo;
+import com.dsk.cscec.domain.vo.DraftDialogListVo;
+import com.dsk.cscec.domain.vo.QueryProjectFileUploadDetailVo;
+import com.dsk.system.domain.vo.SysOssVo;
+
+import java.util.List;
 
 /**
  * 项目成本文件表(CbProjectFile)表服务接口
@@ -10,5 +17,35 @@ import com.dsk.cscec.domain.CbProjectFile;
  * @since 2024-02-05 14:01:06
  */
 public interface CbProjectFileService extends IService<CbProjectFile> {
+    /**
+     * 添加项目上传文件记录
+     *
+     * @param fileUploadBo 上传信息
+     * @param oss          oss信息
+     */
+    void addProjectFile(AddProjectFileUploadBo fileUploadBo, SysOssVo oss);
+
+    /**
+     * 逻辑删除项目上传文件记录
+     *
+     * @param fileId 文件ID
+     * @return 删除结果
+     */
+    Integer deleteProjectFile(Long fileId);
+
+    /**
+     * 获取草稿弹窗列表
+     *
+     * @return 草稿弹窗列表
+     */
+    List<DraftDialogListVo> getDraftDialogList();
+
+    /**
+     * 获取项目文件上传详情
+     *
+     * @param uploadDetailBo 查询信息
+     * @return 文件列表
+     */
+    QueryProjectFileUploadDetailVo getProjectFileUploadDetail(QueryProjectFileUploadDetailBo uploadDetailBo);
 
 }

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

@@ -2,6 +2,8 @@ package com.dsk.cscec.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.dsk.cscec.domain.CbProjectRecord;
+import com.dsk.cscec.domain.bo.AddCbProjectBo;
+import com.dsk.cscec.domain.bo.ImportCbProjectDataBo;
 
 /**
  * 项目台账表(CbProjectRecord)表服务接口
@@ -10,6 +12,18 @@ import com.dsk.cscec.domain.CbProjectRecord;
  * @since 2024-02-05 11:37:53
  */
 public interface CbProjectRecordService extends IService<CbProjectRecord> {
+    /**
+     * 新增项目
+     *
+     * @param addCbProjectBo 新增对象
+     * @return 新增结果
+     */
+    CbProjectRecord addProject(AddCbProjectBo addCbProjectBo);
 
-
+    /**
+     * 根据项目文件导入数据
+     *
+     * @param importDataBo 导入对象
+     */
+    void importData(ImportCbProjectDataBo importDataBo);
 }

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

-package com.dsk.cscec.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsk.cscec.domain.CbProjectSummaryActual;
-
-/**
- * 成本汇总-项目汇总-每月费用(CbProjectSummaryActual)表服务接口
- *
- * @author
- * @since 2024-02-05
- */
-public interface CbProjectSummaryActualService extends IService<CbProjectSummaryActual> {
-
-}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/CbProjectSummaryService.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/CbSummaryActualService.java

 package com.dsk.cscec.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsk.cscec.domain.CbProjectSummary;
+import com.dsk.cscec.domain.CbSummaryActual;
 
 /**
- * 成本汇总-项目汇总(CbProjectSummary)表服务接口
+ * 成本汇总-每月费用(CbSummaryActual)表服务接口
  *
- * @author
- * @since 2024-02-05
+ * @author cyf
+ * @since 2024-02-06
  */
-public interface CbProjectSummaryService extends IService<CbProjectSummary> {
+public interface CbSummaryActualService extends IService<CbSummaryActual> {
 
 }

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

+package com.dsk.cscec.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsk.cscec.domain.CbSummary;
+import com.dsk.cscec.domain.bo.CbSummaryActualBo;
+import com.dsk.cscec.domain.bo.CbSummaryActualListBo;
+import com.dsk.cscec.domain.bo.CbSummaryBo;
+import com.dsk.cscec.domain.vo.CbSummaryActualListVo;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 成本汇总(CbSummary)表服务接口
+ *
+ * @author cyf
+ * @since 2024-02-06
+ */
+public interface CbSummaryService extends IService<CbSummary> {
+
+    //项目汇总导入 todo
+    void importCbProject(Long projectId, Integer cbStage);
+
+    /**
+     * 获取一级名称/成本科目列表
+     *
+     * @param bo
+     * @return
+     */
+    List<Map<String, Object>> getCbNameList(CbSummaryBo bo);
+
+    /**
+     * 根据父级id获取子级数据
+     *
+     * @param bo
+     * @return
+     */
+    List<CbSummaryActualListVo> getActualList(CbSummaryActualListBo bo);
+
+    /**
+     * 获取已添加成本月份
+     *
+     * @param bo
+     * @return
+     */
+    List<String> getExpenseDateList(CbSummaryBo bo);
+
+    /**
+     * 新增/更新每月费用
+     *
+     * @param boList
+     * @return
+     */
+    boolean insertOrUpdateActual(List<CbSummaryActualBo> boList);
+}

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

+package com.dsk.cscec.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsk.cscec.domain.CbCostMeasure;
+import com.dsk.cscec.domain.CbCostMeasureActual;
+import com.dsk.cscec.domain.bo.CbCostMeasureActualBo;
+import com.dsk.cscec.domain.bo.CbCostMeasureActualSaveBo;
+import com.dsk.cscec.domain.vo.CbCostMeasureActualVo;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 成本-工料汇总基本表(CbQuantitySummary)表服务接口
+ *
+ * @author lcl
+ * @since 2024-02-05 11:06:56
+ */
+public interface ICbCostMeasureActualService extends IService<CbCostMeasureActual> {
+
+}
+

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

+package com.dsk.cscec.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsk.common.core.domain.PageQuery;
+import com.dsk.common.core.domain.entity.SysDictData;
+import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.cscec.domain.CbCostMeasure;
+import com.dsk.cscec.domain.bo.CbCostMeasureActualBo;
+import com.dsk.cscec.domain.bo.CbCostMeasureActualPushBo;
+import com.dsk.cscec.domain.bo.CbCostMeasureActualSaveBo;
+import com.dsk.cscec.domain.vo.CbCostMeasureActualVo;
+import com.dsk.cscec.domain.vo.CbCostMeasuresItemVo;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 成本-工料汇总基本表(CbQuantitySummary)表服务接口
+ *
+ * @author lcl
+ * @since 2024-02-05 11:06:56
+ */
+public interface ICbCostMeasureService extends IService<CbCostMeasure> {
+
+    void importExcelData(MultipartFile file, Long projectId);
+
+    List<Map<String, Object>> listByLevel(Long projectId, int i);
+
+    List<CbCostMeasureActualVo> selectDataList(CbCostMeasureActualBo cbCostMeasure);
+
+    void saveBatchCostMeasureActual(List<CbCostMeasureActualSaveBo> boList);
+
+    void pushCostMeasureActual(CbCostMeasureActualPushBo pushBo);
+
+    void importExcelSummaryData(MultipartFile file, Long projectId,Integer dataType);
+}
+

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

@@ -2,7 +2,10 @@ package com.dsk.cscec.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.dsk.cscec.domain.CbQuantitySummary;
+import com.dsk.cscec.domain.CbQuantitySummaryActual;
 import com.dsk.cscec.domain.bo.CbProjectBaseBo;
+import com.dsk.cscec.domain.bo.CbQuantitySummaryListBo;
+import com.dsk.cscec.domain.vo.CbQuantitySummaryListVo;
 
 import java.util.List;
 import java.util.Map;
@@ -17,7 +20,13 @@ public interface ICbQuantitySummaryService extends IService<CbQuantitySummary> {
 
     Map<String, Object> subjectTree(CbProjectBaseBo bo);
 
-    List<String> monthList(CbProjectBaseBo bo);
+    List<String> monthList(CbQuantitySummaryListBo bo);
+
+    List<CbQuantitySummaryListVo> subjectList(CbQuantitySummaryListBo bo);
+
+    void updateActual(List<CbQuantitySummaryActual> list);
+
+    void pushData(CbQuantitySummaryActual bo);
 
 }
 

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

@@ -52,5 +52,13 @@ public interface IDProjectService extends IService<DProject> {
      * @return 项目详情
      */
     ProjectDetailVo queryProjectDetail(ProjectDetailBo projectDetailBo);
+
+    /**
+     * 校验项目编码是否存在
+     *
+     * @param projectCode 项目编码
+     * @return 校验结果
+     */
+    Boolean checkProjectCodeExist(String projectCode);
 }
 

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

-package com.dsk.cscec.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsk.cscec.domain.CbAccountSummaryActual;
-import com.dsk.cscec.mapper.CbAccountSummaryActualMapper;
-import com.dsk.cscec.service.CbAccountSummaryActualService;
-import org.springframework.stereotype.Service;
-
-/**
- * 成本汇总-成本科目汇总-每月费用(CbAccountSummaryActual)表服务实现类
- *
- * @author
- * @since 2024-02-05
- */
-@Service
-public class CbAccountSummaryActualServiceImpl extends ServiceImpl<CbAccountSummaryActualMapper, CbAccountSummaryActual> implements CbAccountSummaryActualService {
-
-}

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

-package com.dsk.cscec.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsk.cscec.domain.CbAccountSummary;
-import com.dsk.cscec.mapper.CbAccountSummaryMapper;
-import com.dsk.cscec.service.CbAccountSummaryService;
-import org.springframework.stereotype.Service;
-
-/**
- * 成本汇总-成本科目汇总(CbAccountSummary)表服务实现类
- *
- * @author
- * @since 2024-02-05
- */
-@Service
-public class CbAccountSummaryServiceImpl extends ServiceImpl<CbAccountSummaryMapper, CbAccountSummary> implements CbAccountSummaryService {
-
-}

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

+package com.dsk.cscec.service.impl;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsk.cscec.domain.CbProjectExpenseSummary;
+import com.dsk.cscec.mapper.CbProjectExpenseSummaryMapper;
+import com.dsk.cscec.service.CbProjectExpenseSummaryService;
+@Service
+public class CbProjectExpenseSummaryServiceImpl extends ServiceImpl<CbProjectExpenseSummaryMapper, CbProjectExpenseSummary> implements CbProjectExpenseSummaryService{
+
+}

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

 package com.dsk.cscec.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsk.common.exception.ServiceException;
+import com.dsk.cscec.constant.CbProjectConstants;
 import com.dsk.cscec.domain.CbProjectFile;
+import com.dsk.cscec.domain.CbProjectRecord;
+import com.dsk.cscec.domain.bo.AddProjectFileUploadBo;
+import com.dsk.cscec.domain.bo.QueryProjectFileUploadDetailBo;
+import com.dsk.cscec.domain.vo.DraftDialogListVo;
+import com.dsk.cscec.domain.vo.QueryProjectFileUploadDetailVo;
 import com.dsk.cscec.mapper.CbProjectFileMapper;
+import com.dsk.cscec.mapper.CbProjectRecordMapper;
 import com.dsk.cscec.service.CbProjectFileService;
+import com.dsk.system.domain.vo.SysOssVo;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * 项目成本文件表(CbProjectFile)表服务实现类
@@ -18,5 +33,118 @@ import javax.annotation.Resource;
 public class CbProjectFileServiceImpl extends ServiceImpl<CbProjectFileMapper, CbProjectFile> implements CbProjectFileService {
     @Resource
     private CbProjectFileMapper baseMapper;
+    @Resource
+    private CbProjectRecordMapper projectRecordMapper;
+
+    /**
+     * 添加项目上传文件记录
+     *
+     * @param fileUploadBo 上传信息
+     * @param oss          oss信息
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void addProjectFile(AddProjectFileUploadBo fileUploadBo, SysOssVo oss) {
+        //校验项目是否存在
+        this.checkProjectExist(fileUploadBo.getProjectId());
+
+        CbProjectFile projectFile = BeanUtil.toBean(fileUploadBo, CbProjectFile.class);
+        projectFile.setFileName(oss.getOriginalName());
+        projectFile.setFileOssId(oss.getOssId().toString());
+        projectFile.setFileOssUrl(oss.getUrl());
+        //项目文件状态:解析中
+        projectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_WAIT_PARSE);
+        //删除状态:未删除
+        projectFile.setDelFlag(CbProjectConstants.DELETE_FLAG_EXIST);
+        baseMapper.insert(projectFile);
+    }
 
+    /**
+     * 逻辑删除项目上传文件记录
+     *
+     * @param fileId 文件ID
+     * @return 删除结果
+     */
+    @Override
+    public Integer deleteProjectFile(Long fileId) {
+        CbProjectFile projectFile = baseMapper.selectById(fileId);
+        Assert.notNull(projectFile, "该文件不存在");
+        projectFile.setDelFlag(CbProjectConstants.DELETE_FLAG_NOT_EXIST);
+        return baseMapper.updateById(projectFile);
+    }
+
+    /**
+     * 获取草稿弹窗列表
+     *
+     * @return 草稿弹窗列表
+     */
+    @Override
+    public List<DraftDialogListVo> getDraftDialogList() {
+        return baseMapper.getDraftDialogList(CbProjectConstants.PROJECT_FILE_STATUS_WAIT_PARSE, CbProjectConstants.DELETE_FLAG_EXIST);
+    }
+
+    /**
+     * 获取项目文件上传详情
+     *
+     * @param uploadDetailBo 查询信息
+     * @return 文件列表
+     */
+    @Override
+    public QueryProjectFileUploadDetailVo getProjectFileUploadDetail(QueryProjectFileUploadDetailBo uploadDetailBo) {
+        Long projectId = uploadDetailBo.getProjectId();
+        //校验项目是否存在
+        this.checkProjectExist(projectId);
+
+        List<CbProjectFile> projectFileList = baseMapper.selectList(new LambdaQueryWrapper<CbProjectFile>()
+                .eq(CbProjectFile::getProjectId, projectId)
+                //成本阶段
+                .eq(CbProjectFile::getCbStage, uploadDetailBo.getCbStage())
+                //删除状态:否
+                .eq(CbProjectFile::getDelFlag, CbProjectConstants.DELETE_FLAG_EXIST));
+
+        QueryProjectFileUploadDetailVo draftDetailVo = new QueryProjectFileUploadDetailVo();
+        draftDetailVo.setProjectId(projectId);
+        if (projectFileList.isEmpty()) {
+            return draftDetailVo;
+        }
+
+        //按照成本类型分类填充
+        projectFileList.forEach(fileList -> {
+            //TODO:此写法太丑陋,待优化
+            if (Objects.equals(fileList.getCbType(), CbProjectConstants.CB_TYPE_DIRECT_EXPENSE)) {
+                //直接费成本
+                draftDetailVo.getDirectExpense().add(fileList);
+            } else if (Objects.equals(fileList.getCbType(), CbProjectConstants.CB_TYPE_QUANTITY_SUMMARY)) {
+                //工料汇总
+                draftDetailVo.getQuantitySummary().add(fileList);
+            } else if (Objects.equals(fileList.getCbType(), CbProjectConstants.CB_TYPE_MEASURE_PROJECT)) {
+                //措施项目
+                draftDetailVo.getMeasureProject().add(fileList);
+            } else if (Objects.equals(fileList.getCbType(), CbProjectConstants.CB_TYPE_OTHER_PROJECT)) {
+                //其他项目
+                draftDetailVo.getOtherProject().add(fileList);
+            } else if (Objects.equals(fileList.getCbType(), CbProjectConstants.CB_TYPE_SCENE_EXPENSE)) {
+                //现场经费
+                draftDetailVo.getSceneExpense().add(fileList);
+            } else if (Objects.equals(fileList.getCbType(), CbProjectConstants.CB_TYPE_SUMMARY)) {
+                //成本汇总
+                draftDetailVo.getCbSummary().add(fileList);
+            }
+        });
+        return draftDetailVo;
+    }
+
+    /**
+     * 校验项目是否存在
+     *
+     * @param projectId 项目ID
+     */
+    private void checkProjectExist(Long projectId) {
+        //校验项目是否存在
+        if (!projectRecordMapper.exists(new LambdaQueryWrapper<CbProjectRecord>()
+                .eq(CbProjectRecord::getId, projectId)
+                .eq(CbProjectRecord::getDelFlag, CbProjectConstants.DELETE_FLAG_EXIST))) {
+            throw new ServiceException("该项目不存在");
+        }
+    }
 }

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

 package com.dsk.cscec.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsk.cscec.constant.CbProjectConstants;
 import com.dsk.cscec.domain.CbProjectRecord;
+import com.dsk.cscec.domain.bo.AddCbProjectBo;
+import com.dsk.cscec.domain.bo.ImportCbProjectDataBo;
+import com.dsk.cscec.mapper.CbProjectFileMapper;
 import com.dsk.cscec.mapper.CbProjectRecordMapper;
 import com.dsk.cscec.service.CbProjectRecordService;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 
@@ -18,5 +26,51 @@ import javax.annotation.Resource;
 public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMapper, CbProjectRecord> implements CbProjectRecordService {
     @Resource
     private CbProjectRecordMapper baseMapper;
+    @Resource
+    private CbProjectFileMapper projectFileMapper;
+
+    /**
+     * 新增项目
+     *
+     * @param addCbProjectBo 新增对象
+     * @return 新增结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public CbProjectRecord addProject(AddCbProjectBo addCbProjectBo) {
+        CbProjectRecord projectRecord = BeanUtil.toBean(addCbProjectBo, CbProjectRecord.class);
+        //项目文件状态:待解析
+        projectRecord.setProjectFileStatus(CbProjectConstants.PROJECT_FILE_STATUS_WAIT_PARSE);
+        //删除状态:否
+        projectRecord.setDelFlag(CbProjectConstants.DELETE_FLAG_EXIST);
+        if (baseMapper.insert(projectRecord) > 0) {
+            return projectRecord;
+        }
+        return null;
+    }
+
+    /**
+     * 根据项目文件导入数据
+     *
+     * @param importDataBo 导入对象
+     */
+    @Override
+    public void importData(ImportCbProjectDataBo importDataBo) {
+        Long projectId = importDataBo.getProjectId();
+        Integer cbStage = importDataBo.getCbStage();
+        //校验项目是否存在
+        Assert.isTrue(baseMapper.exists(new LambdaQueryWrapper<CbProjectRecord>()
+                .eq(CbProjectRecord::getId, projectId)
+                .eq(CbProjectRecord::getCbStage, cbStage)
+                .eq(CbProjectRecord::getDelFlag, CbProjectConstants.DELETE_FLAG_EXIST)), "该项目不存在");
+        //TODO:校验各个成本类型是否至少有1个文件
+        //TODO:调各个成本类型的解析文件方法
+        //直接费成本
+        //工料汇总
+        //措施项目
+        //其他项目
+        //现场经费
+        //成本汇总
 
+    }
 }

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

-package com.dsk.cscec.service.impl;
-
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsk.cscec.domain.CbProjectSummaryActual;
-import com.dsk.cscec.mapper.CbProjectSummaryActualMapper;
-import com.dsk.cscec.service.CbProjectSummaryActualService;
-import org.springframework.stereotype.Service;
-
-/**
- * 成本汇总-项目汇总-每月费用(CbProjectSummaryActual)表服务实现类
- *
- * @author
- * @since 2024-02-05
- */
-@Service
-public class CbProjectSummaryActualServiceImpl extends ServiceImpl<CbProjectSummaryActualMapper, CbProjectSummaryActual> implements CbProjectSummaryActualService {
-
-}

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

 package com.dsk.cscec.service.impl;
 
+import cn.hutool.crypto.SecureUtil;
+import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsk.common.excel.ExcelUtils;
+import com.dsk.common.exception.ServiceException;
+import com.dsk.cscec.constant.CbProjectConstants;
+import com.dsk.cscec.domain.CbProjectFile;
 import com.dsk.cscec.domain.CbQuantitySummary;
+import com.dsk.cscec.domain.CbQuantitySummaryActual;
 import com.dsk.cscec.domain.bo.CbProjectBaseBo;
+import com.dsk.cscec.domain.bo.CbQuantitySummaryListBo;
+import com.dsk.cscec.domain.vo.CbQuantitySummaryListVo;
 import com.dsk.cscec.mapper.CbQuantitySummaryMapper;
+import com.dsk.cscec.service.CbProjectFileService;
+import com.dsk.cscec.service.ICbQuantitySummaryActualService;
 import com.dsk.cscec.service.ICbQuantitySummaryService;
+import jodd.bean.BeanException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
+import java.io.FileInputStream;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -19,15 +38,20 @@ import java.util.stream.Collectors;
  * @author lcl
  * @since 2024-02-05 11:06:56
  */
+@Slf4j
 @Service
 public class CbQuantitySummaryServiceImpl extends ServiceImpl<CbQuantitySummaryMapper, CbQuantitySummary> implements ICbQuantitySummaryService {
 
+    @Autowired
+    private ICbQuantitySummaryActualService baseActualService;
+
     @Override
     public Map<String, Object> subjectTree(CbProjectBaseBo bo) {
         Map<String, Object> resultMap = new HashMap<>();
         List<Map<String, Object>> list = baseMapper.selectSubject(bo);
         if (!ObjectUtils.isEmpty(list)) {
-            Map<String, Map<String, Map<String, List<Map<String, Object>>>>> map = list.stream().collect(
+            Map<String, Map<String, Map<String, List<Map<String, Object>>>>> map = list.stream()
+                    .collect(
                             Collectors.groupingBy(item -> item.get("one").toString(),
                                     Collectors.groupingBy(item -> item.get("two").toString(),
                                             Collectors.groupingBy(item -> item.get("three").toString()))));
@@ -41,8 +65,48 @@ public class CbQuantitySummaryServiceImpl extends ServiceImpl<CbQuantitySummaryM
     }
 
     @Override
-    public List<String> monthList(CbProjectBaseBo bo) {
-        return null;
+    public List<String> monthList(CbQuantitySummaryListBo bo) {
+        return baseMapper.selectMonthList(bo);
+    }
+
+    @Override
+    public List<CbQuantitySummaryListVo> subjectList(CbQuantitySummaryListBo bo) {
+        return baseMapper.selectListBySubject(bo);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateActual(List<CbQuantitySummaryActual> list) {
+        if (ObjectUtils.isEmpty(list)) throw new BeanException("数据不能为空");
+        for (CbQuantitySummaryActual actual : list) {
+            if (ObjectUtils.isEmpty(actual.getCbQuantitySummaryId())) throw new BeanException("基础数据id不能为空！");
+            if (ObjectUtils.isEmpty(actual.getQuantities())) throw new BeanException("工程量（本月用料）不能为空！");
+            if (ObjectUtils.isEmpty(actual.getRecordDate())) throw new BeanException("填写月份不能为空！");
+            actual.setId(ObjectUtils.isEmpty(actual.getId()) ? SecureUtil.md5(actual.getCbQuantitySummaryId() + actual.getRecordDate()) : actual.getId());
+            boolean b = baseActualService.saveOrUpdate(actual);
+            if (!b) {
+                log.error("CbQuantitySummaryServiceImpl.updateActual() data insert error! data:" + JSONUtil.toJsonStr(actual));
+                throw new ServiceException("数据添加错误！");
+            }
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void pushData(CbQuantitySummaryActual bo) {
+        //数据记录
+        if (ObjectUtils.isEmpty(bo.getId())) throw new BeanException("id不能为空！");
+        if (ObjectUtils.isEmpty(bo.getPushQuantities())) throw new BeanException("推送工程量不能为空！");
+        if (ObjectUtils.isEmpty(bo.getIpmProjectCode())) throw new BeanException("IPM项目编码不能为空！");
+        if (ObjectUtils.isEmpty(bo.getIpmContractCode())) throw new BeanException("IPM合同编码不能为空！");
+        if (ObjectUtils.isEmpty(bo.getIpmBizCode())) throw new BeanException("IPM作业编码不能为空！");
+        boolean update = baseActualService.updateById(bo);
+        if (!update) {
+            log.error("CbQuantitySummaryServiceImpl.pushData() data update error! data:" + JSONUtil.toJsonStr(bo));
+            throw new ServiceException("数据添加错误！");
+        }
+        //TODO 推送数据
+
     }
 }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbProjectSummaryServiceImpl.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbSummaryActualServiceImpl.java

 package com.dsk.cscec.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsk.cscec.domain.CbProjectSummary;
-import com.dsk.cscec.mapper.CbProjectSummaryMapper;
-import com.dsk.cscec.service.CbProjectSummaryService;
+import com.dsk.cscec.domain.CbSummaryActual;
+import com.dsk.cscec.mapper.CbSummaryActualMapper;
+import com.dsk.cscec.service.CbSummaryActualService;
 import org.springframework.stereotype.Service;
 
 /**
- * 成本汇总-项目汇总(CbProjectSummary)表服务实现类
+ * 成本汇总-每月费用(CbSummaryActual)表服务实现类
  *
- * @author
- * @since 2024-02-05
+ * @author cyf
+ * @since 2024-02-06
  */
 @Service
-public class CbProjectSummaryServiceImpl extends ServiceImpl<CbProjectSummaryMapper, CbProjectSummary> implements CbProjectSummaryService {
+public class CbSummaryActualServiceImpl extends ServiceImpl<CbSummaryActualMapper, CbSummaryActual> implements CbSummaryActualService {
 
 }

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

+package com.dsk.cscec.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsk.common.exception.ServiceException;
+import com.dsk.cscec.constant.CbProjectConstants;
+import com.dsk.cscec.domain.CbProjectFile;
+import com.dsk.cscec.domain.CbSummary;
+import com.dsk.cscec.domain.CbSummaryActual;
+import com.dsk.cscec.domain.bo.CbSummaryActualBo;
+import com.dsk.cscec.domain.bo.CbSummaryActualListBo;
+import com.dsk.cscec.domain.bo.CbSummaryBo;
+import com.dsk.cscec.domain.vo.CbSummaryActualListVo;
+import com.dsk.cscec.mapper.CbProjectFileMapper;
+import com.dsk.cscec.mapper.CbSummaryActualMapper;
+import com.dsk.cscec.mapper.CbSummaryMapper;
+import com.dsk.cscec.service.CbSummaryService;
+import jodd.util.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.*;
+
+/**
+ * 成本汇总(CbSummary)表服务实现类
+ *
+ * @author cyf
+ * @since 2024-02-06
+ */
+@Service
+public class CbSummaryServiceImpl extends ServiceImpl<CbSummaryMapper, CbSummary> implements CbSummaryService {
+    @Autowired
+    private CbProjectFileMapper cbProjectFileMapper;
+
+    @Autowired
+    private CbSummaryActualMapper cbSummaryActualMapper;
+
+    @Override
+    public void importCbProject(Long projectId, Integer cbStage) {
+        //获取文件信息
+        List<CbProjectFile> cbProjectFiles = cbProjectFileMapper.selectList(new LambdaQueryWrapper<CbProjectFile>()
+                .eq(CbProjectFile::getProjectId, projectId)
+                .eq(CbProjectFile::getCbStage, cbStage)
+                .eq(CbProjectFile::getCbType, CbProjectConstants.CB_TYPE_SUMMARY)
+        );
+        //解析数据
+        cbProjectFiles.forEach(cbProjectFile -> {
+            MultipartFile file = null;//todo
+            if (cbProjectFile.getFileName().contains("项目")) {
+
+            } else if (cbProjectFile.getFileName().contains("项目")) {
+
+            } else {
+                //修改文件状态
+                cbProjectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_FAIL);
+                cbProjectFile.setFailRemark("文件名错误！");
+                cbProjectFileMapper.updateById(cbProjectFile);
+            }
+        });
+
+    }
+
+    @Override
+    public List<Map<String, Object>> getCbNameList(CbSummaryBo bo) {
+        List<Map<String, Object>> resultList = new ArrayList<>();
+
+        //项目汇总
+        if (1 == bo.getCbType()) {
+            //获取一级数据
+            bo.setLevel(1);
+            List<Map<String, Object>> cbNames = baseMapper.selectByLevel(bo);
+
+            if (CollectionUtil.isEmpty(cbNames)) {
+                return null;
+            }
+            Map<String, Object> xmhz = new HashMap<>();
+            xmhz.put("id", 0l);
+            xmhz.put("cbName", "成本汇总");
+            resultList.add(xmhz);
+            resultList.addAll(cbNames);
+        }
+        //成本科目汇总
+        if (2 == bo.getCbType()) {
+            bo.setLevel(0);
+            List<Map<String, Object>> cbNameTop = baseMapper.selectByLevel(bo);
+
+            bo.setLevel(1);
+            List<Map<String, Object>> cbNames = baseMapper.selectByLevel(bo);
+            resultList.addAll(cbNameTop);//todo
+            resultList.addAll(cbNames);
+        }
+
+        return resultList;
+    }
+
+    @Override
+    public List<CbSummaryActualListVo> getActualList(CbSummaryActualListBo bo) {
+
+        //项目汇总
+        if (1 == bo.getCbType()) {
+            return getProjectSumList(bo);
+        }
+        //成本科目汇总
+        if (2 == bo.getCbType()) {
+            //todo
+        }
+        return null;
+    }
+
+    /**
+     * 项目汇总列表
+     *
+     * @param bo
+     * @return
+     */
+    private List<CbSummaryActualListVo> getProjectSumList(CbSummaryActualListBo bo) {
+        CbSummary cbSummary = baseMapper.selectById(bo.getId());
+        if (ObjectUtil.isEmpty(cbSummary)) {
+            return null;
+        }
+        if (StringUtil.isBlank(bo.getExpenseDate())) {
+            //默认当前月
+            bo.setExpenseDate(DatePattern.SIMPLE_MONTH_FORMAT.format(new Date()));
+        }
+        List<CbSummaryActualListVo> childrenList = baseMapper.getByParentId(bo.getId(), bo.getExpenseDate());
+        if (0 == cbSummary.getLevel()) {
+            return childrenList;
+        } else {
+            childrenList.forEach(children -> {
+                CbSummaryActualListBo childBo = new CbSummaryActualListBo();
+                childBo.setId(children.getId());
+                childBo.setExpenseDate(bo.getExpenseDate());
+                children.setChildren(getProjectSumList(childBo));
+            });
+
+            return childrenList;
+        }
+
+    }
+
+    @Override
+    public List<String> getExpenseDateList(CbSummaryBo bo) {
+        return baseMapper.getExpenseDateList(bo);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean insertOrUpdateActual(List<CbSummaryActualBo> boList) {
+        if (CollectionUtil.isEmpty(boList)) {
+            return false;
+        }
+        List<CbSummaryActual> actualList = BeanUtil.copyToList(boList, CbSummaryActual.class);
+
+        CbSummaryActual actualUpdate = actualList.get(0);
+        CbSummaryActual actual = cbSummaryActualMapper.selectOne(new LambdaQueryWrapper<CbSummaryActual>()
+                .eq(CbSummaryActual::getCbSummaryId, actualUpdate.getCbSummaryId())
+                .eq(CbSummaryActual::getExpenseDate, actualUpdate.getExpenseDate())
+                .eq(CbSummaryActual::getDelFlag, 0)
+        );
+        if (ObjectUtil.isNotNull(actual) && 1 == actual.getLockStatus()) {
+            throw new ServiceException("当前成本已锁定，不允许编辑！");
+        }
+
+        return cbSummaryActualMapper.insertOrUpdateBatch(actualList) > 0;
+    }
+}

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

+package com.dsk.cscec.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsk.cscec.domain.CbCostMeasure;
+import com.dsk.cscec.domain.CbCostMeasureActual;
+import com.dsk.cscec.mapper.CbCostMeasureActualMapper;
+import com.dsk.cscec.mapper.CbCostMeasureMapper;
+import com.dsk.cscec.service.ICbCostMeasureActualService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author tanyang
+ * @create 2024-02-07 9:38
+ **/
+@Service
+public class ICbCostMeasureActualServiceImpl extends ServiceImpl<CbCostMeasureActualMapper, CbCostMeasureActual> implements ICbCostMeasureActualService {
+
+}

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

@@ -11,7 +11,6 @@ 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.exception.ServiceException;
 import com.dsk.common.utils.StringUtils;
 import com.dsk.cscec.constant.AdvisoryBodyManageQueryConstants;
 import com.dsk.cscec.domain.AdvisoryBody;
@@ -20,7 +19,6 @@ import com.dsk.cscec.domain.DProject;
 import com.dsk.cscec.domain.bo.CooperateProjectDetailSearchBo;
 import com.dsk.cscec.domain.bo.ProjectDetailBo;
 import com.dsk.cscec.domain.bo.ProjectSearchBo;
-import com.dsk.cscec.domain.vo.AdvisoryBodyExistVo;
 import com.dsk.cscec.domain.vo.CooperateProjectDetailSearchVo;
 import com.dsk.cscec.domain.vo.ProjectDetailVo;
 import com.dsk.cscec.domain.vo.ProjectSearchVo;
@@ -248,5 +246,17 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject>
         }
         return projectDetailVo;
     }
+
+    /**
+     * 校验项目编码是否存在
+     *
+     * @param projectCode 项目编码
+     * @return 校验结果
+     */
+    @Override
+    public Boolean checkProjectCodeExist(String projectCode) {
+        return baseMapper.exists(new LambdaQueryWrapper<DProject>()
+                .eq(DProject::getProjectCode, projectCode));
+    }
 }
 

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/CbAccountSummaryMapper.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.CbAccountSummaryMapper">
-
-    <resultMap type="com.dsk.cscec.domain.CbAccountSummary" id="CbAccountSummaryMap">
-        <result property="id" column="id" jdbcType="INTEGER"/>
-        <result property="parentId" column="parent_id" jdbcType="INTEGER"/>
-        <result property="level" column="level" jdbcType="INTEGER"/>
-        <result property="sort" column="sort" jdbcType="INTEGER"/>
-        <result property="projectId" column="project_id" jdbcType="INTEGER"/>
-        <result property="cbStage" column="cb_stage" jdbcType="INTEGER"/>
-        <result property="number" column="number" jdbcType="VARCHAR"/>
-        <result property="cbAccount" column="cb_account" jdbcType="VARCHAR"/>
-        <result property="taxExclusiveTotal" column="tax_exclusive_total" jdbcType="VARCHAR"/>
-        <result property="cbTaxesTotal" column="cb_taxes_total" jdbcType="VARCHAR"/>
-        <result property="taxInclusiveTotal" column="tax_inclusive_total" jdbcType="VARCHAR"/>
-        <result property="cbProportion" column="cb_proportion" jdbcType="VARCHAR"/>
-        <result property="taxInclusivePmTarget" column="tax_inclusive_pm_target" jdbcType="VARCHAR"/>
-        <result property="remark" column="remark" jdbcType="VARCHAR"/>
-        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
-    </resultMap>
-
-    <sql id="baseColumn">
-        id, parent_id, level, sort, project_id, cb_stage, number, cb_account, tax_exclusive_total, cb_taxes_total, tax_inclusive_total, cb_proportion, tax_inclusive_pm_target, remark, create_time
-    </sql>
-</mapper>
-

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/CbCostMeasureActualMapper.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.CbCostMeasureActualMapper">
+  <resultMap id="BaseResultMap" type="com.dsk.cscec.domain.CbCostMeasureActual">
+    <!--@mbg.generated-->
+    <!--@Table cb_cost_measure_actual-->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="plan_measure_id" jdbcType="BIGINT" property="planMeasureId" />
+    <result column="month_cost_rate" jdbcType="DECIMAL" property="monthCostRate" />
+    <result column="cost_effective" jdbcType="DECIMAL" property="costEffective" />
+    <result column="current_project_volume" jdbcType="DECIMAL" property="currentProjectVolume" />
+    <result column="submit_project_volume" jdbcType="DECIMAL" property="submitProjectVolume" />
+    <result column="month" jdbcType="VARCHAR" property="month" />
+    <result column="push_time" jdbcType="TIMESTAMP" property="pushTime" />
+    <result column="push_data_json" jdbcType="LONGVARCHAR" property="pushDataJson" />
+    <result column="del_flag" jdbcType="INTEGER" property="delFlag" />
+    <result column="update_user" jdbcType="VARCHAR" property="updateUser" />
+    <result column="update_id" jdbcType="VARCHAR" property="updateId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, plan_measure_id, month_cost_rate, cost_effective, current_project_volume, submit_project_volume, 
+    `month`, push_time, push_data_json, del_flag, update_user, update_id, create_time, 
+    update_time
+  </sql>
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dsk.cscec.domain.CbCostMeasureActual" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into cb_cost_measure_actual
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="planMeasureId != null">
+        plan_measure_id,
+      </if>
+      <if test="monthCostRate != null">
+        month_cost_rate,
+      </if>
+      <if test="costEffective != null">
+        cost_effective,
+      </if>
+      <if test="currentProjectVolume != null">
+        current_project_volume,
+      </if>
+      <if test="submitProjectVolume != null">
+        submit_project_volume,
+      </if>
+      <if test="month != null">
+        `month`,
+      </if>
+      <if test="pushTime != null">
+        push_time,
+      </if>
+      <if test="pushDataJson != null">
+        push_data_json,
+      </if>
+      <if test="delFlag != null">
+        del_flag,
+      </if>
+      <if test="updateUser != null">
+        update_user,
+      </if>
+      <if test="updateId != null">
+        update_id,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="planMeasureId != null">
+        #{planMeasureId,jdbcType=BIGINT},
+      </if>
+      <if test="monthCostRate != null">
+        #{monthCostRate,jdbcType=DECIMAL},
+      </if>
+      <if test="costEffective != null">
+        #{costEffective,jdbcType=DECIMAL},
+      </if>
+      <if test="currentProjectVolume != null">
+        #{currentProjectVolume,jdbcType=DECIMAL},
+      </if>
+      <if test="submitProjectVolume != null">
+        #{submitProjectVolume,jdbcType=DECIMAL},
+      </if>
+      <if test="month != null">
+        #{month,jdbcType=VARCHAR},
+      </if>
+      <if test="pushTime != null">
+        #{pushTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="pushDataJson != null">
+        #{pushDataJson,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="delFlag != null">
+        #{delFlag,jdbcType=INTEGER},
+      </if>
+      <if test="updateUser != null">
+        #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateId != null">
+        #{updateId,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.dsk.cscec.domain.CbCostMeasureActual">
+    <!--@mbg.generated-->
+    update cb_cost_measure_actual
+    <set>
+      <if test="planMeasureId != null">
+        plan_measure_id = #{planMeasureId,jdbcType=BIGINT},
+      </if>
+      <if test="monthCostRate != null">
+        month_cost_rate = #{monthCostRate,jdbcType=DECIMAL},
+      </if>
+      <if test="costEffective != null">
+        cost_effective = #{costEffective,jdbcType=DECIMAL},
+      </if>
+      <if test="currentProjectVolume != null">
+        current_project_volume = #{currentProjectVolume,jdbcType=DECIMAL},
+      </if>
+      <if test="submitProjectVolume != null">
+        submit_project_volume = #{submitProjectVolume,jdbcType=DECIMAL},
+      </if>
+      <if test="month != null">
+        `month` = #{month,jdbcType=VARCHAR},
+      </if>
+      <if test="pushTime != null">
+        push_time = #{pushTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="pushDataJson != null">
+        push_data_json = #{pushDataJson,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="delFlag != null">
+        del_flag = #{delFlag,jdbcType=INTEGER},
+      </if>
+      <if test="updateUser != null">
+        update_user = #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateId != null">
+        update_id = #{updateId,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+
+  <select id="selectDataList" resultType="com.dsk.cscec.domain.vo.CbCostMeasureActualVo">
+    SELECT t1.plan_measure_id,
+           t1.month_cost_rate,
+           t1.cost_effective,
+           t1.month_cost_rate,
+           t1.current_project_volume,
+           t1.submit_project_volume,
+           t1.`month`,
+           t1.push_time
+    FROM cb_cost_measure t
+    inner JOIN cb_cost_measure_actual t1 ON t1.plan_measure_id=t.id
+    WHERE
+      t.project_id=#{projectId}
+      AND t.cb_stage=#{cbStage}
+      AND t1.`month`=#{month}
+  </select>
+</mapper>
\ No newline at end of file

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/CbCostMeasureMapper.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.CbCostMeasureMapper">
+  <resultMap id="BaseResultMap" type="com.dsk.cscec.domain.CbCostMeasure">
+    <!--@mbg.generated-->
+    <!--@Table cb_cost_measure-->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="project_id" jdbcType="BIGINT" property="projectId" />
+    <result column="cb_stage" jdbcType="INTEGER" property="cbStage" />
+    <result column="parent_id" jdbcType="BIGINT" property="parentId" />
+    <result column="level" jdbcType="INTEGER" property="level" />
+    <result column="number" jdbcType="VARCHAR" property="number" />
+    <result column="no" jdbcType="VARCHAR" property="no" />
+    <result column="item_content" jdbcType="VARCHAR" property="itemContent" />
+    <result column="work_content" jdbcType="VARCHAR" property="workContent" />
+    <result column="unit" jdbcType="VARCHAR" property="unit" />
+    <result column="quantity" jdbcType="DECIMAL" property="quantity" />
+    <result column="unit_price_excluding_tax" jdbcType="VARCHAR" property="unitPriceExcludingTax" />
+    <result column="usage_time" jdbcType="VARCHAR" property="usageTime" />
+    <result column="amount_excluding_tax" jdbcType="VARCHAR" property="amountExcludingTax" />
+    <result column="tax_rate" jdbcType="VARCHAR" property="taxRate" />
+    <result column="amount_including_tax" jdbcType="VARCHAR" property="amountIncludingTax" />
+    <result column="amortization_ratio" jdbcType="VARCHAR" property="amortizationRatio" />
+    <result column="amount_exclude_tax_amortized" jdbcType="VARCHAR" property="amountExcludeTaxAmortized" />
+    <result column="amount_include_tax_amortized" jdbcType="VARCHAR" property="amountIncludeTaxAmortized" />
+    <result column="tax_amount" jdbcType="VARCHAR" property="taxAmount" />
+    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
+    <result column="cost_subject" jdbcType="VARCHAR" property="costSubject" />
+    <result column="tax_type" jdbcType="VARCHAR" property="taxType" />
+    <result column="data_source" jdbcType="INTEGER" property="dataSource" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, project_id, cb_stage, parent_id, `level`, `number`, `no`,item_content, work_content,
+    unit, quantity, unit_price_excluding_tax, usage_time, amount_excluding_tax, tax_rate, 
+    amount_including_tax, amortization_ratio, amount_exclude_tax_amortized, amount_include_tax_amortized, 
+    tax_amount, remarks, cost_subject, tax_type, create_time, update_time
+  </sql>
+
+
+  <select id="selectListByProjectAndNo" resultType="com.dsk.cscec.domain.vo.CbCostMeasureActualVo">
+    SELECT t.*,t1.plan_measure_id,t1.month_cost_rate, t1.cost_effective,  t1.current_project_volume,t1.submit_project_volume,t1.`month`,t1.push_time FROM cb_cost_measure t
+    left JOIN (
+        SELECT t1.plan_measure_id,t1.month_cost_rate, t1.cost_effective, t1.current_project_volume,t1.submit_project_volume,t1.`month`,t1.push_time FROM cb_cost_measure t
+        inner JOIN cb_cost_measure_actual t1 ON t1.plan_measure_id=t.id
+        WHERE
+            t.project_id=#{projectId}
+        AND t.cb_stage=#{cbStage}
+        AND t1.`month`=#{month}) t1 ON t1.plan_measure_id=t.id
+    WHERE
+      t.project_id=#{projectId}
+      AND t.cb_stage=#{cbStage}
+      AND t.`level`!=0
+      AND t.`no` like concat(#{id},'.%')
+    ORDER BY id ASC
+  </select>
+</mapper>
\ No newline at end of file

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/CbProjectExpenseSummaryMapper.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.CbProjectExpenseSummaryMapper">
+  <resultMap id="BaseResultMap" type="com.dsk.cscec.domain.CbProjectExpenseSummary">
+    <!--@mbg.generated-->
+    <!--@Table cb_project_expense_summary-->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="project_id" jdbcType="BIGINT" property="projectId" />
+    <result column="cb_stage" jdbcType="INTEGER" property="cbStage" />
+    <result column="number" jdbcType="VARCHAR" property="number" />
+    <result column="data_type" jdbcType="INTEGER" property="dataType" />
+    <result column="expense_name" jdbcType="VARCHAR" property="expenseName" />
+    <result column="expense_value" jdbcType="VARCHAR" property="expenseValue" />
+    <result column="proportion" jdbcType="VARCHAR" property="proportion" />
+    <result column="del_flag" jdbcType="INTEGER" property="delFlag" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, project_id, cb_stage, `number`, data_type, expense_name, expense_value, proportion, 
+    del_flag, create_by, create_time
+  </sql>
+</mapper>
\ No newline at end of file

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="getDraftDialogList" resultType="com.dsk.cscec.domain.vo.DraftDialogListVo">
+        SELECT cpf.project_id,
+               cpr.project_name,
+               cpf.cb_stage,
+               max(cpf.update_time) as update_time
+        FROM cb_project_file cpf
+                 left join cb_project_record cpr
+                           on cpf.project_id = cpr.id
+        WHERE (file_parse_status = #{projectFileStatusWaitParse} AND cpf.del_flag = #{deleteFlagExist})
+        group by cpf.project_id, cpf.cb_stage
+    </select>
 </mapper>
 

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/CbProjectSummaryActualMapper.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.CbProjectSummaryActualMapper">
-
-    <resultMap type="com.dsk.cscec.domain.CbProjectSummaryActual" id="CbProjectSummaryActualMap">
-        <result property="id" column="id" jdbcType="INTEGER"/>
-        <result property="cbProjectSummaryId" column="cb_project_summary_id" jdbcType="INTEGER"/>
-        <result property="taxInclusiveExpense" column="tax_inclusive_expense" jdbcType="NUMERIC"/>
-        <result property="taxExclusiveExpense" column="tax_exclusive_expense" jdbcType="NUMERIC"/>
-        <result property="expenseDate" column="expense_date" jdbcType="VARCHAR"/>
-        <result property="lockStatus" column="lock_status" jdbcType="INTEGER"/>
-    </resultMap>
-
-    <sql id="baseColumn">
-        id, cb_project_summary_id, tax_inclusive_expense, tax_exclusive_expense, expense_date, lock_status
-    </sql>
-
-</mapper>
-

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

@@ -8,7 +8,7 @@
         from cb_subject cs1
         join cb_subject cs2 on (cs2.cb_subject_no like concat(cs1.cb_subject_no,'%') and cs2.`level` = 2 )
         join cb_subject cs3 on (cs3.cb_subject_no like concat(cs2.cb_subject_no,'%') and cs3.`level` = 3 )
-        join cb_quantity_summary cqs on (cqs.cb_subject_name = cs3.cb_subject_name and cqs.project_id = #{projectId} and cqs.cb_stage = #{cbStage})
+        join cb_quantity_summary cqs on (cqs.cb_subject_name = cs3.cb_subject_name and cqs.del_falg = 0 and cqs.project_id = #{projectId} and cqs.cb_stage = #{cbStage} )
         where cs1.`level` = 1
         group by cs1.cb_subject_name,cs2.cb_subject_name,cs3.cb_subject_name
     </select>
@@ -18,7 +18,35 @@
             count(cqs.id)
         from cb_quantity_summary cqs
         left join cb_subject cs1 on cqs.cb_subject_name = cs1.cb_subject_name
-        where cqs.project_id = #{projectId} and cqs.cb_stage = #{cbStage} and cs1.id is null
+        where cqs.del_falg = 0 and cqs.project_id = #{projectId} and cqs.cb_stage = #{cbStage} and cs1.id is null
+    </select>
+
+    <select id="selectMonthList" resultType="java.lang.String">
+        select
+            cqsa.record_date
+        from cb_quantity_summary cqs
+        join cb_quantity_summary_actual cqsa on cqs.id = cqsa.cb_quantity_summary_id
+        where cqs.del_falg = 0 and cqs.project_id = #{projectId} and cqs.cb_stage = #{cbStage} and cqs.cb_subject_name = #{cbSubjectName}
+        group by cqsa.record_date
+        order by cqsa.record_date
+    </select>
+
+    <select id="selectListBySubject"  resultType="com.dsk.cscec.domain.vo.CbQuantitySummaryListVo">
+        select a.*, ifnull(sum(a.quantities),0) totalQuantities from (
+            select
+                cqs.id, cqs.cb_subject_name, cqs.company_no, cqs.org_no, cqs.cb_name, cqs.job_content, cqs.calculation_rule,
+                cqs.unit, cqs.material_description, cqs.guide_price, cqs.bid_unit_price, cqs.unit_price_difference, cqs.quantity,
+                cqs.combined_price, cqs.combined_price_tax, cqs.brand_name, cqs.bid_source, cqs.remark, cqs.`number`, cqsa.quantities,
+                cqsa.quantities_unit, cqsa.conversion_quantities, cqsa.conversion_unit, cqsa.purchase_unit_price, cqsa.create_time,
+                cqsa.id actualId, cqsa.ipm_project_code, cqsa.ipm_contract_code, cqsa.ipm_job_code, cqsa.push_quantities
+            from cb_quantity_summary cqs
+            left join cb_quantity_summary_actual cqsa on cqs.id = cqsa.cb_quantity_summary_id
+            where cqs.del_falg = 0 and cqs.project_id = #{projectId} and cqs.cb_stage = #{cbStage} and cqs.cb_subject_name = #{cbSubjectName}
+            <if test="recordDate != null and recordDate != ''"> and cqsa.record_date &lt;= #{recordDate} </if>
+            order by cqsa.record_date desc
+        ) a
+        group by a.id
+        order by a.`number` asc
     </select>
 
 </mapper>
\ No newline at end of file

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/CbAccountSummaryActualMapper.xml → dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/CbSummaryActualMapper.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.CbAccountSummaryActualMapper">
+<mapper namespace="com.dsk.cscec.mapper.CbSummaryActualMapper">
 
-    <resultMap type="com.dsk.cscec.domain.CbAccountSummaryActual" id="CbAccountSummaryActualMap">
+    <resultMap type="com.dsk.cscec.domain.CbSummaryActual" id="CbSummaryActualMap">
         <result property="id" column="id" jdbcType="INTEGER"/>
-        <result property="cbAccountSummaryId" column="cb_account_summary_id" jdbcType="INTEGER"/>
+        <result property="cbSummaryId" column="cb_summary_id" jdbcType="INTEGER"/>
         <result property="taxInclusiveExpense" column="tax_inclusive_expense" jdbcType="NUMERIC"/>
         <result property="taxExclusiveExpense" column="tax_exclusive_expense" jdbcType="NUMERIC"/>
         <result property="expenseDate" column="expense_date" jdbcType="VARCHAR"/>
         <result property="lockStatus" column="lock_status" jdbcType="INTEGER"/>
+        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="delFlag" column="del_flag" jdbcType="INTEGER"/>
     </resultMap>
 
     <sql id="baseColumn">
-        id, cb_account_summary_id, tax_inclusive_expense, tax_exclusive_expense, expense_date, lock_status
+        id, cb_summary_id, tax_inclusive_expense, tax_exclusive_expense, expense_date, lock_status, create_time, del_flag
     </sql>
 
+    <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
+        insert into cb_summary_actual(cb_summary_id, tax_inclusive_expense, tax_exclusive_expense,expense_date)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.cbSummaryId}, #{entity.taxInclusiveExpense}, #{entity.taxExclusiveExpense}, #{entity.expenseDate})
+        </foreach>
+        on duplicate key update
+        cb_summary_id = values(cb_summary_id) , tax_inclusive_expense = values(tax_inclusive_expense) ,
+        tax_exclusive_expense = values(tax_exclusive_expense) , expense_date = values(expense_date)
+    </insert>
 </mapper>
 

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/CbProjectSummaryMapper.xml → dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/CbSummaryMapper.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.CbProjectSummaryMapper">
+<mapper namespace="com.dsk.cscec.mapper.CbSummaryMapper">
 
-    <resultMap type="com.dsk.cscec.domain.CbProjectSummary" id="CbProjectSummaryMap">
+    <resultMap type="com.dsk.cscec.domain.CbSummary" id="CbSummaryMap">
         <result property="id" column="id" jdbcType="INTEGER"/>
         <result property="parentId" column="parent_id" jdbcType="INTEGER"/>
         <result property="level" column="level" jdbcType="INTEGER"/>
         <result property="sort" column="sort" jdbcType="INTEGER"/>
         <result property="projectId" column="project_id" jdbcType="INTEGER"/>
         <result property="cbStage" column="cb_stage" jdbcType="INTEGER"/>
+        <result property="cbProjectFileId" column="cb_project_file_id" jdbcType="INTEGER"/>
         <result property="number" column="number" jdbcType="VARCHAR"/>
-        <result property="name" column="name" jdbcType="VARCHAR"/>
+        <result property="cbName" column="cb_name" jdbcType="VARCHAR"/>
         <result property="taxExclusiveTotal" column="tax_exclusive_total" jdbcType="VARCHAR"/>
         <result property="cbTaxesTotal" column="cb_taxes_total" jdbcType="VARCHAR"/>
         <result property="taxInclusiveTotal" column="tax_inclusive_total" jdbcType="VARCHAR"/>
@@ -18,11 +19,52 @@
         <result property="taxInclusivePmTarget" column="tax_inclusive_pm_target" jdbcType="VARCHAR"/>
         <result property="remark" column="remark" jdbcType="VARCHAR"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="delFlag" column="del_flag" jdbcType="INTEGER"/>
+        <result property="cbType" column="cb_type" jdbcType="INTEGER"/>
     </resultMap>
 
     <sql id="baseColumn">
-        id, parent_id, level, sort, project_id, cb_stage, number, name, tax_exclusive_total, cb_taxes_total, tax_inclusive_total, cb_proportion, tax_inclusive_pm_target, remark, create_time
+        id, parent_id, level, sort, project_id, cb_stage, cb_project_file_id, number, cb_name, tax_exclusive_total,
+        cb_taxes_total, tax_inclusive_total, cb_proportion, tax_inclusive_pm_target, remark, create_time, del_flag,
+        cb_type
     </sql>
 
+    <select id="getByParentId" resultType="com.dsk.cscec.domain.vo.CbSummaryActualListVo">
+        select csu.*,csa.id actualId,csa.tax_inclusive_expense,csa.tax_exclusive_expense,csa.expense_date,csa.lock_status
+        from cb_summary csu
+        left join cb_summary_actual csa on csu.id = csa.cb_summary_id and csa.expense_date = #{expenseDate} AND csa.del_flag = 0
+        <where>
+            csu.parent_id = #{parentId}
+            and csu.del_flag = 0
+        </where>
+        order by csu.sort
+    </select>
+
+    <select id="getExpenseDateList" resultType="string">
+        select csa.expense_date
+        from cb_summary_actual csa
+        left join cb_summary csu on csu.id = csa.cb_summary_id
+        where
+          csu.project_id = #{bo.projectId}
+          and csu.cb_stage = #{bo.cbStage}
+          and csu.cb_type = #{bo.cbType}
+          and csu.del_flag = 0
+          and csa.del_flag = 0
+        group by csa.expense_date
+        order by csa.expense_date asc
+    </select>
+
+    <select id="selectByLevel" resultType="map">
+        select csu.id,csu.cb_name as cbName
+        from cb_summary csu
+        where
+            csu.del_flag = 0
+            and csu.project_id = #{bo.projectId}
+            and csu.cb_stage = #{bo.cbStage}
+            and csu.cb_type = #{bo.cbType}
+            and csu.level = #{bo.level}
+        order by csu.sort
+    </select>
+
 </mapper>
 

dsk-operate-ui/src/api/projectCostLedger/index.js

+import request from '@/utils/request'
+
+//校验项目编码是否存在
+export function checkProjectCodeExist (data) {
+  return request({
+    url: '/cbProjectRecord/checkProjectCodeExist/'+data,
+    method: 'get',
+  })
+}