成本汇总相关

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/CbProjectSummaryController.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/CbSummaryController.java

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

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

-package com.dsk.cscec.domain;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 成本汇总-成本科目汇总(CbAccountSummary)实体类
- *
- * @author
- * @since 2024-02-05
- */
-@Data
-public class CbAccountSummary implements Serializable {
-    private static final long serialVersionUID = 292585790421593142L;
-    /**
-     * 主键id
-     */
-    private Integer id;
-    /**
-     * 父级id
-     */
-    private Integer parentId;
-    /**
-     * 层级
-     */
-    private Integer level;
-    /**
-     * 排序
-     */
-    private Integer sort;
-    /**
-     * 项目id
-     */
-    private Integer projectId;
-    /**
-     * 成本阶段( 0:标前成本、1:标后成本、2:转固成本)
-     */
-    private Integer cbStage;
-    /**
-     * 序号
-     */
-    private String number;
-    /**
-     * 成本科目
-     */
-    private String cbAccount;
-    /**
-     * 不含税成本合价
-     */
-    private String taxExclusiveTotal;
-    /**
-     * 成本税金合价
-     */
-    private String cbTaxesTotal;
-    /**
-     * 含税成本合价
-     */
-    private String taxInclusiveTotal;
-    /**
-     * 成本占比
-     */
-    private String cbProportion;
-    /**
-     * 含税成本平米指标
-     */
-    private String taxInclusivePmTarget;
-    /**
-     * 备注
-     */
-    private String remark;
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-}

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

-package com.dsk.cscec.domain;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 成本汇总-成本科目汇总-每月费用(CbAccountSummaryActual)实体类
- *
- * @author
- * @since 2024-02-05
- */
-@Data
-public class CbAccountSummaryActual implements Serializable {
-    private static final long serialVersionUID = 847656665993804445L;
-    /**
-     * 主键id
-     */
-    private Integer id;
-    /**
-     * 成本科目汇总id
-     */
-    private Integer cbAccountSummaryId;
-    /**
-     * 本月费用（含税）
-     */
-    private Double taxInclusiveExpense;
-    /**
-     * 本月费用（不含税）
-     */
-    private Double taxExclusiveExpense;
-    /**
-     * 费用日期
-     */
-    private String expenseDate;
-    /**
-     * 是否锁定
-     */
-    private Integer lockStatus;
-
-}

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.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;
     /**
      * 本月费用（含税）
      */
@@ -34,8 +37,16 @@ public class CbProjectSummaryActual implements Serializable {
      */
     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/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/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 → 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.CbProjectSummary;
+import com.dsk.cscec.domain.CbSummaryActual;
 
 /**
- * 成本汇总-项目汇总(CbProjectSummary)表数据库访问层
+ * 成本汇总-每月费用(CbSummaryActual)表数据库访问层
  *
- * @author
- * @since 2024-02-05
+ * @author cyf
+ * @since 2024-02-06
  */
-public interface CbProjectSummaryMapper extends BaseMapper<CbProjectSummary> {
+public interface CbSummaryActualMapper extends BaseMapper<CbSummaryActual> {
 
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/CbAccountSummaryMapper.java → 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.CbAccountSummary;
+import com.dsk.cscec.domain.CbSummary;
 
 /**
- * 成本汇总-成本科目汇总(CbAccountSummary)表数据库访问层
+ * 成本汇总(CbSummary)表数据库访问层
  *
- * @author
- * @since 2024-02-05
+ * @author cyf
+ * @since 2024-02-06
  */
-public interface CbAccountSummaryMapper extends BaseMapper<CbAccountSummary> {
+public interface CbSummaryMapper extends BaseMapper<CbSummary> {
 
 }

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/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/CbAccountSummaryService.java → 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.CbAccountSummary;
+import com.dsk.cscec.domain.CbSummary;
+
 
 /**
- * 成本汇总-成本科目汇总(CbAccountSummary)表服务接口
+ * 成本汇总(CbSummary)表服务接口
  *
- * @author
- * @since 2024-02-05
+ * @author cyf
+ * @since 2024-02-06
  */
-public interface CbAccountSummaryService extends IService<CbAccountSummary> {
+public interface CbSummaryService extends IService<CbSummary> {
 
 }

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/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/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/CbAccountSummaryServiceImpl.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbSummaryServiceImpl.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 com.dsk.cscec.mapper.CbSummaryMapper;
+import com.dsk.cscec.domain.CbSummary;
+import com.dsk.cscec.service.CbSummaryService;
 import org.springframework.stereotype.Service;
 
 /**
- * 成本汇总-成本科目汇总(CbAccountSummary)表服务实现类
+ * 成本汇总(CbSummary)表服务实现类
  *
- * @author
- * @since 2024-02-05
+ * @author cyf
+ * @since 2024-02-06
  */
 @Service
-public class CbAccountSummaryServiceImpl extends ServiceImpl<CbAccountSummaryMapper, CbAccountSummary> implements CbAccountSummaryService {
+public class CbSummaryServiceImpl extends ServiceImpl<CbSummaryMapper, CbSummary> implements CbSummaryService {
 
 }

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/CbProjectSummaryMapper.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">
-
-    <resultMap type="com.dsk.cscec.domain.CbProjectSummary" id="CbProjectSummaryMap">
-        <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="name" column="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"/>
-        <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, name, 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/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>
 
 </mapper>

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/CbAccountSummaryMapper.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.CbAccountSummaryMapper">
+<mapper namespace="com.dsk.cscec.mapper.CbSummaryMapper">
 
-    <resultMap type="com.dsk.cscec.domain.CbAccountSummary" id="CbAccountSummaryMap">
+    <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="cbAccount" column="cb_account" 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,10 +19,14 @@
         <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, cb_account, 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>
 </mapper>