车辆信息增加油耗字段

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

@@ -43,6 +43,10 @@ public class CmcCar extends BaseEntity
     @Excel(name = "单日成本")
     private BigDecimal dayCost;
 
+    /** 油耗 */
+    @Excel(name = "油耗")
+    private BigDecimal fuel;
+
     /** 总价 */
     @Excel(name = "总价（元）")
     private BigDecimal cost;
@@ -183,6 +187,15 @@ public class CmcCar extends BaseEntity
     {
         return dayCost;
     }
+    public void setFuel(BigDecimal fuel)
+    {
+        this.fuel = fuel;
+    }
+
+    public BigDecimal getFuel()
+    {
+        return fuel;
+    }
     public void setStatus(String status)
     {
         this.status = status;
@@ -217,6 +230,7 @@ public class CmcCar extends BaseEntity
                 .append("isRent", getIsRent())
                 .append("dayCost", getDayCost())
                 .append("status", getStatus())
+                .append("fuel", getFuel())
                 .toString();
     }
 }

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

@@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="licensePlate"    column="license_plate"    />
         <result property="driver"    column="driver"    />
         <result property="dayCost"    column="day_cost"    />
+        <result property="fuel"    column="fuel"    />
     </resultMap>
 
     <resultMap type="SysUser" id="SysUserResult">
@@ -33,7 +34,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, 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, 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

@@ -10,6 +10,7 @@
         <result property="driver"    column="driver"    />
         <result property="acquisitionTime"    column="acquisition_time"    />
         <result property="cost"    column="cost"    />
+        <result property="fuel"    column="fuel"    />
         <result property="expectLife"    column="expect_life"    />
         <result property="expectKm"    column="expect_km"    />
         <result property="series"    column="series"    />
@@ -27,7 +28,7 @@
     </resultMap>
 
     <sql id="selectCmcCarVo">
-        select c.car_id, c.license_plate, c.driver, u.nick_name, c.acquisition_time, c.cost, 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.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>
 
@@ -69,6 +70,7 @@
             <if test="dayCost != null">day_cost,</if>
             <if test="remark != null">remark,</if>
             <if test="status != null">status,</if>
+            <if test="fuel != null">fuel,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="licensePlate != null">#{licensePlate},</if>
@@ -83,6 +85,7 @@
             <if test="dayCost != null">#{dayCost},</if>
             <if test="remark != null">#{remark},</if>
             <if test="status != null">#{status},</if>
+            <if test="fuel != null">#{fuel},</if>
         </trim>
     </insert>
 
@@ -101,6 +104,7 @@
             <if test="dayCost != null">day_cost = #{dayCost},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="status != null">status = #{status},</if>
+            <if test="fuel != null">fuel = #{fuel},</if>
         </trim>
         where car_id = #{carId}
     </update>

oa-back/sql/sq.sql

@@ -1,51 +1,17 @@
-DROP TABLE IF EXISTS `cmc_resource_field`;
-CREATE TABLE `cmc_resource_field`  (
-  `field_id` int NOT NULL AUTO_INCREMENT COMMENT '专业领域id',
-  `name` varchar(20) DEFAULT NULL COMMENT '专业领域',
-  `parent_id` int NULL DEFAULT NULL COMMENT '父id',
-  PRIMARY KEY (`field_id`) USING BTREE
-) ENGINE = InnoDB COMMENT 'cmc专业领域表';
+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;
 
-INSERT INTO `cmc_resource_field` VALUES (1, '工程', NULL);
-INSERT INTO `cmc_resource_field` VALUES (2, '会计', NULL);
-INSERT INTO `cmc_resource_field` VALUES (3, '经济', NULL);
-INSERT INTO `cmc_resource_field` VALUES (4, '艺术', NULL);
-INSERT INTO `cmc_resource_field` VALUES (5, '地质勘查工程 ', 1);
-INSERT INTO `cmc_resource_field` VALUES (6, '国土工程 ', 1);
-INSERT INTO `cmc_resource_field` VALUES (7, '测绘工程 ', 1);
-INSERT INTO `cmc_resource_field` VALUES (8, '安全工程 ', 1);
-INSERT INTO `cmc_resource_field` VALUES (9, '大数据与人工智能 ', 1);
-INSERT INTO `cmc_resource_field` VALUES (10, '会计', 2);
-INSERT INTO `cmc_resource_field` VALUES (11, '工商管理', 3);
-INSERT INTO `cmc_resource_field` VALUES (12, '金融', 3);
-INSERT INTO `cmc_resource_field` VALUES (13, '财税', 3);
-INSERT INTO `cmc_resource_field` VALUES (14, '人力资源管理 ', 3);
-INSERT INTO `cmc_resource_field` VALUES (15, '知识产权', 3);
-INSERT INTO `cmc_resource_field` VALUES (16, '书法', 4);
-INSERT INTO `cmc_resource_field` VALUES (17, '地质调查与矿产勘查', 5);
-INSERT INTO `cmc_resource_field` VALUES (18, '水文地质', 5);
-INSERT INTO `cmc_resource_field` VALUES (19, '工程地质与环境地质', 5);
-INSERT INTO `cmc_resource_field` VALUES (20, '岩土工程勘察与治理', 5);
-INSERT INTO `cmc_resource_field` VALUES (21, '地球物理勘查及遥感', 5);
-INSERT INTO `cmc_resource_field` VALUES (22, '地球化学勘查', 5);
-INSERT INTO `cmc_resource_field` VALUES (23, '岩土钻掘工程', 5);
-INSERT INTO `cmc_resource_field` VALUES (24, '地质实验测试', 5);
-INSERT INTO `cmc_resource_field` VALUES (25, '国土空间规划', 6);
-INSERT INTO `cmc_resource_field` VALUES (26, '国土整治', 6);
-INSERT INTO `cmc_resource_field` VALUES (27, '自然资源资产调查与信息', 6);
-INSERT INTO `cmc_resource_field` VALUES (28, '大地测量与卫星定位', 7);
-INSERT INTO `cmc_resource_field` VALUES (29, '工程测量', 7);
-INSERT INTO `cmc_resource_field` VALUES (30, '摄影测量与遥感', 7);
-INSERT INTO `cmc_resource_field` VALUES (31, '地图制图与地理信息系统', 7);
-INSERT INTO `cmc_resource_field` VALUES (32, '不动产测绘', 7);
-INSERT INTO `cmc_resource_field` VALUES (33, '大数据', 9);
-INSERT INTO `cmc_resource_field` VALUES (34, '人工智能', 9);
-INSERT INTO `cmc_resource_field` VALUES (35, '云计算', 9);
-INSERT INTO `cmc_resource_field` VALUES (36, '物联网', 9);
-INSERT INTO `cmc_resource_field` VALUES (37, '区块链', 9);
-INSERT INTO `cmc_resource_field` VALUES (38, '数字化管理', 9);
-INSERT INTO `cmc_resource_field` VALUES (39, '数据安全', 9);
-INSERT INTO `cmc_resource_field` VALUES (40, '数字媒体技术', 9);