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,6 +186,21 @@ tenant:
     - d_customer_tax_certificate
     - f_supplier_limited
     - f_ads_bsi_kpi_proj_two
+    - cb_account_summary
+    - cb_account_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
+    - cb_scene_expense_month
+    - cb_subject
 
 # MyBatisPlus配置
 # https://baomidou.com/config/

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

+package com.dsk.cscec.controller;
+
+import com.dsk.cscec.service.CbProjectRecordService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 项目台账表(CbProjectRecord)表控制层
+ *
+ * @author sxk
+ * @since 2024-02-05 11:37:49
+ */
+@RestController
+@RequestMapping("cbProjectRecord")
+public class CbProjectRecordController {
+    /**
+     * 服务对象
+     */
+    @Resource
+    private CbProjectRecordService baseService;
+
+}
+

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

+package com.dsk.cscec.controller;
+
+
+import com.dsk.common.core.controller.BaseController;
+import com.dsk.cscec.service.ICbQuantitySummaryService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * 成本-工料汇总基本表(CbQuantitySummary)表控制层
+ *
+ * @author lcl
+ * @since 2024-02-05 11:06:56
+ */
+@RestController
+@RequestMapping("/cb/quantity/summary")
+public class CbQuantitySummaryController extends BaseController {
+    /**
+     * 服务对象
+     */
+    @Resource
+    private ICbQuantitySummaryService baseService;
+
+  
+}
+

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

+package com.dsk.cscec.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.dsk.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * 项目台账表(CbProjectRecord)实体类
+ *
+ * @author sxk
+ * @since 2024-02-05 11:37:52
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class CbProjectRecord extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 380419400445207916L;
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 成本阶段(0:标前成本、1:标后成本、2:转固成本)
+     */
+    private Integer cbStage;
+    /**
+     * 项目名称
+     */
+    private String projectName;
+    /**
+     * 项目文件状态(0:待解析、1:解析中、2:解析成功、3:解析失败)
+     */
+    private Integer projectFileStatus;
+    /**
+     * IPM项目编码
+     */
+    private String ipmProjectNo;
+    /**
+     * 文件名称
+     */
+    private String projectFileName;
+    /**
+     * 删除状态(0:否、2:是)
+     */
+    private Integer delFlag;
+    /**
+     * 创建者
+     */
+    private String createBy;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 更新者
+     */
+    private String updateBy;
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+}

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

+package com.dsk.cscec.domain;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+
+import lombok.Data;
+
+/**
+ * 成本-工料汇总基本表(CbQuantitySummary)表实体类
+ *
+ * @author lcl
+ * @since 2024-02-05 11:06:56
+ */
+@Data
+@TableName("cb_quantity_summary")
+public class CbQuantitySummary implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 项目id
+     */
+    private Long projectId;
+    /**
+     * 序号
+     */
+    private String number;
+    /**
+     * 成本阶段(0：标前成本 1：标后成本 2：转固成本)
+     */
+    private Integer cbStage;
+    /**
+     * 成本科目名称（合约规划）
+     */
+    private String cbSubjectName;
+    /**
+     * 成本科目编号（合约规划编号）
+     */
+    private String cbSubjectNo;
+    /**
+     * 公司编码
+     */
+    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 Date createTime;
+
+}
+

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

+package com.dsk.cscec.domain;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+
+import lombok.Data;
+
+/**
+ * 成本-工料汇总月记录(CbQuantitySummaryActual)表实体类
+ *
+ * @author lcl
+ * @since 2024-02-05 11:12:47
+ */
+@Data
+@TableName("cb_quantity_summary_actual")
+public class CbQuantitySummaryActual implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 成本汇总基本数据id
+     */
+    private Long cbQuantitySummaryId;
+    /**
+     * 工程量（本月用料）
+     */
+    private Double quantities;
+    /**
+     * 单位
+     */
+    private String unit;
+    /**
+     * 换算后本月用料
+     */
+    private Double conversionQuantities;
+    /**
+     * 换算单位
+     */
+    private String conversionUnit;
+    /**
+     * 采购单价
+     */
+    private Double purchaseUnitPrice;
+    private Date createTime;
+    /**
+     * 推送时间
+     */
+    private Date pushTime;
+    /**
+     * 记录所属年月
+     */
+    private String recordDate;
+    /**
+     * 推送数据json
+     */
+    private String pushDataJson;
+
+}
+

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

