车辆费用表

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcCarApprovalController.java

@@ -163,17 +163,19 @@ public class CmcCarApprovalController extends BaseController
         if (formDataJson.getString("dispatchComment") != null) {
             cmcCarApproval.setDispatcher(getLoginUser().getUserId());
             cmcCarApproval.setDispatchComment(formDataJson.getString("dispatchComment"));
-            String carString = formDataJson.getString("cars").substring(1, formDataJson.getString("cars").length() - 1);
-            cmcCarApproval.setCars(carString);
-            cmcCarApproval.setDrivers(formDataJson.getString("drivers").substring(1, formDataJson.getString("drivers").length() - 1));
-            String[] cars = carString.split(",");
-            BigDecimal estimateCost = new BigDecimal(0);
-            for (String car : cars) {
-                CmcCar cmcCar = cmcCarService.selectCmcCarByCarId(Integer.parseInt(car));
-                if (cmcCar.getDayCost() != null)
-                    estimateCost = estimateCost.add(cmcCar.getDayCost().multiply(new BigDecimal(cmcCarApproval.getDays())));
+            if (formDataJson.getString("cars") != null && formDataJson.getString("drivers") != null) {
+                String carString = formDataJson.getString("cars").substring(1, formDataJson.getString("cars").length() - 1);
+                cmcCarApproval.setCars(carString);
+                cmcCarApproval.setDrivers(formDataJson.getString("drivers").substring(1, formDataJson.getString("drivers").length() - 1));
+                String[] cars = carString.split(",");
+                BigDecimal estimateCost = new BigDecimal(0);
+                for (String car : cars) {
+                    CmcCar cmcCar = cmcCarService.selectCmcCarByCarId(Integer.parseInt(car));
+                    if (cmcCar.getDayCost() != null)
+                        estimateCost = estimateCost.add(cmcCar.getDayCost().multiply(new BigDecimal(cmcCarApproval.getDays())));
+                }
+                cmcCarApproval.setEstimateCost(estimateCost);
             }
-            cmcCarApproval.setEstimateCost(estimateCost);
         }
         cmcCarApprovalService.updateCmcCarApproval(cmcCarApproval);
         return AjaxResult.success("修改用车审批表成功");

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcDeviceApprovalController.java

@@ -159,16 +159,18 @@ public class CmcDeviceApprovalController extends BaseController
         if (formDataJson.getString("dispatchComment") != null) {
             cmcDeviceApproval.setDispatcher(getLoginUser().getUserId());
             cmcDeviceApproval.setDispatchComment(formDataJson.getString("dispatchComment"));
-            String deviceString = formDataJson.getString("devices").substring(1, formDataJson.getString("devices").length() - 1);
-            cmcDeviceApproval.setDevices(deviceString);
-            String[] devices = deviceString.split(",");
-            BigDecimal estimateCost = new BigDecimal(0);
-            for (String device : devices) {
-                CmcDevice cmcDevice = cmcDeviceService.selectCmcDeviceByDeviceId(Integer.parseInt(device));
-                if (cmcDevice.getDayCost() != null)
-                    estimateCost = estimateCost.add(cmcDevice.getDayCost().multiply(new BigDecimal(cmcDeviceApproval.getDays())));
+            if (formDataJson.getString("devices") != null) {
+                String deviceString = formDataJson.getString("devices").substring(1, formDataJson.getString("devices").length() - 1);
+                cmcDeviceApproval.setDevices(deviceString);
+                String[] devices = deviceString.split(",");
+                BigDecimal estimateCost = new BigDecimal(0);
+                for (String device : devices) {
+                    CmcDevice cmcDevice = cmcDeviceService.selectCmcDeviceByDeviceId(Integer.parseInt(device));
+                    if (cmcDevice.getDayCost() != null)
+                        estimateCost = estimateCost.add(cmcDevice.getDayCost().multiply(new BigDecimal(cmcDeviceApproval.getDays())));
+                }
+                cmcDeviceApproval.setEstimateCost(estimateCost);
             }
-            cmcDeviceApproval.setEstimateCost(estimateCost);
         }
         cmcDeviceApprovalService.updateCmcDeviceApproval(cmcDeviceApproval);
         return AjaxResult.success("修改设备审批表成功");

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

@@ -42,13 +42,17 @@ public class CmcCar extends BaseEntity
     @Excel(name = "预计使用年限")
     private Integer expectLife;
 
-    /** 车系 */
-    @Excel(name = "车系")
+    /** 预计行驶里程 */
+    @Excel(name = "预计行驶里程（万千米）")
+    private Integer expectKm;
+
+    /** 车型 */
+    @Excel(name = "车型")
     private String series;
 
-    /** 车级 */
-    @Excel(name = "车级")
-    private String level;
+    /** 品牌 */
+    @Excel(name = "品牌")
+    private String brand;
 
     /** 是否为租车 */
     @Excel(name = "是否为租车")
@@ -112,6 +116,15 @@ public class CmcCar extends BaseEntity
     {
         return expectLife;
     }
+    public void setExpectKm(Integer expectKm)
+    {
+        this.expectKm = expectKm;
+    }
+
+    public Integer getExpectKm()
+    {
+        return expectKm;
+    }
     public void setSeries(String series)
     {
         this.series = series;
@@ -121,14 +134,14 @@ public class CmcCar extends BaseEntity
     {
         return series;
     }
-    public void setLevel(String level)
+    public void setBrand(String brand)
     {
-        this.level = level;
+        this.brand = brand;
     }
 
-    public String getLevel()
+    public String getBrand()
     {
-        return level;
+        return brand;
     }
     public void setIsRent(String isRent)
     {
@@ -158,8 +171,9 @@ public class CmcCar extends BaseEntity
                 .append("acquisitionTime", getAcquisitionTime())
                 .append("cost", getCost())
                 .append("expectLife", getExpectLife())
+                .append("expectKm", getExpectKm())
                 .append("series", getSeries())
-                .append("level", getLevel())
+                .append("brand", getBrand())
                 .append("isRent", getIsRent())
                 .append("dayCost", getDayCost())
                 .toString();

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

@@ -11,14 +11,15 @@
         <result property="acquisitionTime"    column="acquisition_time"    />
         <result property="cost"    column="cost"    />
         <result property="expectLife"    column="expect_life"    />
+        <result property="expectKm"    column="expect_km"    />
         <result property="series"    column="series"    />
-        <result property="level"    column="level"    />
+        <result property="brand"    column="brand"    />
         <result property="isRent"    column="is_rent"    />
         <result property="dayCost"    column="day_cost"    />
     </resultMap>
 
     <sql id="selectCmcCarVo">
-        select car_id, license_plate, driver, acquisition_time, cost, expect_life, series, level, is_rent, day_cost from cmc_car
+        select car_id, license_plate, driver, acquisition_time, cost, expect_life, expect_km, series, brand, is_rent, day_cost from cmc_car
     </sql>
 
     <select id="selectCmcCarList" parameterType="CmcCar" resultMap="CmcCarResult">
@@ -29,8 +30,9 @@
             <if test="acquisitionTime != null "> and acquisition_time = #{acquisitionTime}</if>
             <if test="cost != null "> and cost = #{cost}</if>
             <if test="expectLife != null "> and expect_life = #{expectLife}</if>
+            <if test="expectKm != null "> and expect_km = #{expectKm}</if>
             <if test="series != null  and series != ''"> and series like concat('%', #{series}, '%')</if>
-            <if test="level != null  and level != ''"> and level like concat('%', #{level}, '%')</if>
+            <if test="brand != null  and brand != ''"> and brand like concat('%', #{brand}, '%')</if>
             <if test="isRent != null  and isRent != ''"> and isRent = #{isRent}</if>
             <if test="dayCost != null  and dayCost != ''"> and day_cost = #{dayCost}</if>
         </where>
@@ -49,8 +51,9 @@
             <if test="acquisitionTime != null">acquisition_time,</if>
             <if test="cost != null">cost,</if>
             <if test="expectLife != null">expect_life,</if>
+            <if test="expectKm != null">expect_km,</if>
             <if test="series != null">series,</if>
-            <if test="level != null">level,</if>
+            <if test="brand != null">brand,</if>
             <if test="isRent != null">is_rent,</if>
             <if test="dayCost != null">day_cost,</if>
         </trim>
@@ -60,8 +63,9 @@
             <if test="acquisitionTime != null">#{acquisitionTime},</if>
             <if test="cost != null">#{cost},</if>
             <if test="expectLife != null">#{expectLife},</if>
+            <if test="expectKm != null">#{expectKm},</if>
             <if test="series != null">#{series},</if>
-            <if test="level != null">#{level},</if>
+            <if test="brand != null">#{brand},</if>
             <if test="isRent != null">#{isRent},</if>
             <if test="dayCost != null">#{dayCost},</if>
         </trim>
@@ -75,8 +79,9 @@
             <if test="acquisitionTime != null">acquisition_time = #{acquisitionTime},</if>
             <if test="cost != null">cost = #{cost},</if>
             <if test="expectLife != null">expect_life = #{expectLife},</if>
+            <if test="expectKm != null">expect_km = #{expectKm},</if>
             <if test="series != null">series = #{series},</if>
-            <if test="level != null">level = #{level},</if>
+            <if test="brand != null">brand = #{brand},</if>
             <if test="isRent != null">is_rent = #{isRent},</if>
             <if test="dayCost != null">day_cost = #{dayCost},</if>
         </trim>

oa-ui/src/views/oa/car/index.vue

@@ -38,8 +38,8 @@
       <!-- <el-table-column label="车辆id" align="center" prop="carId" /> -->
       <el-table-column label="车牌号" align="center" prop="licensePlate" />
       <!-- <el-table-column label="驾驶员" align="center" prop="driver" /> -->
-      <el-table-column label="车系" align="center" prop="series" />
-      <el-table-column label="车级" align="center" prop="level" />
+      <el-table-column label="品牌" align="center" prop="brand" />
+      <el-table-column label="车型" align="center" prop="series" />
       <el-table-column label="购置时间" align="center" prop="acquisitionTime" />
       <el-table-column label="是否为租车" align="center" prop="isRent" >{{ idRent == "0" ? "否" : "是" }}</el-table-column>
       <el-table-column label="总价" align="center" prop="cost">
@@ -47,8 +47,17 @@
           {{ scope.row.cost + '万元' }}
         </template>
       </el-table-column>
-      <el-table-column label="预计使用年限" align="center" prop="expectLife" />
-      <el-table-column label="使用成本（天）" align="center" prop="dayCost" />
+      <el-table-column label="预计使用年限" align="center" prop="expectLife" >        
+        <template slot-scope="scope">
+          {{ scope.row.expectLife + '年' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="预计行驶里程" align="center" prop="expectKm" >        
+        <template slot-scope="scope">
+          {{ scope.row.expectKm + '万千米' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="单日成本" align="center" prop="dayCost" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 
         <template slot-scope="scope">
@@ -69,11 +78,11 @@
         <el-form-item label="车牌号" prop="licensePlate">
           <el-input v-model="form.licensePlate" placeholder="请输入车牌号" />
         </el-form-item>
-        <el-form-item label="车系" prop="series">
-          <el-input v-model="form.series" placeholder="请输入车系" />
+        <el-form-item label="品牌" prop="brand">
+          <el-input v-model="form.brand" placeholder="请输入品牌" />
         </el-form-item>
-        <el-form-item label="车级" prop="level">
-          <el-input v-model="form.level" placeholder="请输入车级" />
+        <el-form-item label="车型" prop="series">
+          <el-input v-model="form.series" placeholder="请输入车型" />
         </el-form-item>
         <el-form-item label="购置时间" prop="acquisitionTime">
           <el-date-picker v-model="form.acquisitionTime" type="date" placeholder="选择日期" format="yyyy-MM-dd"
@@ -88,6 +97,10 @@
           <el-input v-model="form.expectLife" placeholder="请输入年限" style="width:130px;margin-right:10px;" />
           <span>年</span>
         </el-form-item>
+        <el-form-item label="预计行驶里程" prop="expectKm">
+          <el-input v-model="form.expectKm" placeholder="请输入里程" style="width:130px;margin-right:10px;" />
+          <span>万千米</span>
+        </el-form-item>
         <el-form-item label="驾驶员" prop="driver">
           <el-select v-model="form.driver" filterable placeholder="请选择" clearable>
             <el-option v-for="item in driverList" :key="item.userId" :label="item.nickName" :value="item.userId">
@@ -100,7 +113,7 @@
             <el-radio label="1">是</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item v-if="form.isRent == '1'" label="使用成本（天）" prop="dayCost">
+        <el-form-item v-if="form.isRent == '1'" label="单日成本" prop="dayCost">
           <el-input style="width:130px;margin-right:10px;" v-model="form.dayCost" placeholder="请输入金额" />
           <span>元</span>
         </el-form-item>