预算添加备注

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

@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="distance"    column="distance"    />
         <result property="mileage"    column="mileage"    />
         <result property="expense"    column="expense"    />
+        <result property="remark"    column="remark"    />
         <association property="car"    javaType="CmcCar"         resultMap="CmcCarResult" />
     </resultMap>
 
@@ -23,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcBudgetCarVo">
-        select bc.budget_car_id, bc.budget_id, bc.car_id, c.license_plate, c.day_cost, bc.days, bc.depreciation, bc.distance, bc.mileage, bc.expense from cmc_budget_car as bc
+        select bc.budget_car_id, bc.budget_id, bc.car_id, c.license_plate, c.day_cost, bc.days, bc.depreciation, bc.distance, bc.mileage, bc.expense, bc.remark from cmc_budget_car as bc
         left join cmc_car as c on c.car_id = bc.car_id
     </sql>
 
@@ -56,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="distance != null">distance,</if>
             <if test="mileage != null">mileage,</if>
             <if test="expense != null">expense,</if>
+            <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="budgetCarId != null">#{budgetCarId},</if>
@@ -66,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="distance != null">#{distance},</if>
             <if test="mileage != null">#{mileage},</if>
             <if test="expense != null">#{expense},</if>
+            <if test="remark != null">#{remark},</if>
          </trim>
     </insert>
 
@@ -79,6 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="distance != null">distance = #{distance},</if>
             <if test="mileage != null">mileage = #{mileage},</if>
             <if test="expense != null">expense = #{expense},</if>
+            <if test="remark != null">remark = #{remark},</if>
         </trim>
         where budget_car_id = #{budgetCarId}
     </update>

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

@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deviceId"    column="device_id"    />
         <result property="days"    column="days"    />
         <result property="depreciation"    column="depreciation"    />
+        <result property="remark"    column="remark"    />
         <association property="device"    javaType="CmcDevice"         resultMap="CmcDeviceResult" />
     </resultMap>
 
@@ -23,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcBudgetDeviceVo">
-        select bd.budget_device_id, bd.budget_id, d.code, d.name, d.series, d.brand, d.day_cost, bd.device_id, bd.days, bd.depreciation from cmc_budget_device as bd
+        select bd.budget_device_id, bd.budget_id, d.code, d.name, d.series, d.brand, d.day_cost, bd.device_id, bd.days, bd.depreciation, bd.remark from cmc_budget_device as bd
         left join cmc_device as d on d.device_id = bd.device_id
     </sql>
 
@@ -50,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceId != null">device_id,</if>
             <if test="days != null">days,</if>
             <if test="depreciation != null">depreciation,</if>
+            <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="budgetDeviceId != null">#{budgetDeviceId},</if>
@@ -57,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceId != null">#{deviceId},</if>
             <if test="days != null">#{days},</if>
             <if test="depreciation != null">#{depreciation},</if>
+            <if test="remark != null">#{remark},</if>
          </trim>
     </insert>
 
@@ -67,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceId != null">device_id = #{deviceId},</if>
             <if test="days != null">days = #{days},</if>
             <if test="depreciation != null">depreciation = #{depreciation},</if>
+            <if test="remark != null">remark = #{remark},</if>
         </trim>
         where budget_device_id = #{budgetDeviceId}
     </update>

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

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="coefficient"    column="coefficient"    />
         <result property="groundType"    column="ground_type"    />
         <result property="settle"    column="settle"    />
+        <result property="remark"    column="remark"    />
         <association property="cmcPrice"    javaType="CmcPrice"         resultMap="CmcPriceResult" />
     </resultMap>
 
@@ -27,7 +28,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 from cmc_budget_settle as bs
+        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
         left join cmc_price as p on p.id = bs.price_id
     </sql>
 
@@ -58,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="coefficient != null">coefficient,</if>
             <if test="groundType != null">ground_type,</if>
             <if test="settle != null">settle,</if>
+            <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="budgetSettleId != null">#{budgetSettleId},</if>
@@ -67,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="coefficient != null">#{coefficient},</if>
             <if test="groundType != null">#{groundType},</if>
             <if test="settle != null">#{settle},</if>
+            <if test="remark != null">#{remark},</if>
          </trim>
     </insert>
 