+package com.dsk.cscec.domain;
+
+import java.util.Date;
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 成本科目(CostSubject)表实体类
+ *
+ * @author lcl
+ * @since 2024-02-05 09:29:46
+ */
+@Data
+@TableName("cb_subject")
+public class CbSubject implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 层级
+     */
+    private Integer level;
+    /**
+     * 成本科目名称（合约规划）
+     */
+    private String cbSubjectName;
+    /**
+     * 成本科目编号（合约规划编号）
+     */
+    private String cbSubjectNo;
+    /**
+     * 分判模式
+     */
+    private String subjudgmentMode;
+    /**
+     * 税金类型
+     */
+    private String taxType;
+    /**
+     * 状态 0：有效 1：无效
+     */
+    private Integer status;
+    /**
+     * 类型 0: 未归类 1：房建
+     */
+    private Integer type;
+    private Date createTime;
+}
+

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

+package com.dsk.cscec.listener;
+
+import cn.dev33.satoken.secure.BCrypt;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+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.ValidatorUtils;
+import com.dsk.common.utils.spring.SpringUtils;
+import com.dsk.cscec.domain.vo.ProjectMeasuresImportVo;
+import com.dsk.system.domain.SysUser;
+import com.dsk.system.domain.vo.SysUserImportVo;
+import com.dsk.system.service.ISysConfigService;
+import com.dsk.system.service.ISysUserService;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
+
+/**
+ * 系统用户自定义导入
+ *
+ * @author Lion Li
+ */
+@Slf4j
+public class ProjectCostMeasureImportListener extends AnalysisEventListener<ProjectMeasuresImportVo> implements ExcelListener<ProjectMeasuresImportVo> {
+
+//    private final ISysUserService userService;
+
+//    private final String password;
+
+    private final Boolean isUpdateSupport;
+
+    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 ProjectCostMeasureImportListener(Boolean isUpdateSupport) {
+//        String initPassword = SpringUtils.getBean(ISysConfigService.class).selectConfigByKey("sys.user.initPassword");
+//        this.userService = SpringUtils.getBean(ISysUserService.class);
+//        this.password = BCrypt.hashpw(initPassword);
+        this.isUpdateSupport = isUpdateSupport;
+        this.operName = LoginHelper.getUsername();
+    }
+
+    @Override
+    public void invoke(ProjectMeasuresImportVo userVo, AnalysisContext context) {
+//        SysUser user = this.userService.selectUserByUserName(userVo.getUserName());
+//        try {
+//            // 验证是否存在这个用户
+//            if (ObjectUtil.isNull(user)) {
+//                user = BeanUtil.toBean(userVo, SysUser.class);
+//                ValidatorUtils.validate(user);
+//                user.setPassword(password);
+//                user.setCreateBy(operName);
+//                userService.insertUser(user);
+//                successNum++;
+//                successMsg.append("<br/>").append(successNum).append("、账号 ").append(user.getUserName()).append(" 导入成功");
+//            } else if (isUpdateSupport) {
+//                Long userId = user.getUserId();
+//                user = BeanUtil.toBean(userVo, SysUser.class);
+//                user.setUserId(userId);
+//                ValidatorUtils.validate(user);
+//                userService.checkUserAllowed(user);
+//                userService.checkUserDataScope(user.getUserId());
+//                user.setUpdateBy(operName);
+//                userService.updateUser(user);
+//                successNum++;
+//                successMsg.append("<br/>").append(successNum).append("、账号 ").append(user.getUserName()).append(" 更新成功");
+//            } else {
+//                failureNum++;
+//                failureMsg.append("<br/>").append(failureNum).append("、账号 ").append(user.getUserName()).append(" 已存在");
+//            }
+//        } catch (Exception e) {
+//            failureNum++;
+//            String msg = "<br/>" + failureNum + "、账号 " + user.getUserName() + " 导入失败：";
+//            failureMsg.append(msg).append(e.getMessage());
+//            log.error(msg, e);
+//        }
+    }
+
+    @Override
+    public void doAfterAllAnalysed(AnalysisContext context) {
+
+    }
+
+    @Override
+    public ExcelResult<ProjectMeasuresImportVo> getExcelResult() {
+        return new ExcelResult<ProjectMeasuresImportVo>() {
+
+            @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<ProjectMeasuresImportVo> getList() {
+                return null;
+            }
+
+            @Override
+            public List<String> getErrorList() {
+                return null;
+            }
+        };
+    }
+}

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

