Merge remote-tracking branch 'origin/V20231129-中建一局二公司' into V20231129-中建一局二公司

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/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/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/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/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 {
+
+}
+