修改预算表

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

@@ -55,6 +55,10 @@ public class CmcBudget extends BaseEntity
     @Excel(name = "商务费用")
     private BigDecimal businessExpense;
 
+    /** 税务费用 */
+    @Excel(name = "税务费用")
+    private BigDecimal taxExpense;
+
     /** 车船租赁 */
     @Excel(name = "车船租赁")
     private BigDecimal rentExpense;
@@ -173,6 +177,15 @@ public class CmcBudget extends BaseEntity
     {
         return businessExpense;
     }
+    public void setTaxExpense(BigDecimal taxExpense)
+    {
+        this.taxExpense = taxExpense;
+    }
+
+    public BigDecimal getTaxExpense()
+    {
+        return taxExpense;
+    }
     public void setRentExpense(BigDecimal rentExpense)
     {
         this.rentExpense = rentExpense;

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

@@ -23,6 +23,10 @@ public class CmcBudgetSettle extends BaseEntity
     @Excel(name = "预算id")
     private String budgetId;
 
+    /** 工作类别 */
+    @Excel(name = "工作类别")
+    private String content;
+
     /** 结算单价id */
     @Excel(name = "结算单价id")
     private Integer priceId;
@@ -63,6 +67,15 @@ public class CmcBudgetSettle extends BaseEntity
     {
         return budgetId;
     }
+    public void setContent(String content)
+    {
+        this.content = content;
+    }
+
+    public String getContent()
+    {
+        return content;
+    }
     public void setPriceId(Integer priceId) 
     {
         this.priceId = priceId;

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

@@ -14,6 +14,7 @@
         <result property="settleExpense"    column="settle_expense"    />
         <result property="outExpense"    column="out_expense"    />
         <result property="businessExpense"    column="business_expense"    />
+        <result property="taxExpense"    column="tax_expense"    />
         <result property="rentExpense"    column="rent_expense"    />
         <result property="otherExpense"    column="other_expense"    />
         <result property="directExpense"    column="direct_expense"    />
@@ -43,7 +44,8 @@
     </resultMap>
 
     <sql id="selectCmcBudgetVo">
-        select b.budget_id, b.project_id, p.project_number, p.project_name, b.staff_cost, b.car_cost, b.device_cost, b.fix_cost, b.settle_expense, b.out_expense, b.business_expense, b.rent_expense, b.other_expense, b.direct_expense, b.total_budget, b.compiler, u.nick_name as compiler_nick_name, b.auditor, u1.nick_name as auditor_nick_name, b.create_time from cmc_budget as b
+        select b.budget_id, b.project_id, p.project_number, p.project_name, b.staff_cost, b.car_cost, b.device_cost, b.fix_cost, b.settle_expense, b.out_expense, b.business_expense, b.tax_expense,
+               b.rent_expense, b.other_expense, b.direct_expense, b.total_budget, b.compiler, u.nick_name as compiler_nick_name, b.auditor, u1.nick_name as auditor_nick_name, b.create_time from cmc_budget as b
             left join sys_user as u on u.user_id = b.compiler
             left join sys_user as u1 on u1.user_id = b.auditor
             left join cmc_project as p on b.project_id = p.project_id
@@ -86,6 +88,7 @@
             <if test="settleExpense != null">settle_expense,</if>
             <if test="outExpense != null">out_expense,</if>
             <if test="businessExpense != null">business_expense,</if>
+            <if test="taxExpense != null">tax_expense,</if>
             <if test="rentExpense != null">rent_expense,</if>
             <if test="otherExpense != null">other_expense,</if>
             <if test="directExpense != null">direct_expense,</if>
@@ -104,6 +107,7 @@
             <if test="settleExpense != null">#{settleExpense},</if>
             <if test="outExpense != null">#{outExpense},</if>
             <if test="businessExpense != null">#{businessExpense},</if>
+            <if test="taxExpense != null">#{taxExpense},</if>
             <if test="rentExpense != null">#{rentExpense},</if>
             <if test="otherExpense != null">#{otherExpense},</if>
             <if test="directExpense != null">#{directExpense},</if>
@@ -125,6 +129,7 @@
             <if test="settleExpense != null">settle_expense = #{settleExpense},</if>
             <if test="outExpense != null">out_expense = #{outExpense},</if>
             <if test="businessExpense != null">business_expense = #{businessExpense},</if>
+            <if test="taxExpense != null">tax_expense = #{taxExpense},</if>
             <if test="rentExpense != null">rent_expense = #{rentExpense},</if>
             <if test="otherExpense != null">other_expense = #{otherExpense},</if>
             <if test="directExpense != null">direct_expense = #{directExpense},</if>

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="content"    column="content"    />
         <result property="workload"    column="workload"    />
         <result property="coefficient"    column="coefficient"    />
         <result property="groundType"    column="ground_type"    />
@@ -28,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcBudgetSettleVo">
-        select bs.budget_settle_id, bs.budget_id, 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, 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
     </sql>
 
@@ -54,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="budgetSettleId != null">budget_settle_id,</if>
             <if test="budgetId != null">budget_id,</if>
+            <if test="content != null">content,</if>
             <if test="priceId != null">price_id,</if>
             <if test="workload != null">workload,</if>
             <if test="coefficient != null">coefficient,</if>
@@ -64,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="budgetSettleId != null">#{budgetSettleId},</if>
             <if test="budgetId != null">#{budgetId},</if>
+            <if test="content != null">#{content},</if>
             <if test="priceId != null">#{priceId},</if>
             <if test="workload != null">#{workload},</if>
             <if test="coefficient != null">#{coefficient},</if>
@@ -77,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update cmc_budget_settle
         <trim prefix="SET" suffixOverrides=",">
             <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="workload != null">workload = #{workload},</if>
             <if test="coefficient != null">coefficient = #{coefficient},</if>

oa-back/sql/sql.sql

@@ -145,7 +145,7 @@ insert into sys_user values (42, 108, '18408248664', '李圆', '0', null, '18408
 insert into sys_user values (43, 108, '18783205676', '李泳龙', '0', null, '18783205676', '0', null, '$2a$10$LHQQe3UHQgaJDCnPl.gujuBKgRhrMN88kPKRxev2HSvOrV2IDRAfG', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, null, null, null, null, '2019-07-01', null, null, null, '511024199805222552', '四川省内江市', '12', '汉族', '四川水利职业技术学院', '工程测量技术', '3', '2021-07-01', null, '成都市温江区花土路合能珍宝琥珀');
 insert into sys_user values (44, 108, '13684023317', '唐伟', '0', null, '13684023317', '0', null, '$2a$10$wkhl3nWazhW8eQpc3D9S4OJibMFwQLq3.Ocxa6RxbAK.RNRTqyT0K', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '2', null, null, null, null, null, '2024-04-12', null, null, null, '513822198908013196', '四川省仁寿县', '13', '汉族', '成都信息工程学院', '遥感科学与技术', '2', '2024-04-12', '2025-04-11', '成都市高新区荟锦路33号');
 insert into sys_user values (45, 109, '13402863790', '何杰', '0', null, '13402863790', '0', null, '$2a$10$XZhKTnoYh.zS/TczIVjJyOVMvwjQ.fiH3QtTpB9M2OaHnhpIiOYWS', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '1', null, null, '5', null, null, '2010-07-21', null, null, null, '510181198611166115', '四川省眉山市', '6', '汉族', '西南科技大学', '计算机科学与技术', '2', '2014-07-19', null, '四川省成都市温江区江浦路288号');
-insert into sys_user values (46, 109, '18224091291', '杨玉婧', '0', null, '18224091291', '1', null, '$2a$10$goGcN9K63wIO7t8Rkw95kuMb1twHzRU51Dk6q31/.Hejl2Aro0kVq', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '10', null, null, null, null, null, '2019-09-23', null, null, null, '511602199507207404', '四川省广安市', '13', '汉族', '西南交通大学', '土木工程', '2', '2023-09-23', null, '四川省成都市金牛区金科苑4区');
+insert into sys_user values (46, 109, '18224091291', '杨玉婧', '0', null, '18224091291', '1', null, '$2a$10$goGcN9K63wIO7t8Rkw95kuMb1twHzRU51Dk6q31/.Hejl2Aro0kVq', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '3', null, null, null, null, null, '2019-09-23', null, null, null, '511602199507207404', '四川省广安市', '10', '汉族', '西南交通大学', '土木工程', '2', '2023-09-23', null, '四川省成都市金牛区金科苑4区');
 insert into sys_user values (47, 109, '15196615885', '余思翰', '0', null, '15196615885', '1', null, '$2a$10$IjogDx43u3xmI2TigAo6CugCKh.AAmwOSf1nKBCWlJ/cEhgpX.H3e', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '3', null, null, null, null, null, '2020-08-24', null, null, null, '51162219960108432X', '四川省武胜县', '13', '汉族', '西南科技大学', '计算机科学与技术', '2', '2021-08-24', '2024-08-23', '四川省成都市金牛区抚琴东南路10号2单元702');
 insert into sys_user values (48, 109, '17716873691', '阮梦妍', '0', null, '17716873691', '1', null, '$2a$10$XXlN3NzrRMBmMudrV3ZgOOtEq.RML/KrrVhN/uh.rpP7chAqy8QTe', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '3', null, null, null, null, null, '2020-08-24', null, null, null, '510108199810241525', '四川省成都市', '12', '汉族', '成都信息工程大学', '地理信息科学', '2', '2021-08-24', '2024-08-23', '四川省成都市成华区地勘路春熙苑1期1-4-8-31');
 insert into sys_user values (49, 109, '15881196342', '赵芩', '0', null, '15881196342', '1', null, '$2a$10$x2pMljHso1uFHnjDpFu0/OPGrU1ITvl7hnv/bwFFQVUIH/mQ39k2G', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '2', null, '3', null, null, null, '2021-12-06', null, null, null, '513701199410120047', '四川省成都市', '13', '汉族', '成都理工大学', '测绘工程', '1', '2022-12-06', '2025-12-05', '龙泉驿区龙城大道保利玫瑰花语');
@@ -838,8 +838,10 @@ insert into `sys_user_post` values (48, 27);
 insert into `sys_user_post` values (49, 27);
 insert into `sys_user_post` values (50, 27);
 insert into `sys_user_post` values (51, 27);
+insert into `sys_user_post` values (52, 12);
 insert into `sys_user_post` values (52, 13);
 insert into `sys_user_post` values (53, 6);
+insert into `sys_user_post` values (53, 12);
 insert into `sys_user_post` values (54, 6);
 insert into `sys_user_post` values (54, 12);
 insert into `sys_user_post` values (55, 12);
@@ -904,7 +906,7 @@ insert into `sys_user_post` values (113, 27);
 insert into `sys_user_post` values (114, 27);
 insert into `sys_user_post` values (115, 27);
 insert into `sys_user_post` values (116, 27);
-insert into `sys_user_post` values (117, 14);
+insert into `sys_user_post` values (117, 27);
 insert into `sys_user_post` values (118, 27);
 insert into `sys_user_post` values (119, 27);
 insert into `sys_user_post` values (120, 27);
@@ -7198,7 +7200,7 @@ INSERT INTO `cmc_price` VALUES (54, '外业-断面测量', '断面测量', NULL,
 INSERT INTO `cmc_price` VALUES (55, '外业-断面测量', '断面测量', NULL, NULL, '1:2000', 'km', 220.00, 260.00);
 INSERT INTO `cmc_price` VALUES (56, '外业-断面测量', '断面测量', NULL, NULL, '1:5000', 'km', 190.00, 230.00);
 INSERT INTO `cmc_price` VALUES (57, '外业-断面测量', '断面测量', NULL, NULL, '1:10000', 'km', 170.00, 210.00);
-INSERT INTO `cmc_price` VALUES (58, '外业-断面测量', '界桩测设', NULL, NULL, NULL, '点', 110.00, 120.00);
+INSERT INTO `cmc_price` VALUES (58, '外业-断面测量', '界桩测设', NULL, NULL, '无', '点', 110.00, 120.00);
 INSERT INTO `cmc_price` VALUES (59, '外业-高程测量', '水准测量', NULL, NULL, '一', 'km', 580.00, 650.00);
 INSERT INTO `cmc_price` VALUES (60, '外业-高程测量', '水准测量', NULL, NULL, '二', 'km', 420.00, 480.00);
 INSERT INTO `cmc_price` VALUES (61, '外业-高程测量', '水准测量', NULL, NULL, '三', 'km', 210.00, 240.00);
@@ -7219,16 +7221,16 @@ INSERT INTO `cmc_price` VALUES (75, '外业-高程测量', '三角高程测量
 INSERT INTO `cmc_price` VALUES (76, '外业-高程测量', '三角高程测量、单程双测', NULL, NULL, '四', 'km', 176.40, 205.80);
 INSERT INTO `cmc_price` VALUES (77, '外业-公路测量', '公路控制网点土建', NULL, NULL, '三、四等', '点', 150.00, 180.00);
 INSERT INTO `cmc_price` VALUES (78, '外业-公路测量', '公路控制网点土建', NULL, NULL, '五等、一级', '点', 100.00, 120.00);
-INSERT INTO `cmc_price` VALUES (79, '外业-公路测量', '公路中桩、角桩测设', NULL, NULL, NULL, '点', 18.00, 20.00);
-INSERT INTO `cmc_price` VALUES (80, '外业-公路测量', '公路参考点测量', NULL, NULL, NULL, '点', 3.60, 4.00);
-INSERT INTO `cmc_price` VALUES (81, '外业-航飞', '无人机航飞(飞行项目）', NULL, NULL, NULL, '人天', 400.00, 400.00);
-INSERT INTO `cmc_price` VALUES (82, '外业-激光数据采集', '外业激光数据采集(AS-1300HL)', NULL, NULL, NULL, '人天', 400.00, 400.00);
-INSERT INTO `cmc_price` VALUES (83, '外业-其他', '配合测量', NULL, NULL, NULL, '人天', 360.00, 400.00);
-INSERT INTO `cmc_price` VALUES (84, '外业-其他', '进出场', NULL, NULL, NULL, '人天', 300.00, 330.00);
-INSERT INTO `cmc_price` VALUES (85, '外业-施控网土建', '观测墩选埋', NULL, NULL, NULL, '点', 1800.00, 2000.00);
-INSERT INTO `cmc_price` VALUES (86, '外业-施控网土建', '水准基点选埋', NULL, NULL, NULL, '点', 600.00, 800.00);
-INSERT INTO `cmc_price` VALUES (87, '外业-施控网土建', '平面点选埋', NULL, NULL, NULL, '点', 300.00, 400.00);
-INSERT INTO `cmc_price` VALUES (88, '外业-施控网土建', '水准点选埋', NULL, NULL, NULL, '点', 400.00, 400.00);
+INSERT INTO `cmc_price` VALUES (79, '外业-公路测量', '公路中桩、角桩测设', NULL, NULL, '无', '点', 18.00, 20.00);
+INSERT INTO `cmc_price` VALUES (80, '外业-公路测量', '公路参考点测量', NULL, NULL, '无', '点', 3.60, 4.00);
+INSERT INTO `cmc_price` VALUES (81, '外业-航飞', '无人机航飞(飞行项目）', NULL, NULL, '无', '人天', 400.00, 400.00);
+INSERT INTO `cmc_price` VALUES (82, '外业-激光数据采集', '外业激光数据采集(AS-1300HL)', NULL, NULL, '无', '人天', 400.00, 400.00);
+INSERT INTO `cmc_price` VALUES (83, '外业-其他', '配合测量', NULL, NULL, '无', '人天', 360.00, 400.00);
+INSERT INTO `cmc_price` VALUES (84, '外业-其他', '进出场', NULL, NULL, '无', '人天', 300.00, 330.00);
+INSERT INTO `cmc_price` VALUES (85, '外业-施控网土建', '观测墩选埋', NULL, NULL, '无', '点', 1800.00, 2000.00);
+INSERT INTO `cmc_price` VALUES (86, '外业-施控网土建', '水准基点选埋', NULL, NULL, '无', '点', 600.00, 800.00);
+INSERT INTO `cmc_price` VALUES (87, '外业-施控网土建', '平面点选埋', NULL, NULL, '无', '点', 300.00, 400.00);
+INSERT INTO `cmc_price` VALUES (88, '外业-施控网土建', '水准点选埋', NULL, NULL, '无', '点', 400.00, 400.00);
 INSERT INTO `cmc_price` VALUES (89, '内业-DEM、地形面', 'DEM、三维地形面制作', NULL, NULL, '1:200', 'km²', 3800.00, 4400.00);
 INSERT INTO `cmc_price` VALUES (90, '内业-DEM、地形面', 'DEM、三维地形面制作', NULL, NULL, '1:500', 'km²', 1100.00, 1300.00);
 INSERT INTO `cmc_price` VALUES (91, '内业-DEM、地形面', 'DEM、三维地形面制作', NULL, NULL, '1:1000', 'km²', 450.00, 500.00);
@@ -7282,7 +7284,7 @@ INSERT INTO `cmc_price` VALUES (138, '内业-三维模型', '实景三维模型
 INSERT INTO `cmc_price` VALUES (139, '内业-三维模型', '实景三维模型制作', NULL, NULL, '1:2000', 'km²', 187.50, 225.00);
 INSERT INTO `cmc_price` VALUES (140, '内业-三维模型', '实景三维模型制作', NULL, NULL, '1:5000', 'km²', 55.00, 65.00);
 INSERT INTO `cmc_price` VALUES (141, '内业-三维模型', '实景三维模型制作', NULL, NULL, '1:10000', 'km²', 25.00, 30.00);
-INSERT INTO `cmc_price` VALUES (142, '内业-坐标转换', '坐标系转换', NULL, NULL, NULL, '点', 15.00, 14.00);
+INSERT INTO `cmc_price` VALUES (142, '内业-坐标转换', '坐标系转换', NULL, NULL, '无', '点', 15.00, 14.00);
 
 -- ----------------------------
 -- 38、cmc预算管理表
@@ -7297,7 +7299,8 @@ create table `cmc_budget`  (
   `fix_cost` 			decimal(10, 2) 	default null 	comment '固定成本',
   `settle_expense` 		decimal(10, 2) 	default null 	comment '预结算额',
   `out_expense` 		decimal(10, 2) 	default null 	comment '外协费用',
-  `business_expense` 	decimal(10, 2) 	default null 	comment '商务费用',
+  `business_expense` 	decimal(10, 2) 	default null 	comment '经营管理费用',
+  `tax_expense` 		decimal(10, 2) 	default null 	comment '税务费用',
   `rent_expense` 		decimal(10, 2) 	default null 	comment '车船租赁',
   `other_expense` 		decimal(10, 2) 	default null 	comment '其他费用',
   `direct_expense` 		decimal(10, 2) 	default null 	comment '直接成本',
@@ -7358,6 +7361,7 @@ drop table if exists `cmc_budget_settle`;
 create table `cmc_budget_settle`  (
   `budget_settle_id` 	bigint not null  auto_increment comment '预结算id',
   `budget_id` 			char(19) 		default null comment '预算id',
+  `content` 			varchar(255) 	default null comment '工作类别',
   `price_id` 			int 			default null comment '结算单价id',
   `workload` 			double 			default null comment '工作量',
   `coefficient` 		double 			default null comment '系数',