设备审批归还确认

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

@@ -188,7 +188,6 @@ public class CmcCarApprovalController extends BaseController
             BigDecimal estimateCost = new BigDecimal(0);
             for (String car : cars) {
                 CmcCar cmcCar = cmcCarService.selectCmcCarByCarId(Integer.parseInt(car));
-                cmcCar.setStatus("0");
                 if (cmcCar.getDayCost() != null)
                     estimateCost = estimateCost.add(cmcCar.getDayCost().multiply(new BigDecimal(cmcCarApproval.getDays())));
             }

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

@@ -154,22 +154,18 @@ public class CmcDeviceApprovalController extends BaseController
             BigDecimal estimateCost = new BigDecimal(0);
             for (String device : devices) {
                 CmcDevice cmcDevice = cmcDeviceService.selectCmcDeviceByDeviceId(Integer.parseInt(device));
+                cmcDevice.setStatus("0"); //确认被领用
+                cmcDeviceService.updateCmcDevice(cmcDevice);
                 if (cmcDevice.getDayCost() != null)
                     estimateCost = estimateCost.add(cmcDevice.getDayCost().multiply(new BigDecimal(cmcDeviceApproval.getDays())));
             }
             cmcDeviceApproval.setEstimateCost(estimateCost);
         }
-        if (formDataJson.getString("managerComment") != null && formDataJson.getString("confirmDate") == null) {
+        if (formDataJson.getString("managerComment") != null && formDataJson.getString("returnDate") == null) {
             cmcDeviceApproval.setManagerUserId(getLoginUser().getUserId());
             cmcDeviceApproval.setManagerComment(formDataJson.getString("managerComment"));
             cmcDeviceApproval.setManagerTime(new Date());
         }
-        if (formDataJson.getDate("confirmDate") != null && formDataJson.getDate("returnDate") == null) {
-            cmcDeviceApproval.setConfirmDate(new Date());
-            CmcDevice cmcDevice = new CmcDevice();
-            cmcDevice.setStatus("0"); //确认被领用
-            cmcDeviceService.updateCmcDevice(cmcDevice);
-        }
         if (formDataJson.getDate("returnDate") != null) {
             cmcDeviceApproval.setRemark(formDataJson.getString("remark"));
             if (formDataJson.getJSONArray("repairDevices").size() > 0) {
@@ -182,6 +178,16 @@ public class CmcDeviceApprovalController extends BaseController
                     cmcDeviceService.updateCmcDevice(cmcDevice);
                 }
             }
+            if (formDataJson.getJSONArray("returnDevices").size() > 0) {
+                String deviceString = formDataJson.getString("returnDevices").substring(1, formDataJson.getString("returnDevices").length() - 1);
+                cmcDeviceApproval.setReturnDevices(deviceString);
+                String[] devices = deviceString.split(",");
+                for (String device : devices) {
+                    CmcDevice cmcDevice = cmcDeviceService.selectCmcDeviceByDeviceId(Integer.parseInt(device));
+                    cmcDevice.setStatus("1"); //可领用
+                    cmcDeviceService.updateCmcDevice(cmcDevice);
+                }
+            }
             cmcDeviceApproval.setReturnDate(formDataJson.getDate("returnDate"));
         }
         cmcDeviceApprovalService.updateCmcDeviceApproval(cmcDeviceApproval);