车辆返回更改状态

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

@@ -179,8 +179,7 @@ public class CmcCarApprovalController extends BaseController
                 if (project.getCars() != null) {
                     String[] projectCars = project.getCars().split(",");
                     String[] cars = carString.split(",");
-                    Collection union = CollectionUtils.union(Arrays.asList(projectCars), Arrays.asList(cars));
-                    project.setCars(String.join(",",union));
+                    project.setCars(String.join(",", CollectionUtils.union(Arrays.asList(projectCars), Arrays.asList(cars))));
                 }
                 else
                     project.setCars(carString);
@@ -190,8 +189,17 @@ public class CmcCarApprovalController extends BaseController
             BigDecimal estimateCost = new BigDecimal(0);
             for (String car : cars) {
                 CmcCar cmcCar = cmcCarService.selectCmcCarByCarId(Integer.parseInt(car));
+                if (cmcCarApproval.getReturnDate() != null && cmcCar.getIsRent().equals("0"))
+                    cmcCar.setStatus("1");
+                else if (cmcCarApproval.getReturnDate() == null && cmcCar.getIsRent().equals("0"))
+                    cmcCar.setStatus("0");
+                else if (cmcCarApproval.getReturnDate() != null && cmcCar.getIsRent().equals("1"))
+                    cmcCar.setStatus("3");
+                else if (cmcCarApproval.getReturnDate() == null && cmcCar.getIsRent().equals("1"))
+                    cmcCar.setStatus("0");
                 if (cmcCar.getDayCost() != null)
                     estimateCost = estimateCost.add(cmcCar.getDayCost().multiply(new BigDecimal(cmcCarApproval.getDays())));
+                cmcCarService.updateCmcCar(cmcCar);
             }
             cmcCarApproval.setEstimateCost(estimateCost);
         }
@@ -205,8 +213,7 @@ public class CmcCarApprovalController extends BaseController
                 if (project.getDrivers() != null) {
                     String[] projectDrivers = project.getDrivers().split(",");
                     String[] drivers = driverString.split(",");
-                    Collection union = CollectionUtils.union(Arrays.asList(projectDrivers), Arrays.asList(drivers));
-                    project.setDrivers(String.join(",", union));
+                    project.setDrivers(String.join(",", CollectionUtils.union(Arrays.asList(projectDrivers), Arrays.asList(drivers))));
                 }
                 else
                     project.setDrivers(driverString);

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

@@ -96,7 +96,7 @@ public class CmcCarController extends BaseController
         cmcCar.setStatus("4");
         statusObject.put("已报废", cmcCarService.selectCmcCarList(cmcCar).size());
         statusArray.add(statusObject);
-        jsonObject.put("",statusArray);
+        jsonObject.put("status",statusArray);
         return success(jsonObject);
     }
 

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

@@ -153,8 +153,7 @@ public class CmcDeviceApprovalController extends BaseController
                 if (project.getDevices() != null) {
                     String[] projectDevices = project.getDevices().split(",");
                     String[] devices = deviceString.split(",");
-                    Collection union = CollectionUtils.union(Arrays.asList(projectDevices), Arrays.asList(devices));
-                    project.setDevices(String.join(",", union));
+                    project.setDevices(String.join(",", CollectionUtils.union(Arrays.asList(projectDevices), Arrays.asList(devices))));
                 }
                 else
                     project.setDevices(deviceString);

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

@@ -104,7 +104,7 @@ public class CmcDeviceController extends BaseController
         cmcDevice.setStatus("4");
         statusObject.put("已报废", cmcDeviceService.selectCmcDeviceList(cmcDevice).size());
         statusArray.add(statusObject);
-        jsonObject.put("",statusArray);
+        jsonObject.put("status",statusArray);
         return success(jsonObject);
     }
 

oa-ui/src/views/flowable/form/oa/carForm.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-29 11:44:28
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-10-08 09:51:54
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-10-16 13:49:16
 -->
 
 <template>
@@ -211,7 +211,7 @@
               <!-- 综合事务部管理人员填写 -->
               <el-form-item label="车牌号：" prop="cars">
                 <el-checkbox-group v-model="form.cars" :disabled="taskName != '安排用车'">
-                  <el-checkbox :label="item.carId" v-for="item in carList" :key="item.carId" :value="item.carId"
+                  <el-checkbox :disabled="item.status == 1 ? false : true" :label="item.carId" v-for="item in carList" :key="item.carId" :value="item.carId"
                     v-if="item.remark == null">
                     {{ item.licensePlate + (item.brand ? item.brand : '') + (item.series ? item.series : '') }}
                   </el-checkbox>
@@ -694,7 +694,6 @@ export default {
       listCar({
         pageNum: 1,
         pageSize: 99999999,
-        status: 1
       }).then(response => {
         this.carList = response.rows;
       })