车辆信息增加保险、维修字段

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

@@ -47,6 +47,14 @@ public class CmcCar extends BaseEntity
     @Excel(name = "油耗")
     private BigDecimal fuel;
 
+    /** 保险 */
+    @Excel(name = "保险")
+    private BigDecimal insurance;
+
+    /** 维修 */
+    @Excel(name = "维修")
+    private BigDecimal maintenance;
+
     /** 总价 */
     @Excel(name = "总价（元）")
     private BigDecimal cost;
@@ -196,6 +204,24 @@ public class CmcCar extends BaseEntity
     {
         return fuel;
     }
+    public void setInsurance(BigDecimal insurance)
+    {
+        this.insurance = insurance;
+    }
+
+    public BigDecimal getInsurance()
+    {
+        return insurance;
+    }
+    public void setMaintenance(BigDecimal maintenance)
+    {
+        this.maintenance = maintenance;
+    }
+
+    public BigDecimal getMaintenance()
+    {
+        return maintenance;
+    }
     public void setStatus(String status)
     {
         this.status = status;
@@ -231,6 +257,8 @@ public class CmcCar extends BaseEntity
                 .append("dayCost", getDayCost())
                 .append("status", getStatus())
                 .append("fuel", getFuel())
+                .append("insurance", getInsurance())
+                .append("maintenance", getMaintenance())
                 .toString();
     }
 }

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

@@ -26,6 +26,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="driver"    column="driver"    />
         <result property="dayCost"    column="day_cost"    />
         <result property="fuel"    column="fuel"    />
+        <result property="insurance"    column="insurance"    />
+        <result property="maintenance"    column="maintenance"    />
     </resultMap>
 
     <resultMap type="SysUser" id="SysUserResult">
@@ -34,7 +36,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.driver, c.brand, u.nick_name, c.day_cost, c.fuel, bc.days, bc.depreciation, bc.distance, bc.mileage, bc.toll, bc.expense, bc.remark from cmc_budget_car as bc
+        select bc.budget_car_id, bc.budget_id, bc.car_id, c.license_plate, c.driver, c.brand, u.nick_name, c.day_cost, c.fuel, c.insurance, c.maintenance, bc.days, bc.depreciation, bc.distance, bc.mileage, bc.toll, bc.expense, bc.remark from cmc_budget_car as bc
         left join cmc_car as c on c.car_id = bc.car_id
         left join sys_user as u on c.driver = u.user_id
     </sql>

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

@@ -19,6 +19,8 @@
         <result property="dayCost"    column="day_cost"    />
         <result property="remark"    column="remark"    />
         <result property="status"    column="status"    />
+        <result property="insurance"    column="insurance"    />
+        <result property="maintenance"    column="maintenance"    />
         <association property="driverUser"    javaType="SysUser"         resultMap="SysUserResult" />
     </resultMap>
 
@@ -28,7 +30,7 @@
     </resultMap>
 
     <sql id="selectCmcCarVo">
-        select c.car_id, c.license_plate, c.driver, u.nick_name, c.acquisition_time, c.cost, c.fuel, c.expect_life, c.expect_km, c.series, c.brand, c.is_rent, c.day_cost, c.remark, c.status from cmc_car as c
+        select c.car_id, c.license_plate, c.driver, u.nick_name, c.acquisition_time, c.cost, c.fuel, c.insurance, c.maintenance, c.expect_life, c.expect_km, c.series, c.brand, c.is_rent, c.day_cost, c.remark, c.status from cmc_car as c
         left join sys_user as u on u.user_id = c.driver
     </sql>
 
@@ -71,6 +73,8 @@
             <if test="remark != null">remark,</if>
             <if test="status != null">status,</if>
             <if test="fuel != null">fuel,</if>
+            <if test="insurance != null">insurance,</if>
+            <if test="maintenance != null">maintenance,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="licensePlate != null">#{licensePlate},</if>
@@ -86,6 +90,8 @@
             <if test="remark != null">#{remark},</if>
             <if test="status != null">#{status},</if>
             <if test="fuel != null">#{fuel},</if>
+            <if test="insurance != null">#{insurance},</if>
+            <if test="maintenance != null">#{maintenance},</if>
         </trim>
     </insert>
 
@@ -105,6 +111,8 @@
             <if test="remark != null">remark = #{remark},</if>
             <if test="status != null">status = #{status},</if>
             <if test="fuel != null">fuel = #{fuel},</if>