@@ -79,6 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="coefficient != null">coefficient = #{coefficient},</if>
             <if test="groundType != null">ground_type = #{groundType},</if>
             <if test="settle != null">settle = #{settle},</if>
+            <if test="remark != null">remark = #{remark},</if>
         </trim>
         where budget_settle_id = #{budgetSettleId}
     </update>

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

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="staffCost"    column="staff_cost"    />
         <result property="inOutPrice"    column="in_out_price"    />
         <result property="inOutExpense"    column="in_out_expense"    />
+        <result property="remark"    column="remark"    />
         <association property="user"    javaType="SysUser"         resultMap="SysUserResult" />
         <association property="salary"    javaType="CmcPostSalary"         resultMap="CmcPostSalaryResult" />
     </resultMap>
@@ -31,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcBudgetStaffVo">
-        select bs.budget_staff_id, bs.budget_id, bs.user_id, u.nick_name, bs.days, ps.salary, bs.staff_cost, bs.in_out_price, bs.in_out_expense from cmc_budget_staff as bs
+        select bs.budget_staff_id, bs.budget_id, bs.user_id, u.nick_name, bs.days, ps.salary, bs.staff_cost, bs.in_out_price, bs.in_out_expense, bs.remark from cmc_budget_staff as bs
         left join sys_user as u on u.user_id = bs.user_id
         left join cmc_post_salary as ps on u.salary_level = ps.salary_level and u.post_level = ps.post_level
     </sql>
@@ -63,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="staffCost != null">staff_cost,</if>
             <if test="inOutPrice != null">in_out_price,</if>
             <if test="inOutExpense != null">in_out_expense,</if>
+            <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="budgetStaffId != null">#{budgetStaffId},</if>
@@ -72,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="staffCost != null">#{staffCost},</if>
             <if test="inOutPrice != null">#{inOutPrice},</if>
             <if test="inOutExpense != null">#{inOutExpense},</if>
+            <if test="remark != null">#{remark},</if>
          </trim>
     </insert>
 
@@ -84,6 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="staffCost != null">staff_cost = #{staffCost},</if>
             <if test="inOutPrice != null">in_out_price = #{inOutPrice},</if>
             <if test="inOutExpense != null">in_out_expense = #{inOutExpense},</if>
+            <if test="remark != null">remark = #{remark},</if>
         </trim>
         where budget_staff_id = #{budgetStaffId}
     </update>

oa-back/sql/sql.sql

@@ -3579,6 +3579,7 @@ create table `cmc_budget_car`  (
   `distance` 		double 			default null comment '距离',
   `mileage` 		decimal(10, 2) 	default null comment '油耗',
   `expense` 		decimal(10, 2) 	default null comment '使用成本',
+  `remark` 			varchar(50) 	default null comment '备注',
   primary key (`budget_car_id`)
 ) engine = innodb comment = 'cmc车辆预算表';
 
@@ -3596,6 +3597,7 @@ create table `cmc_budget_device`  (
   `device_id` 			int 			default null comment '设备id',
   `days` 				int 			default null comment '天数',
   `depreciation` 		decimal(10, 2) 	default null comment '折旧成本',
+  `remark` 				varchar(50) 	default null comment '备注',
   primary key (`budget_device_id`)
 ) engine = innodb comment = 'cmc设备预算表';
 
@@ -3615,6 +3617,7 @@ create table `cmc_budget_settle`  (
   `coefficient` 		double 			default null comment '系数',
   `ground_type` 		char(1) 		default null comment '地类',
   `settle` 				decimal(10, 2) 	default null comment '结算金额',
+  `remark` 				varchar(50) 	default null comment '备注',
   primary key (`budget_settle_id`)
 ) engine = innodb comment = 'cmc预结算表';
 
@@ -3634,6 +3637,7 @@ create table `cmc_budget_staff`  (
   `staff_cost` 			decimal(10, 2) 	default null comment '人员成本',
   `in_out_price` 		decimal(10, 2) 	default null comment '进出场单价',
   `in_out_expense` 		decimal(10, 2) 	default null comment '进出场费用',
+  `remark` 				varchar(50) 	default null comment '备注',
   primary key (`budget_staff_id`)
 ) engine = innodb comment = 'cmc人员预算表';