设备、用车申请同步更新项目表对应字段

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

@@ -3,12 +3,14 @@ package com.ruoyi.web.controller.oa;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import javax.servlet.http.HttpServletResponse;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.oa.domain.*;
 import com.ruoyi.oa.service.ICmcCarService;
+import com.ruoyi.oa.service.ICmcProjectService;
 import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -39,6 +41,9 @@ public class CmcCarApprovalController extends BaseController
     @Autowired
     private ISysUserService userService;
 
+    @Autowired
+    private ICmcProjectService cmcProjectService;
+
     /**
      * 查询cmc用车审批列表
      */
@@ -169,6 +174,14 @@ public class CmcCarApprovalController extends BaseController
             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));
+            if (!formDataJson.getString("projectId").equals("")) {
+                CmcProject cmcProject = new CmcProject();
+                cmcProject.setProjectId(formDataJson.getString("projectId"));
+                CmcProject project = cmcProjectService.selectCmcProjectByProjectId(cmcProject.getProjectId());
+                project.setDrivers(cmcCarApproval.getDrivers());
+                project.setCars(carString);
+                cmcProjectService.updateCmcProject(project);
+            }
             String[] cars = carString.split(",");
             BigDecimal estimateCost = new BigDecimal(0);
             for (String car : cars) {

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

@@ -9,6 +9,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.oa.domain.*;
 import com.ruoyi.oa.service.ICmcDeviceService;
+import com.ruoyi.oa.service.ICmcProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
@@ -36,6 +37,9 @@ public class CmcDeviceApprovalController extends BaseController
     @Autowired
     private ICmcDeviceService cmcDeviceService;
 
+    @Autowired
+    private ICmcProjectService cmcProjectService;
+
     /**
      * 查询cmc设备审批列表
      */
@@ -221,6 +225,13 @@ public class CmcDeviceApprovalController extends BaseController
         if (formDataJson.getJSONArray("modifyDevices").size() > 0) {
             String deviceString = formDataJson.getString("modifyDevices").substring(1, formDataJson.getString("modifyDevices").length() - 1);
             cmcDeviceApproval.setModifyDevices(deviceString);
+            if (!formDataJson.getString("projectId").equals("")) {
+                CmcProject cmcProject = new CmcProject();
+                cmcProject.setProjectId(formDataJson.getString("projectId"));
+                CmcProject project = cmcProjectService.selectCmcProjectByProjectId(cmcProject.getProjectId());
+                project.setDevices(cmcDeviceApproval.getModifyDevices());
+                cmcProjectService.updateCmcProject(project);
+            }
             String[] devices = deviceString.split(",");
             BigDecimal estimateCost = new BigDecimal(0);
             for (String device : devices) {

oa-back/sql/sql.sql

@@ -9580,7 +9580,7 @@ INSERT INTO `cmc_device_approval` VALUES ('1648881411159750356', 63, 110, '162,2
 INSERT INTO `cmc_device_approval` VALUES ('1648881411159750357', 61, 110, '139,98', '107,64', '1648881411067478017', '2023C12_雅砻江两河口水电站水库泥沙监测系统建设工程、运行维护及泥沙淤积影响分析研究项目测量工作', NULL, NULL, NULL, 10, NULL, 17, '已发放', NULL, '2024-03-01', '2024-03-05', NULL, NULL, '设备为拉萨水环境项目使用，因项目为登记，在本项目申领。', NULL, '2024-03-04', '2024-03-04');
 INSERT INTO `cmc_device_approval` VALUES ('1648881411159750358', 71, 110, '143,222', '199,96', '1648881410631270431', '2024C08_猴子岩水电站江口村及周边1:1000地形地类图测绘', NULL, NULL, NULL, 10, '同意。', 17, '已发放', NULL, '2024-02-27', '2024-02-27', NULL, NULL, NULL, NULL, '2024-02-27', '2024-02-27');
 INSERT INTO `cmc_device_approval` VALUES ('1648881411159750359', 103, 110, '4,201,205', '4,201,205', '1648881410631270467', '2024W15_水口集团公司水口电站2024年大坝控制网复测服务', NULL, NULL, NULL, 10, '同意。', 17, '已发放', NULL, '2024-06-28', '2024-06-28', NULL, NULL, NULL, NULL, '2024-06-28', '2024-06-28');
-INSERT INTO `cmc_device_approval` VALUES ('1648881411159750360', 37, 107, '99,106,107,108,109,110,155,162,164,170,171,176,181', '108,109,145,147,149,162,164,176,220,221,222,223', '1648881410631270469', '2024W16_莎车县2024年村庄规划编制-测绘标段（第一包、第二包）', NULL, NULL, NULL, NULL, NULL, 17, '已发放', NULL, '2024-06-28', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+-- INSERT INTO `cmc_device_approval` VALUES ('1648881411159750360', 37, 107, '99,106,107,108,109,110,155,162,164,170,171,176,181', '108,109,145,147,149,162,164,176,220,221,222,223', '1648881410631270469', '2024W16_莎车县2024年村庄规划编制-测绘标段（第一包、第二包）', NULL, NULL, NULL, NULL, NULL, 17, '已发放', NULL, '2024-06-28', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
 -- ----------------------------
 -- 30、cmc用户历史表