+            <if test="insurance != null">insurance = #{insurance},</if>
+            <if test="maintenance != null">maintenance = #{maintenance},</if>
         </trim>
         where car_id = #{carId}
     </update>

oa-back/sql/sq.sql

@@ -1,17 +1,18 @@
-alter table cmc_car add column fuel decimal(10,2) default null comment '油耗';
-UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A5177U', `expect_life` = 15, `day_cost` = 113.00, `fuel` = 0.7 WHERE `car_id` = 1;
-UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A1081W', `expect_life` = 15, `day_cost` = 89.00, `fuel` = 1.0 WHERE `car_id` = 2;
-UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A2239Q', `expect_life` = 10, `day_cost` = 25.00, `fuel` = 0.7 WHERE `car_id` = 3;
-UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A1686T', `expect_life` = 10, `day_cost` = 31.00, `fuel` = 0.8 WHERE `car_id` = 4;
-UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A0T282', `expect_life` = 10, `day_cost` = 59.00, `fuel` = 0.7 WHERE `car_id` = 5;
-UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A9802U', `expect_life` = 10, `day_cost` = 39.00, `fuel` = 0.7 WHERE `car_id` = 6;
-UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A6106T', `expect_life` = 10, `day_cost` = 31.00, `fuel` = 0.7 WHERE `car_id` = 32;
-UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川AQ259W', `expect_life` = 10, `day_cost` = 24.00, `fuel` = 0.6 WHERE `car_id` = 8;
-UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A5U91Q', `expect_life` = 10, `day_cost` = 34.00, `fuel` = 0.7 WHERE `car_id` = 9;
-UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川AEX607', `expect_life` = 10, `day_cost` = 33.00, `fuel` = 1.0 WHERE `car_id` = 10;
-UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A99L3B', `expect_life` = 10, `day_cost` = 18.00, `fuel` = 0.7 WHERE `car_id` = 11;
-UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A6692U', `expect_life` = 10, `day_cost` = 16.00, `fuel` = 0.6 WHERE `car_id` = 12;
-UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川GAR907', `expect_life` = 10, `day_cost` = 15.00, `fuel` = 0.3 WHERE `car_id` = 13;
-UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A3760U', `expect_life` = 10, `day_cost` = 40.00, `fuel` = 1.0 WHERE `car_id` = 14;
-UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A1950R', `expect_life` = 10, `day_cost` = 61.00, `fuel` = 0.9 WHERE `car_id` = 15;
+alter table cmc_car add column insurance decimal(10,2) default null comment '保险';
+alter table cmc_car add column maintenance decimal(10,2) default null comment '维修';
+UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A5177U', `insurance` = 11, `maintenance` = 35.00 WHERE `car_id` = 1;
+UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A1081W', `insurance` = 13, `maintenance` = 60.00 WHERE `car_id` = 2;
+UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A2239Q', `insurance` = 8, `maintenance` = 46.00 WHERE `car_id` = 3;
+UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A1686T', `insurance` = 10, `maintenance` = 60.00 WHERE `car_id` = 4;
+UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A0T282', `insurance` = 8, `maintenance` = 60.00 WHERE `car_id` = 5;
+UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A9802U', `insurance` = 12, `maintenance` = 32.00 WHERE `car_id` = 6;
+UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A6106T', `insurance` = 11, `maintenance` = 10.00 WHERE `car_id` = 32;
+UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川AQ259W', `insurance` = 8, `maintenance` = 13.00 WHERE `car_id` = 8;
+UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A5U91Q', `insurance` = 8, `maintenance` = 46.00 WHERE `car_id` = 9;
+UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川AEX607', `insurance` = 7, `maintenance` = 8.00 WHERE `car_id` = 10;
+UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A99L3B', `insurance` = 6, `maintenance` = 14.00 WHERE `car_id` = 11;
+UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A6692U', `insurance` = 9, `maintenance` = 10.00 WHERE `car_id` = 12;
+UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川GAR907', `insurance` = 8, `maintenance` = 7.00 WHERE `car_id` = 13;
+UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A3760U', `insurance` = 10, `maintenance` = 10.00 WHERE `car_id` = 14;
+UPDATE `cmc_oa`.`cmc_car` SET `license_plate` = '川A1950R', `insurance` = 10, `maintenance` = 10.00 WHERE `car_id` = 15;