+package com.dsk.cscec.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsk.cscec.domain.CbProjectRecord;
+
+/**
+ * 项目台账表(CbProjectRecord)表数据库访问层
+ *
+ * @author sxk
+ * @since 2024-02-05 11:37:49
+ */
+public interface CbProjectRecordMapper extends BaseMapper<CbProjectRecord> {
+
+}
+

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

+package com.dsk.cscec.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsk.cscec.domain.CbQuantitySummaryActual;
+
+/**
+ * 成本-工料汇总月记录(CbQuantitySummaryActual)表数据库访问层
+ *
+ * @author lcl
+ * @since 2024-02-05 11:12:47
+ */
+public interface CbQuantitySummaryActualMapper extends BaseMapper<CbQuantitySummaryActual> {
+
+}
+

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.cscec.domain.CbQuantitySummary;
+
+/**
+ * 成本-工料汇总基本表(CbQuantitySummary)表数据库访问层
+ *
+ * @author lcl
+ * @since 2024-02-05 11:06:56
+ */
+public interface CbQuantitySummaryMapper extends BaseMapper<CbQuantitySummary> {
+
+}
+

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

+package com.dsk.cscec.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsk.cscec.domain.CbSubject;
+
+/**
+ * 成本科目(CostSubject)表数据库访问层
+ *
+ * @author lcl
+ * @since 2024-02-05 09:29:47
+ */
+public interface CbSubjectMapper extends BaseMapper<CbSubject> {
+
+}
+

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

+package com.dsk.cscec.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsk.cscec.domain.CbProjectRecord;
+
+/**
+ * 项目台账表(CbProjectRecord)表服务接口
+ *
+ * @author sxk
+ * @since 2024-02-05 11:37:53
+ */
+public interface CbProjectRecordService extends IService<CbProjectRecord> {
+
+
+}

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

+package com.dsk.cscec.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsk.cscec.domain.CbQuantitySummaryActual;
+
+/**
+ * 成本-工料汇总月记录(CbQuantitySummaryActual)表服务接口
+ *
+ * @author lcl
+ * @since 2024-02-05 11:12:47
+ */
+public interface ICbQuantitySummaryActualService extends IService<CbQuantitySummaryActual> {
+
+}
+

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

+package com.dsk.cscec.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsk.cscec.domain.CbQuantitySummary;
+
+/**
+ * 成本-工料汇总基本表(CbQuantitySummary)表服务接口
+ *
+ * @author lcl
+ * @since 2024-02-05 11:06:56
+ */
+public interface ICbQuantitySummaryService extends IService<CbQuantitySummary> {
+
+}
+

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

+package com.dsk.cscec.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsk.cscec.domain.CbProjectRecord;
+import com.dsk.cscec.mapper.CbProjectRecordMapper;
+import com.dsk.cscec.service.CbProjectRecordService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * 项目台账表(CbProjectRecord)表服务实现类
+ *
+ * @author sxk
+ * @since 2024-02-05 11:37:53
+ */
+@Service("cbProjectRecordService")
+public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMapper, CbProjectRecord> implements CbProjectRecordService {
+    @Resource
+    private CbProjectRecordMapper baseMapper;
+
+}

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

+package com.dsk.cscec.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsk.cscec.mapper.CbQuantitySummaryActualMapper;
+import com.dsk.cscec.domain.CbQuantitySummaryActual;
+import com.dsk.cscec.service.ICbQuantitySummaryActualService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 成本-工料汇总月记录(CbQuantitySummaryActual)表服务实现类
+ *
+ * @author lcl
+ * @since 2024-02-05 11:12:47
+ */
+@Service
+public class CbQuantitySummaryActualServiceImpl extends ServiceImpl<CbQuantitySummaryActualMapper, CbQuantitySummaryActual> implements ICbQuantitySummaryActualService {
+
+}
+

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

+package com.dsk.cscec.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsk.cscec.mapper.CbQuantitySummaryMapper;
+import com.dsk.cscec.domain.CbQuantitySummary;
+import com.dsk.cscec.service.ICbQuantitySummaryService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 成本-工料汇总基本表(CbQuantitySummary)表服务实现类
+ *
+ * @author lcl
+ * @since 2024-02-05 11:06:56
+ */
+@Service
+public class CbQuantitySummaryServiceImpl extends ServiceImpl<CbQuantitySummaryMapper, CbQuantitySummary> implements ICbQuantitySummaryService {
+
+}
+

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/CbProjectRecordMapper.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.CbProjectRecordMapper">
+
+</mapper>
\ No newline at end of file