预算内业核算增加核算单价表id

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcBudgetSettle.java

@@ -33,6 +33,12 @@ public class CmcBudgetSettle extends BaseEntity
 
     private CmcPrice cmcPrice;
 
+    /** 核算单价id */
+    @Excel(name = "核算单价id")
+    private Long checkPriceId;
+
+    private CmcCheckPrice cmcCheckPrice;
+
     /** 工作量 */
     @Excel(name = "工作量")
     private Double workload;
@@ -94,6 +100,15 @@ public class CmcBudgetSettle extends BaseEntity
     {
         return cmcPrice;
     }
+    public void setCmcCheckPrice(CmcCheckPrice cmcCheckPrice)
+    {
+        this.cmcCheckPrice = cmcCheckPrice;
+    }
+
+    public CmcCheckPrice getCmcCheckPrice()
+    {
+        return cmcCheckPrice;
+    }
     public void setWorkload(Double workload)
     {
         this.workload = workload;
@@ -130,6 +145,15 @@ public class CmcBudgetSettle extends BaseEntity
     {
         return settle;
     }
+    public void setCheckPriceId(Long checkPriceId)
+    {
+        this.checkPriceId = checkPriceId;
+    }
+
+    public Long getCheckPriceId()
+    {
+        return checkPriceId;
+    }
 
     @Override
     public String toString() {

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcBudgetSettleMapper.xml

@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="budgetSettleId"    column="budget_settle_id"    />
         <result property="budgetId"    column="budget_id"    />
         <result property="priceId"    column="price_id"    />
+        <result property="checkPriceId"    column="check_price_id"    />
         <result property="content"    column="content"    />
         <result property="workload"    column="workload"    />
         <result property="coefficient"    column="coefficient"    />
@@ -29,8 +30,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcBudgetSettleVo">
-        select bs.budget_settle_id, bs.budget_id, bs.content, bs.price_id, p.work_type, p.work_item, p.sub_item, p.scale_grade, p.unit, p.common_price, p.complex_price, bs.workload, bs.coefficient, bs.ground_type, bs.settle , bs.remark from cmc_budget_settle as bs
+        select bs.budget_settle_id, bs.budget_id, bs.content, bs.price_id, bs.check_price_id, p.work_type, p.work_item, p.sub_item, p.scale_grade, p.unit, p.common_price, p.complex_price, bs.workload, bs.coefficient, bs.ground_type, bs.settle , bs.remark from cmc_budget_settle as bs
         left join cmc_price as p on p.id = bs.price_id
+        left join cmc_check_price as cp on cp.id = bs.check_price_id
     </sql>
 
     <select id="selectCmcBudgetSettleList" parameterType="CmcBudgetSettle" resultMap="CmcBudgetSettleResult">
@@ -57,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="budgetId != null">budget_id,</if>
             <if test="content != null">content,</if>
             <if test="priceId != null">price_id,</if>
+            <if test="checkPriceId != null">check_price_id,</if>
             <if test="workload != null">workload,</if>
             <if test="coefficient != null">coefficient,</if>
             <if test="groundType != null">ground_type,</if>
@@ -68,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="budgetId != null">#{budgetId},</if>
             <if test="content != null">#{content},</if>
             <if test="priceId != null">#{priceId},</if>
+            <if test="checkPriceId != null">#{checkPriceId},</if>
             <if test="workload != null">#{workload},</if>
             <if test="coefficient != null">#{coefficient},</if>
             <if test="groundType != null">#{groundType},</if>
@@ -82,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="budgetId != null">budget_id = #{budgetId},</if>
             <if test="content != null">content = #{content},</if>
             <if test="priceId != null">price_id = #{priceId},</if>
+            <if test="checkPriceId != null">check_price_id = #{checkPriceId},</if>
             <if test="workload != null">workload = #{workload},</if>
             <if test="coefficient != null">coefficient = #{coefficient},</if>
             <if test="groundType != null">ground_type = #{groundType},</if>

oa-back/sql/sq.sql

@@ -153,4 +153,11 @@ INSERT INTO `cmc_check_price` VALUES (96, '内业', '实景三维模型修模',
 insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
 values(174, '核算单价', '16', '3', 'checkPrice', 'oa/price/checkPrice', 1, 0, 'C', '0', '0', 'oa:price:list', 'price', 'admin', sysdate(), '', null, '核算单价菜单');
 
-INSERT INTO `cmc_oa`.`sys_role_menu` (`role_id`, `menu_id`) VALUES (7, 174);
+INSERT INTO `cmc_oa`.`sys_role_menu` (`role_id`, `menu_id`) VALUES (7, 174);
+
+alter table cmc_budget_settle add column check_price_id int default null comment '核算单价id';
+update `cmc_check_price` set remark = '地形地类图增加部分参照航测成图增加 15%' where id = 26;
+update `cmc_check_price` set remark = '地形地类图增加部分参照航测成图增加 15%' where id = 27;
+update `cmc_check_price` set remark = '地形地类图增加部分参照航测成图增加 15%' where id = 28;
+update `cmc_check_price` set remark = '地形地类图增加部分参照航测成图增加 15%' where id = 29;
+update `cmc_check_price` set remark = '地形地类图增加部分参照航测成图增加 15%' where id = 30;