累积更新

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

@@ -230,24 +230,27 @@ public class FilesProjectController extends BaseController {
         startPage();
         return getDataTable(cmcProjectService.selectCmcProjectByProjectNumbers(cmcProject));
     }
+
     public String deptIdToName(CmcProject cmcProject) {
         String underTakingDept = cmcProject.getUndertakingDept();
-        StringBuilder underTakingDeptName = new StringBuilder();
-        if (underTakingDept != null && !underTakingDept.equals("") && underTakingDept.split(",").length > 0) {
+        String undertakingDeptName = cmcProject.getUndertakingDeptName();
+        StringBuilder underTakingDeptNames = new StringBuilder();
+        if (underTakingDept != null && !underTakingDept.equals("") && (undertakingDeptName == null || undertakingDeptName.equals(""))) {
             for (String dept : underTakingDept.split(","))
-                underTakingDeptName.append(deptService.selectDeptById(Long.parseLong(dept)).getDeptName()).append(",");
-            cmcProject.setUndertakingDeptName(underTakingDeptName.substring(0, underTakingDeptName.length() - 1));
+                underTakingDeptNames.append(deptService.selectDeptById(Long.parseLong(dept)).getDeptName()).append(",");
+            cmcProject.setUndertakingDeptName(underTakingDeptNames.substring(0, underTakingDeptNames.length() - 1));
         }
         return cmcProject.getUndertakingDeptName();
     }
 
     public String inspectorIdToName(CmcProject cmcProject) {
         String qualityInspector = cmcProject.getQualityInspector();
-        StringBuilder qualityInspectorName = new StringBuilder();
-        if (qualityInspector != null && !qualityInspector.equals("") && qualityInspector.split(",").length > 0) {
+        String qualityInspectorName = cmcProject.getQualityInspectorName();
+        StringBuilder qualityInspectorNames = new StringBuilder();
+        if (qualityInspector != null && !qualityInspector.equals("") && (qualityInspectorName == null || qualityInspectorName.equals(""))) {
             for (String inspector : qualityInspector.split(","))
-                qualityInspectorName.append(userService.selectUserById(Long.parseLong(inspector)).getNickName()).append(",");
-            cmcProject.setQualityInspectorName(qualityInspectorName.substring(0, qualityInspectorName.length() - 1));
+                qualityInspectorNames.append(userService.selectUserById(Long.parseLong(inspector)).getNickName()).append(",");
+            cmcProject.setQualityInspectorName(qualityInspectorNames.substring(0, qualityInspectorNames.length() - 1));
         }
         return cmcProject.getQualityInspectorName();
     }

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

@@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.ruoyi.common.utils.SnowFlake;
 import com.ruoyi.oa.domain.CmcPartner;
 import com.ruoyi.oa.domain.CmcPartyA;
+import com.ruoyi.oa.domain.CmcProject;
 import com.ruoyi.oa.service.ICmcPartnerService;
 import com.ruoyi.oa.service.ICmcPartyAService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -65,10 +66,36 @@ public class CmcBrandProjectController extends BaseController
     public void export(HttpServletResponse response, CmcBrandProject cmcBrandProject)
     {
         List<CmcBrandProject> list = cmcBrandProjectService.selectCmcBrandProjectList(cmcBrandProject);
+        for (CmcBrandProject brandProject : list) {
+            partyAIdToName(brandProject);
+            partnerIdToName(brandProject);
+        }
         ExcelUtil<CmcBrandProject> util = new ExcelUtil<CmcBrandProject>(CmcBrandProject.class);
         util.exportExcel(response, list, "cmc品牌项目数据");
     }
 
+    public void partyAIdToName(CmcBrandProject cmcBrandProject) {
+        String partyAId = cmcBrandProject.getPartyAId();
+        String partyAName = cmcBrandProject.getPartyAName();
+        StringBuilder partyANames = new StringBuilder();
+        if (partyAId != null && !partyAId.equals("") && (partyAName == null || partyAName.equals(""))) {
+            for (String partyA : partyAId.split(","))
+                partyANames.append(cmcPartyAService.selectCmcPartyAByPartyAId(partyA).getPartyAName()).append(",");
+            cmcBrandProject.setPartyAName(partyANames.substring(0, partyANames.length() - 1));
+        }
+    }
+
+    public void partnerIdToName(CmcBrandProject cmcBrandProject) {
+        String partnerId = cmcBrandProject.getPartnerId();
+        String partnerName = cmcBrandProject.getPartnerName();
+        StringBuilder partnerNames = new StringBuilder();
+        if (partnerId != null && !partnerId.equals("") && (partnerName == null || partnerName.equals(""))) {
+            for (String partner : partnerId.split(","))
+                partnerNames.append(cmcPartnerService.selectCmcPartnerByPartnerId(partner).getPartnerName()).append(",");
+            cmcBrandProject.setPartnerName(partnerNames.substring(0, partnerNames.length() - 1));
+        }
+    }
+
     /**
      * 获取cmc品牌项目详细信息
      */

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

@@ -52,18 +52,20 @@ public class CmcCarApprovalController extends BaseController
         List<CmcCarApproval> list = cmcCarApprovalService.selectCmcCarApprovalList(cmcCarApproval);
         for(CmcCarApproval carApproval : list) {
             String carIds = carApproval.getCars();
-            StringBuilder carNames = new StringBuilder();
-            if (carIds != null && !carIds.equals("") && carIds.split(",").length > 0) {
+            String licensePlate = carApproval.getLicensePlate();
+            StringBuilder licensePlates = new StringBuilder();
+            if (carIds != null && !carIds.equals("") && (licensePlate == null || licensePlate.equals(""))) {
                 for (String carId : carIds.split(","))
-                    carNames.append(cmcCarService.selectCmcCarByCarId(Integer.parseInt(carId)).getLicensePlate()).append(",");
-                carApproval.setCarNames(carNames.substring(0, carNames.length() - 1));
+                    licensePlates.append(cmcCarService.selectCmcCarByCarId(Integer.parseInt(carId)).getLicensePlate()).append(",");
+                carApproval.setLicensePlate(licensePlates.substring(0, licensePlates.length() - 1));
             }
             String driverIds = carApproval.getDrivers();
+            String driverName = carApproval.getDriverName();
             StringBuilder driverNames = new StringBuilder();
-            if (driverIds != null && !driverIds.equals("") && driverIds.split(",").length > 0) {
+            if (driverIds != null && !driverIds.equals("") && (driverName == null || driverName.equals(""))) {
                 for (String driverId : driverIds.split(","))
                     driverNames.append(userService.selectUserById(Long.parseLong(driverId)).getNickName()).append(",");
-                carApproval.setDriverNames(driverNames.substring(0, driverNames.length() - 1));
+                carApproval.setDriverName(driverNames.substring(0, driverNames.length() - 1));
             }
         }
         return getDataTable(list);
@@ -79,18 +81,20 @@ public class CmcCarApprovalController extends BaseController
         List<CmcCarApproval> list = cmcCarApprovalService.selectCmcCarApprovalList(cmcCarApproval);
         for(CmcCarApproval carApproval : list) {
             String carIds = carApproval.getCars();
-            StringBuilder carNames = new StringBuilder();
-            if (carIds != null && !carIds.equals("") && carIds.split(",").length > 0) {
+            String licensePlate = carApproval.getLicensePlate();
+            StringBuilder licensePlates = new StringBuilder();
+            if (carIds != null && !carIds.equals("") && (licensePlate == null || licensePlate.equals(""))) {
                 for (String carId : carIds.split(","))
-                    carNames.append(cmcCarService.selectCmcCarByCarId(Integer.parseInt(carId)).getLicensePlate()).append(",");
-                carApproval.setCarNames(carNames.substring(0, carNames.length() - 1));
+                    licensePlates.append(cmcCarService.selectCmcCarByCarId(Integer.parseInt(carId)).getLicensePlate()).append(",");
+                carApproval.setLicensePlate(licensePlates.substring(0, licensePlates.length() - 1));
             }
             String driverIds = carApproval.getDrivers();
+            String driverName = carApproval.getDriverName();
             StringBuilder driverNames = new StringBuilder();
-            if (driverIds != null && !driverIds.equals("") && driverIds.split(",").length > 0) {
+            if (driverIds != null && !driverIds.equals("") && (driverName == null || driverName.equals(""))) {
                 for (String driverId : driverIds.split(","))
                     driverNames.append(userService.selectUserById(Long.parseLong(driverId)).getNickName()).append(",");
-                carApproval.setDriverNames(driverNames.substring(0, driverNames.length() - 1));
+                carApproval.setDriverName(driverNames.substring(0, driverNames.length() - 1));
             }
         }
         ExcelUtil<CmcCarApproval> util = new ExcelUtil<CmcCarApproval>(CmcCarApproval.class);

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

@@ -249,7 +249,7 @@ public class CmcDeviceApprovalController extends BaseController
                 deviceApproval.setModifyDeviceNames(modifyDeviceNames.substring(0, modifyDeviceNames.length() - 1));
             }
             String repairDeviceIds = deviceApproval.getRepairDevices();
-            StringBuilder repairDeviceNames = new StringBuilder();;
+            StringBuilder repairDeviceNames = new StringBuilder();
             StringBuilder repairDeviceNumbers = new StringBuilder();
             if (repairDeviceIds != null && !repairDeviceIds.equals("") && repairDeviceIds.split(",").length > 0) {
                 for (String deviceId : repairDeviceIds.split(",")) {
@@ -263,7 +263,7 @@ public class CmcDeviceApprovalController extends BaseController
                 deviceApproval.setRepairDeviceNames(repairDeviceNames.substring(0, repairDeviceNames.length() - 1));
             }
             String returnDeviceIds = deviceApproval.getReturnDevices();
-            StringBuilder returnDeviceNames = new StringBuilder();;
+            StringBuilder returnDeviceNames = new StringBuilder();
             StringBuilder returnDeviceNumbers = new StringBuilder();
             if (returnDeviceIds != null && !returnDeviceIds.equals("") && returnDeviceIds.split(",").length > 0) {
                 for (String deviceId : returnDeviceIds.split(",")) {

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

@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.oa;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.oa.domain.CmcBrandProject;
 import com.ruoyi.oa.domain.CmcProject;
 import com.ruoyi.oa.service.ICmcPartyAService;
 import com.ruoyi.system.service.ISysDeptService;
@@ -41,7 +42,7 @@ public class CmcManageDeptController extends BaseController
     private ISysDeptService deptService;
 
     @Autowired
-    private ICmcPartyAService partyAService;
+    private ICmcPartyAService cmcPartyAService;
 
     /**
      * 查询cmc领导分管列表
@@ -52,20 +53,8 @@ public class CmcManageDeptController extends BaseController
         startPage();
         List<CmcManageDept> list = cmcManageDeptService.selectCmcManageDeptList(cmcManageDept);
         for (CmcManageDept manageDept : list) {
-            String deptId = manageDept.getDeptId();
-            StringBuilder deptName = new StringBuilder();
-            if (deptId != null && !deptId.equals("") && deptId.split(",").length > 0) {
-                for (String dept : deptId.split(","))
-                    deptName.append(deptService.selectDeptById(Long.parseLong(dept)).getDeptName()).append(",");
-                manageDept.setDeptName(deptName.substring(0, deptName.length() - 1));
-            }
-            String partyAId = manageDept.getPartyAId();
-            StringBuilder partyAName = new StringBuilder();
-            if (partyAId != null && !partyAId.equals("") && partyAId.split(",").length > 0) {
-                for (String partyA : partyAId.split(","))
-                    partyAName.append(partyAService.selectCmcPartyAByPartyAId(partyA).getPartyAName()).append(",");
-                manageDept.setPartyAName(partyAName.substring(0, partyAName.length() - 1));
-            }
+            deptIdToName(manageDept);
+            partyAIdToName(manageDept);
         }
         return getDataTable(list);
     }
@@ -79,25 +68,35 @@ public class CmcManageDeptController extends BaseController
     {
         List<CmcManageDept> list = cmcManageDeptService.selectCmcManageDeptList(cmcManageDept);
         for (CmcManageDept manageDept : list) {
-            String deptId = manageDept.getDeptId();
-            StringBuilder deptName = new StringBuilder();
-            if (deptId != null && !deptId.equals("") && deptId.split(",").length > 0) {
-                for (String dept : deptId.split(","))
-                    deptName.append(deptService.selectDeptById(Long.parseLong(dept)).getDeptName()).append(",");
-                manageDept.setDeptName(deptName.substring(0, deptName.length() - 1));
-            }
-            String partyAId = manageDept.getPartyAId();
-            StringBuilder partyAName = new StringBuilder();
-            if (partyAId != null && !partyAId.equals("") && partyAId.split(",").length > 0) {
-                for (String partyA : partyAId.split(","))
-                    partyAName.append(partyAService.selectCmcPartyAByPartyAId(partyA).getPartyAName()).append(",");
-                manageDept.setPartyAName(partyAName.substring(0, partyAName.length() - 1));
-            }
+            deptIdToName(manageDept);
+            partyAIdToName(manageDept);
         }
         ExcelUtil<CmcManageDept> util = new ExcelUtil<CmcManageDept>(CmcManageDept.class);
         util.exportExcel(response, list, "cmc领导分管数据");
     }
 
+    public void deptIdToName(CmcManageDept cmcManageDept) {
+        String deptId = cmcManageDept.getDeptId();
+        String deptName = cmcManageDept.getDeptName();
+        StringBuilder deptNames = new StringBuilder();
+        if (deptId != null && !deptId.equals("") && (deptName == null || deptName.equals(""))) {
+            for (String dept : deptId.split(","))
+                deptNames.append(deptService.selectDeptById(Long.parseLong(dept)).getDeptName()).append(",");
+            cmcManageDept.setDeptName(deptNames.substring(0, deptNames.length() - 1));
+        }
+    }
+
+    public void partyAIdToName(CmcManageDept cmcManageDept) {
+        String partyAId = cmcManageDept.getPartyAId();
+        String partyAName = cmcManageDept.getPartyAName();
+        StringBuilder partyANames = new StringBuilder();
+        if (partyAId != null && !partyAId.equals("") && (partyAName == null || partyAName.equals(""))) {
+            for (String partyA : partyAId.split(","))
+                partyANames.append(cmcPartyAService.selectCmcPartyAByPartyAId(partyA).getPartyAName()).append(",");
+            cmcManageDept.setPartyAName(partyANames.substring(0, partyANames.length() - 1));
+        }
+    }
+
     /**
      * 获取cmc领导分管详细信息
      */

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

@@ -107,11 +107,12 @@ public class CmcOutsourceController extends BaseController
 
     public void partnerIdToName(CmcOutsource cmcOutsource) {
         String partnerId = cmcOutsource.getPartnerId();
-        StringBuilder partnerName = new StringBuilder();
-        if (partnerId != null && !partnerId.equals("") && partnerId.split(",").length > 0) {
+        String partnerName = cmcOutsource.getPartnerName();
+        StringBuilder partnerNames = new StringBuilder();
+        if (partnerId != null && !partnerId.equals("") && (partnerName == null || partnerName.equals(""))) {
             for (String partner : partnerId.split(","))
-                partnerName.append(cmcPartnerService.selectCmcPartnerByPartnerId(partner).getPartnerName()).append(",");
-            cmcOutsource.setPartnerName(partnerName.substring(0, partnerName.length() - 1));
+                partnerNames.append(cmcPartnerService.selectCmcPartnerByPartnerId(partner).getPartnerName()).append(",");
+            cmcOutsource.setPartnerName(partnerNames.substring(0, partnerNames.length() - 1));
         }
     }
 }

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

@@ -70,11 +70,12 @@ public class CmcProjectCommentController extends BaseController
         CmcProjectComment cmcProjectComment = cmcProjectCommentService.selectCmcProjectCommentByProjectId(projectId);
         if (cmcProjectComment != null) {
             String scApprove = cmcProjectComment.getScApprover();
-            StringBuilder scApproverName = new StringBuilder();
-            if (scApprove != null && !scApprove.equals("") && scApprove.split(",").length > 0) {
+            String scApproverName = cmcProjectComment.getScApproverName();
+            StringBuilder scApproverNames = new StringBuilder();
+            if (scApprove != null && !scApprove.equals("") && (scApproverName == null || scApproverName.equals(""))) {
                 for (String user : scApprove.split(","))
-                    scApproverName.append(userService.selectUserById(Long.parseLong(user)).getNickName()).append(",");
-                cmcProjectComment.setScApproverName(scApproverName.substring(0, scApproverName.length() - 1));
+                    scApproverNames.append(userService.selectUserById(Long.parseLong(user)).getNickName()).append(",");
+                cmcProjectComment.setScApproverName(scApproverNames.substring(0, scApproverNames.length() - 1));
             }
         }
         return success(cmcProjectComment);

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

@@ -87,7 +87,7 @@ public class CmcProjectController extends BaseController
             list = cmcProjectService.selectCmcProjectList(cmcProject);
         for (CmcProject project : list) {
             project.setUndertakingDeptName(deptIdToName(project));
-            project.setQualityInspectorName(inspectorIdToName(project));
+            inspectorIdToName(project);
             CmcContract contract = joinContract(project);
             project.setContractCode(contract.getContractCode());
             project.setContractNumber(contract.getContractNumber());
@@ -106,7 +106,7 @@ public class CmcProjectController extends BaseController
         List<CmcProject> list = cmcProjectService.selectCmcProjectListFuzzy(cmcProject);
         for (CmcProject project : list) {
             project.setUndertakingDeptName(deptIdToName(project));
-            project.setQualityInspectorName(inspectorIdToName(project));
+            inspectorIdToName(project);
             CmcContract contract = joinContract(project);
             project.setContractCode(contract.getContractCode());
             project.setContractNumber(contract.getContractNumber());
@@ -133,7 +133,7 @@ public class CmcProjectController extends BaseController
         }
         for (CmcProject project : list) {
             project.setUndertakingDeptName(deptIdToName(project));
-            project.setQualityInspectorName(inspectorIdToName(project));
+            inspectorIdToName(project);
             CmcContract contract = joinContract(project);
             project.setContractCode(contract.getContractCode());
             project.setContractNumber(contract.getContractNumber());
@@ -152,7 +152,7 @@ public class CmcProjectController extends BaseController
         CmcProject cmcProject = cmcProjectService.selectCmcProjectByProjectId(projectId);
         if (cmcProject != null) {
             cmcProject.setUndertakingDeptName(deptIdToName(cmcProject));
-            cmcProject.setQualityInspectorName(inspectorIdToName(cmcProject));
+            inspectorIdToName(cmcProject);
             CmcContract contract = joinContract(cmcProject);
             cmcProject.setContractCode(contract.getContractCode());
             cmcProject.setContractNumber(contract.getContractNumber());
@@ -400,24 +400,25 @@ public class CmcProjectController extends BaseController
 
     public String deptIdToName(CmcProject cmcProject) {
         String underTakingDept = cmcProject.getUndertakingDept();
-        StringBuilder underTakingDeptName = new StringBuilder();
-        if (underTakingDept != null && !underTakingDept.equals("") && underTakingDept.split(",").length > 0) {
+        String undertakingDeptName = cmcProject.getUndertakingDeptName();
+        StringBuilder underTakingDeptNames = new StringBuilder();
+        if (underTakingDept != null && !underTakingDept.equals("") && (undertakingDeptName == null || undertakingDeptName.equals(""))) {
             for (String dept : underTakingDept.split(","))
-                underTakingDeptName.append(deptService.selectDeptById(Long.parseLong(dept)).getDeptName()).append(",");
-            cmcProject.setUndertakingDeptName(underTakingDeptName.substring(0, underTakingDeptName.length() - 1));
+                underTakingDeptNames.append(deptService.selectDeptById(Long.parseLong(dept)).getDeptName()).append(",");
+            cmcProject.setUndertakingDeptName(underTakingDeptNames.substring(0, underTakingDeptNames.length() - 1));
         }
         return cmcProject.getUndertakingDeptName();
     }
 
-    public String inspectorIdToName(CmcProject cmcProject) {
+    public void inspectorIdToName(CmcProject cmcProject) {
         String qualityInspector = cmcProject.getQualityInspector();
-        StringBuilder qualityInspectorName = new StringBuilder();
-        if (qualityInspector != null && !qualityInspector.equals("") && qualityInspector.split(",").length > 0) {
+        String qualityInspectorName = cmcProject.getQualityInspectorName();
+        StringBuilder qualityInspectorNames = new StringBuilder();
+        if (qualityInspector != null && !qualityInspector.equals("") && (qualityInspectorName == null || qualityInspectorName.equals(""))) {
             for (String inspector : qualityInspector.split(","))
-                qualityInspectorName.append(userService.selectUserById(Long.parseLong(inspector)).getNickName()).append(",");
-            cmcProject.setQualityInspectorName(qualityInspectorName.substring(0, qualityInspectorName.length() - 1));
+                qualityInspectorNames.append(userService.selectUserById(Long.parseLong(inspector)).getNickName()).append(",");
+            cmcProject.setQualityInspectorName(qualityInspectorNames.substring(0, qualityInspectorNames.length() - 1));
         }
-        return cmcProject.getQualityInspectorName();
     }
 
     public CmcContract joinContract(CmcProject cmcProject) {

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

@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.oa;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.oa.domain.CmcOutsource;
 import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -47,13 +48,7 @@ public class CmcSafeReportController extends BaseController
         startPage();
         List<CmcSafeReport> list = cmcSafeReportService.selectCmcSafeReportList(cmcSafeReport);
         for (CmcSafeReport safeReport : list) {
-            String userId = safeReport.getMember();
-            StringBuilder userName = new StringBuilder();
-            if (userId != null && !userId.equals("") && userId.split(",").length > 0) {
-                for (String user : userId.split(","))
-                    userName.append(userService.selectUserById(Long.parseLong(user)).getNickName()).append(",");
-                safeReport.setUserNames(userName.substring(0, userName.length() - 1));
-            }
+            userIdToName(safeReport);
         }
         return getDataTable(list);
     }
@@ -67,13 +62,7 @@ public class CmcSafeReportController extends BaseController
     {
         List<CmcSafeReport> list = cmcSafeReportService.selectCmcSafeReportList(cmcSafeReport);
         for (CmcSafeReport safeReport : list) {
-            String userId = safeReport.getMember();
-            StringBuilder userName = new StringBuilder();
-            if (userId != null && !userId.equals("") && userId.split(",").length > 0) {
-                for (String user : userId.split(","))
-                    userName.append(userService.selectUserById(Long.parseLong(user)).getNickName()).append(",");
-                safeReport.setUserNames(userName.substring(0, userName.length() - 1));
-            }
+            userIdToName(safeReport);
         }
         ExcelUtil<CmcSafeReport> util = new ExcelUtil<CmcSafeReport>(CmcSafeReport.class);
         util.exportExcel(response, list, "安全汇报数据");
@@ -117,4 +106,15 @@ public class CmcSafeReportController extends BaseController
     {
         return success(cmcSafeReportService.deleteCmcSafeReportBySafeReportIds(safeReportIds));
     }
+
+    public void userIdToName(CmcSafeReport cmcSafeReport) {
+        String userId = cmcSafeReport.getMember();
+        String userName = cmcSafeReport.getUserName();
+        StringBuilder userNames = new StringBuilder();
+        if (userId != null && !userId.equals("") && (userName == null || userName.equals(""))) {
+            for (String user : userId.split(","))
+                userNames.append(userService.selectUserById(Long.parseLong(user)).getNickName()).append(",");
+            cmcSafeReport.setUserName(userNames.substring(0, userNames.length() - 1));
+        }
+    }
 }

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

@@ -60,11 +60,12 @@ public class CmcTechnicalPlanController extends BaseController
         List<CmcTechnicalPlan> list = cmcTechnicalPlanService.selectCmcTechnicalPlanList(cmcTechnicalPlan);
         for (CmcTechnicalPlan technical : list) {
             String qualityInspector = technical.getQualityInspector();
-            StringBuilder qualityInspectorName = new StringBuilder();
-            if (qualityInspector != null && !qualityInspector.equals("") && qualityInspector.split(",").length > 0) {
+            String qualityInspectorName = technical.getQualityInspectorName();
+            StringBuilder qualityInspectorNames = new StringBuilder();
+            if (qualityInspector != null && !qualityInspector.equals("") &&  (qualityInspectorName == null || qualityInspectorName.equals(""))) {
                 for (String inspector : qualityInspector.split(","))
-                    qualityInspectorName.append(userService.selectUserById(Long.parseLong(inspector)).getNickName()).append(",");
-                technical.setQualityInspectorName(qualityInspectorName.substring(0, qualityInspectorName.length() - 1));
+                    qualityInspectorNames.append(userService.selectUserById(Long.parseLong(inspector)).getNickName()).append(",");
+                technical.setQualityInspectorName(qualityInspectorNames.substring(0, qualityInspectorNames.length() - 1));
             }
         }
         ExcelUtil<CmcTechnicalPlan> util = new ExcelUtil<CmcTechnicalPlan>(CmcTechnicalPlan.class);

oa-back/ruoyi-agent/src/main/java/com/ruoyi/agent/service/impl/McpServiceImpl.java

@@ -23,8 +23,6 @@ import io.milvus.v2.service.vector.request.SearchReq;
 import io.milvus.v2.service.vector.request.data.BaseVector;
 import io.milvus.v2.service.vector.request.data.FloatVec;
 import io.milvus.v2.service.vector.response.SearchResp;
-import org.apache.poi.extractor.ExtractorFactory;
-import org.apache.poi.extractor.POITextExtractor;
 import org.apache.poi.hwpf.HWPFDocument;
 import org.apache.poi.hwpf.usermodel.Paragraph;
 import org.apache.poi.hwpf.usermodel.Range;

oa-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/service/impl/LangChainMilvusServiceImpl.java

@@ -32,8 +32,6 @@ import io.milvus.v2.service.vector.request.data.BaseVector;
 import io.milvus.v2.service.vector.request.data.FloatVec;
 import io.milvus.v2.service.vector.response.InsertResp;
 import io.milvus.v2.service.vector.response.SearchResp;
-import org.apache.poi.extractor.ExtractorFactory;
-import org.apache.poi.extractor.POITextExtractor;
 import org.apache.poi.hwpf.HWPFDocument;
 import org.apache.poi.hwpf.usermodel.Paragraph;
 import org.apache.poi.hwpf.usermodel.Range;

oa-back/ruoyi-system/pom.xml

@@ -69,6 +69,11 @@
             <version>2.6.2</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-scratchpad</artifactId>
+            <version>5.2.5</version>
+        </dependency>
     </dependencies>
 
 </project>

oa-back/ruoyi-system/src/main/java/com/ruoyi/llm/service/impl/CmcAgentServiceImpl.java

@@ -32,8 +32,6 @@ import io.milvus.v2.service.vector.request.SearchReq;
 import io.milvus.v2.service.vector.request.data.BaseVector;
 import io.milvus.v2.service.vector.request.data.FloatVec;
 import io.milvus.v2.service.vector.response.SearchResp;
-import org.apache.poi.extractor.ExtractorFactory;
-import org.apache.poi.extractor.POITextExtractor;
 import org.apache.poi.hwpf.HWPFDocument;
 import org.apache.poi.hwpf.usermodel.Paragraph;
 import org.apache.poi.hwpf.usermodel.Range;

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

@@ -123,6 +123,15 @@ public class CmcBrandProject extends BaseEntity
     {
         return partyAId;
     }
+    public void setPartyAName(String partyAName)
+    {
+        this.partyAName = partyAName;
+    }
+
+    public String getPartyAName()
+    {
+        return partyAName;
+    }
     public void setPartyA(CmcPartyA partyA)
     {
         this.partyA = partyA;
@@ -160,6 +169,15 @@ public class CmcBrandProject extends BaseEntity
     {
         return partnerId;
     }
+    public void setPartnerName(String partnerName)
+    {
+        this.partnerName = partnerName;
+    }
+
+    public String getPartnerName()
+    {
+        return partnerName;
+    }
     public void setPartner(CmcPartner partner)
     {
         this.partner = partner;

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

@@ -35,7 +35,7 @@ public class CmcBudget extends BaseEntity
     private BigDecimal totalBudget;
 
     /** 间接成本 */
-    @Excel(name = "间接成本")
+//    @Excel(name = "间接成本")
     private BigDecimal fixCost;
 
     /** 人员成本 */
@@ -50,8 +50,12 @@ public class CmcBudget extends BaseEntity
     @Excel(name = "设备成本")
     private BigDecimal deviceCost;
 
+    /** 现场开支 */
+    @Excel(name = "现场开支")
+    private BigDecimal siteCost;
+
     /** 直接成本 */
-    @Excel(name = "直接成本")
+//    @Excel(name = "直接成本")
     private BigDecimal directExpense;
 
     /** 预结算额 */
@@ -67,11 +71,11 @@ public class CmcBudget extends BaseEntity
     private String outRemark;
 
     /** 经营费用 */
-    @Excel(name = "经营费用")
+//    @Excel(name = "经营费用")
     private BigDecimal businessExpense;
 
     /** 经营管理备注 */
-    @Excel(name = "经营管理备注")
+//    @Excel(name = "经营管理备注")
     private String businessRemark;
 
     /** 税费成本 */
@@ -82,20 +86,44 @@ public class CmcBudget extends BaseEntity
     @Excel(name = "税费备注")
     private String taxRemark;
 
+    /** 保函费用 */
+    @Excel(name = "保函费用")
+    private BigDecimal letterExpense;
+
+    /** 保函费用备注 */
+    @Excel(name = "保函费用备注")
+    private String letterRemark;
+
+    /** 中标服务费 */
+    @Excel(name = "中标服务费")
+    private BigDecimal winExpense;
+
+    /** 中标服务费备注 */
+    @Excel(name = "中标服务费备注")
+    private String winRemark;
+
+    /** 管理出差费用 */
+    @Excel(name = "管理出差费用")
+    private BigDecimal travelExpense;
+
+    /** 管理出差费用备注 */
+    @Excel(name = "管理出差费用备注")
+    private String travelRemark;
+
     /** 车船租赁 */
-    @Excel(name = "车船租赁")
+//    @Excel(name = "车船租赁")
     private BigDecimal rentExpense;
 
     /** 车船租赁备注 */
-    @Excel(name = "车船租赁备注")
+//    @Excel(name = "车船租赁备注")
     private String rentRemark;
 
     /** 其他费用 */
-    @Excel(name = "其他费用")
+//    @Excel(name = "其他费用")
     private BigDecimal otherExpense;
 
     /** 其他费用备注 */
-    @Excel(name = "其他费用备注")
+//    @Excel(name = "其他费用备注")
     private String otherRemark;
 
     /** 编制人 */
@@ -147,44 +175,24 @@ public class CmcBudget extends BaseEntity
     @Excel(name = "董事长批准时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date dszTime;
 
-    /** 保函费用 */
-    @Excel(name = "保函费用")
-    private BigDecimal letterExpense;
-
-    /** 中标服务费 */
-    @Excel(name = "中标服务费")
-    private BigDecimal winExpense;
+    /** 预算附件 */
+    @Excel(name = "预算附件")
+    private String document;
 
-    /** 管理出差费用 */
-    @Excel(name = "管理出差费用")
-    private BigDecimal travelExpense;
+    /** 现场开支核算 */
+    @Excel(name = "现场开支核算 ")
+    private BigDecimal siteAdjust;
 
     /** 内业核算绩效总额 */
     @Excel(name = "内业核算绩效总额")
     private BigDecimal settleAdjust;
 
-    /** 保函费用备注 */
-    @Excel(name = "保函费用备注")
-    private String letterRemark;
-
-    /** 管理出差费用备注 */
-    @Excel(name = "管理出差费用备注")
-    private String travelRemark;
-
-    /** 中标服务费备注 */
-    @Excel(name = "中标服务费备注")
-    private String winRemark;
-
-    /** 预算附件 */
-    @Excel(name = "预算附件")
-    private String document;
-
     /** 外协核算费用 */
     @Excel(name = "外协核算费用")
     private BigDecimal outAdjust;
 
-    /** 核算税费 */
-    @Excel(name = "核算税费")
+    /** 税费核算 */
+    @Excel(name = "税费核算")
     private BigDecimal taxAdjust;
 
     /** 保函核算费用 */
@@ -267,6 +275,24 @@ public class CmcBudget extends BaseEntity
     {
         return deviceCost;
     }
+    public void setSiteCost(BigDecimal siteCost)
+    {
+        this.siteCost = siteCost;
+    }
+
+    public BigDecimal getSiteCost()
+    {
+        return siteCost;
+    }
+    public void setSiteAdjust(BigDecimal siteAdjust)
+    {
+        this.siteAdjust = siteAdjust;
+    }
+
+    public BigDecimal getSiteAdjust()
+    {
+        return siteAdjust;
+    }
     public void setFixCost(BigDecimal fixCost)
     {
         this.fixCost = fixCost;

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

@@ -155,12 +155,12 @@ public class CmcCarApproval extends BaseEntity
 
     /** 车辆id */
     @Excel(name = "车牌号")
-    private String carNames;
+    private String licensePlate;
     private String cars;
 
     /** 驾驶员id */
     @Excel(name = "驾驶员")
-    private String driverNames;
+    private String driverName;
     private String drivers;
 
     /** 预计用车成本 */
@@ -193,6 +193,8 @@ public class CmcCarApproval extends BaseEntity
 
     private SysUser dszUser;
 
+    private SysUser driverUser;
+
     private SysUser dispatchUser;
 
     private SysDept dept;
@@ -274,6 +276,16 @@ public class CmcCarApproval extends BaseEntity
     {
         return dszUser;
     }
+    public void setDriverUser(SysUser driverUser)
+    {
+        this.driverUser = driverUser;
+        this.driverName = driverUser == null ? "" : driverUser.getNickName();
+    }
+
+    public SysUser getDriverUser()
+    {
+        return dszUser;
+    }
     public void setDispatchUser(SysUser dispatchUser)
     {
         this.dispatchUser = dispatchUser;
@@ -313,14 +325,14 @@ public class CmcCarApproval extends BaseEntity
     {
         return cars;
     }
-    public void setCarNames(String carNames)
+    public void setLicensePlate(String licensePlate)
     {
-        this.carNames = carNames;
+        this.licensePlate = licensePlate;
     }
 
-    public String getCarNames()
+    public String getLicensePlate()
     {
-        return carNames;
+        return licensePlate;
     }
     public void setDrivers(String drivers)
     {
@@ -331,14 +343,14 @@ public class CmcCarApproval extends BaseEntity
     {
         return drivers;
     }
-    public void setDriverNames(String driverNames)
+    public void setDriverName(String driverName)
     {
-        this.driverNames = driverNames;
+        this.driverName = driverName;
     }
 
-    public String getDriverNames()
+    public String getDriverName()
     {
-        return driverNames;
+        return driverName;
     }
     public void setProjectId(String projectId)
     {

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

@@ -31,7 +31,7 @@ public class CmcSafeReport extends BaseEntity
     /** 公司人员 */
     private String member;
     @Excel(name = "公司人员")
-    private String userNames;
+    private String userName;
 
     /** 临时人员 */
     @Excel(name = "临时人员")
@@ -102,14 +102,14 @@ public class CmcSafeReport extends BaseEntity
     {
         return member;
     }
-    public void setUserNames(String userNames)
+    public void setUserName(String userName)
     {
-        this.userNames = userNames;
+        this.userName = userName;
     }
 
-    public String getUserNames()
+    public String getUserName()
     {
-        return userNames;
+        return userName;
     }
     public void setReportUser(SysUser reportUser)
     {

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

@@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectId != null  and projectId != ''"> and a.project_id = #{projectId}</if>
             <if test="projectNumber != null  and projectNumber != ''"> and p.project_number like concat('%', #{projectNumber}, '%')</if>
             <if test="projectName != null  and projectName != ''"> and p.project_name like concat('%', #{projectName}, '%')</if>
-            <if test="projectLeader != null  and projectLeader != ''"> and p.project_leader like concat('%', #{projectLeader}, '%')</if>
+            <if test="projectLeader != null  and projectLeader != ''"> and p.project_leader = #{projectLeader}</if>
             <if test="achiName != null  and achiName != ''"> and a.achi_name like concat('%', #{achiName}, '%')</if>
             <if test="dataYear != null  and dataYear != ''"> and a.data_year like concat('%', #{dataYear}, '%')</if>
             <if test="scaleGrade != null  and scaleGrade != ''"> and a.scale_grade like concat('%', #{scaleGrade}, '%')</if>

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

@@ -49,6 +49,8 @@
         <result property="letterAdjust"    column="letter_adjust"    />
         <result property="winAdjust"    column="win_adjust"    />
         <result property="travelAdjust"    column="travel_adjust"    />
+        <result property="siteCost"    column="site_cost"    />
+        <result property="siteAdjust"    column="site_adjust"    />
         <result property="procInstId"    column="proc_inst_id"    />
         <association property="compilerUser"    javaType="SysUser"         resultMap="CompilerResult" />
         <association property="managerUser"    javaType="SysUser"         resultMap="ManagerResult" />
@@ -85,7 +87,7 @@
 
     <sql id="selectCmcBudgetVo">
         select b.budget_id, b.project_id, p.project_number, p.project_name, b.staff_cost, b.car_cost, b.device_cost, b.fix_cost, b.settle_expense, b.out_expense, b.business_expense, b.tax_expense,
-               b.rent_expense, b.other_expense, b.out_remark, b.business_remark, b.tax_remark, b.rent_remark, b.other_remark, b.direct_expense, b.total_budget, b.compiler,
+               b.rent_expense, b.other_expense, b.out_remark, b.business_remark, b.tax_remark, b.rent_remark, b.other_remark, b.direct_expense, b.total_budget, b.compiler, b.site_cost, b.site_adjust,
                u.nick_name as compiler_nick_name, b.manager, u1.nick_name as manager_nick_name, b.auditor, u2.nick_name as zjl_nick_name, b.approver, u3.nick_name as dsz_nick_name, b.create_time, b.manager_time, b.zjl_time, b.dsz_time,
                b.manager_comment, b.zjl_comment, b.dsz_comment, b.remark, b.document, b.letter_expense, b.win_expense, b.travel_expense, b.settle_adjust, b.letter_remark, b.travel_remark, b.win_remark,
                b.out_adjust, b.tax_adjust, b.letter_adjust, b.win_adjust, b.travel_adjust, b.proc_inst_id from cmc_budget as b
@@ -171,6 +173,8 @@
             <if test="winAdjust != null">win_adjust,</if>
             <if test="travelAdjust != null">travel_adjust,</if>
             <if test="procInstId != null">proc_inst_id,</if>
+            <if test="siteCost != null">site_cost,</if>
+            <if test="siteAdjust != null">site_adjust,</if>
             create_time
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -218,6 +222,8 @@
             <if test="winAdjust != null">#{winAdjust},</if>
             <if test="travelAdjust != null">#{travelAdjust},</if>
             <if test="procInstId != null">#{procInstId},</if>
+            <if test="siteCost != null">#{siteCost},</if>
+            <if test="siteAdjust != null">#{siteAdjust},</if>
             sysdate()
         </trim>
     </insert>
@@ -269,6 +275,8 @@
             <if test="winAdjust != null">win_adjust = #{winAdjust},</if>
             <if test="travelAdjust != null">travel_adjust = #{travelAdjust},</if>
             <if test="procInstId != null">proc_inst_id = #{procInstId},</if>
+            <if test="siteCost != null">site_cost = #{siteCost},</if>
+            <if test="siteAdjust != null">site_adjust = #{siteAdjust},</if>
         </trim>
         where budget_id = #{budgetId}
     </update>

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

@@ -46,6 +46,7 @@
         <association property="unionUser"    javaType="SysUser"         resultMap="UnionUserResult" />
         <association property="gmUser"    javaType="SysUser"         resultMap="GmUserResult" />
         <association property="dszUser"    javaType="SysUser"         resultMap="DszUserResult" />
+        <association property="driverUser"    javaType="SysUser"         resultMap="DriverUserResult" />
         <association property="dispatchUser"    javaType="SysUser"         resultMap="DispatchUserResult" />
     </resultMap>
 
@@ -84,6 +85,11 @@
         <result property="nickName"    column="dispatch_nick_name"    />
     </resultMap>
 
+    <resultMap type="SysUser" id="DriverUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="driver_nick_name"    />
+    </resultMap>
+
     <resultMap type="SysDept" id="SysDeptResult">
         <result property="deptId"    column="dept_id"    />
         <result property="deptName"    column="dept_name"    />
@@ -96,8 +102,13 @@
         <result property="undertakingDept"    column="undertaking_dept"    />
     </resultMap>
 
+    <resultMap type="CmcCar" id="CmcCarResult">
+        <result property="carId"    column="car_id"    />
+        <result property="licensePlate"    column="license_plate"    />
+    </resultMap>
+
     <sql id="selectCmcCarApprovalVo">
-        select ca.car_apply_id, ca.applier, u.nick_name as applier_nick_name, ca.use_dept, d.dept_name, ca.cars, ca.drivers, ca.project_id, p.project_number, p.project_name, p.undertaking_dept,
+        select ca.car_apply_id, ca.applier, u.nick_name as applier_nick_name, ca.use_dept, d.dept_name, ca.cars, c.license_plate, ca.drivers, u7.nick_name as driver_nick_name, ca.project_id, p.project_number, p.project_name, p.undertaking_dept,
                ca.apply_reason, ca.passengers, ca.apply_date, ca.begin_date, ca.end_date, ca.days, ca.dept_user_id, u1.nick_name as dept_nick_name, ca.dept_comment, ca.manager_user_id,
                u2.nick_name as manager_nick_name, ca.manager_comment, ca.car_usage, ca.union_user_id, u3.nick_name as union_nick_name, ca.union_comment, ca.gm_user_id, u4.nick_name as gm_nick_name,
                ca.dsz_user_id, u5.nick_name as dsz_nick_name, ca.gm_comment, ca.dsz_comment, ca.dispatcher, u6.nick_name as dispatch_nick_name, ca.dispatch_comment, ca.estimate_cost, ca.dept_time,
@@ -109,8 +120,10 @@
             left join sys_user as u4 on u4.user_id = ca.gm_user_id
             left join sys_user as u5 on u5.user_id = ca.dsz_user_id
             left join sys_user as u6 on u6.user_id = ca.dispatcher
+            left join sys_user as u7 on concat(u7.user_id) = ca.drivers
             left join sys_dept as d on d.dept_id = ca.use_dept
             left join cmc_project as p on ca.project_id = p.project_id
+            left join cmc_car as c on concat(c.car_id) = ca.cars
     </sql>
 
     <select id="selectCmcCarApprovalList" parameterType="CmcCarApproval" resultMap="CmcCarApprovalResult">

oa-ui/src/views/flowable/form/budget/addBudget.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-21 18:51:51
  * @LastEditors: wrh
- * @LastEditTime: 2025-12-31 16:41:48
+ * @LastEditTime: 2026-01-30 09:28:21
 -->
 <template>
   <div class="app-container">
@@ -52,7 +52,7 @@
     <!-- <el-divider><b>直接成本</b></el-divider> -->
     <!-- 现场开支 -->
     <site-expenses :budgetId="budgetForm.budgetId" :outer-users="outerUsers" @expensesList="getExpensesList"
-      @siteSum="getSiteSum"></site-expenses>
+      @siteCost="getSiteCost"></site-expenses>
     <!-- 经营相关 -->
     <other-table ref="otherRef" @otherCost="getOtherCost" :budgetForm="budgetForm" :taskName="taskName"></other-table>
     <!-- 预算备注 -->
@@ -100,7 +100,7 @@
           </tr>
           <tr>
             <td>现场开支成本</td>
-            <td style="text-align:right;">{{ isNaN(budgetForm.siteSum) ? 0 : budgetForm.siteSum }}</td>
+            <td style="text-align:right;">{{ isNaN(budgetForm.siteCost) ? 0 : budgetForm.siteCost }}</td>
           </tr>
           <tr>
             <td>经营相关成本</td>
@@ -203,6 +203,7 @@ export default {
         directExpense: 0,
         totalBudget: 0,
         procInstId: "",
+        siteCost: 0,
       },
       flag: false,
       project: {},
@@ -414,8 +415,8 @@ export default {
     getExpensesList(val) {
       this.$set(this.budgetForm, "expensesList", val);
     },
-    getSiteSum(val) {
-      this.$set(this.budgetForm, "siteSum", val);
+    getSiteCost(val) {
+      this.$set(this.budgetForm, "siteCost", val);
     },
     getDeviceCost(val) {
       this.$set(this.budgetForm, "deviceCost", val);
@@ -456,18 +457,20 @@ export default {
       const taxExpense = this.safeNumber(this.budgetForm.taxExpense);
       const winExpense = this.safeNumber(this.budgetForm.winExpense);
       const travelExpense = this.safeNumber(this.budgetForm.travelExpense);
+      const siteCost = this.safeNumber(this.budgetForm.siteCost);
       const sum =
         settleExpense +
         outExpense +
         letterExpense +
         taxExpense +
         winExpense +
-        travelExpense;
+        travelExpense +
+        siteCost;
       this.budgetForm.directExpense = sum.toFixed(2);
     },
     getTotalBudget() {
       this.budgetForm.totalBudget = (
-        Number(this.budgetForm.staffCost) + Number(this.budgetForm.carCost) + Number(this.budgetForm.deviceCost) + Number(this.budgetForm.siteSum)
+        Number(this.budgetForm.staffCost) + Number(this.budgetForm.carCost) + Number(this.budgetForm.deviceCost) + Number(this.budgetForm.siteCost)
         + Number(this.budgetForm.outExpense) + Number(this.budgetForm.letterExpense) + Number(this.budgetForm.winExpense) + Number(this.budgetForm.taxExpense)
         + Number(this.budgetForm.travelExpense)
       ).toFixed(2);

oa-ui/src/views/flowable/form/budget/adjust/budgetAdjust.vue

@@ -216,7 +216,8 @@
           </tr>
           <tr>
             <td>人员成本</td>
-            <td style="text-align:right;">{{ isNaN(budgetForm.staffCost) ? 0 : Number(budgetForm.staffCost).toFixed(2) }}
+            <td style="text-align:right;">{{ isNaN(budgetForm.staffCost) ? 0 : Number(budgetForm.staffCost).toFixed(2)
+              }}
             </td>
             <td style="text-align:right;">{{ isNaN(checkStaffCost) ? 0 : Number(checkStaffCost).toFixed(2) }}</td>
             <td style="text-align:right;">{{ (Number(checkStaffCost) - Number(budgetForm.staffCost)).toFixed(2) }}</td>
@@ -238,10 +239,10 @@
           </tr>
           <tr>
             <td>现场开支成本</td>
-            <td style="text-align:right;">{{ isNaN(budgetForm.siteSum) ? 0 : Number(budgetForm.siteSum).toFixed(2) }}
+            <td style="text-align:right;">{{ isNaN(budgetForm.siteCost) ? 0 : Number(budgetForm.siteCost).toFixed(2) }}
             </td>
             <td style="text-align:right;">{{ isNaN(checkSiteCost) ? 0 : Number(checkSiteCost).toFixed(2) }}</td>
-            <td style="text-align:right;">{{ (Number(checkSiteCost) - Number(budgetForm.siteSum)).toFixed(2) }}</td>
+            <td style="text-align:right;">{{ (Number(checkSiteCost) - Number(budgetForm.siteCost)).toFixed(2) }}</td>
           </tr>
           <tr>
             <td>经营相关成本</td>
@@ -260,7 +261,7 @@
             <td style="text-align:right;"><b>{{ isNaN(budgetForm.totalBudget) ? 0 : budgetForm.totalBudget }}</b></td>
             <td style="text-align:right;"><b>{{ isNaN(totalBudgetAdjust) ? 0 : totalBudgetAdjust }}</b></td>
             <td style="text-align:right;"><b>{{ (Number(totalBudgetAdjust) - Number(budgetForm.totalBudget)).toFixed(2)
-            }}</b></td>
+                }}</b></td>
           </tr>
         </table>
       </el-descriptions-item>
@@ -474,7 +475,7 @@ export default {
   methods: {
     initBudgetForm() {
       this.loading = true;
-      listBudget({ pageNum: 1, pageSize: 20, projectId: this.row.projectId, budgetId:this.row.budgetId }).then(async res => {
+      listBudget({ pageNum: 1, pageSize: 20, projectId: this.row.projectId, budgetId: this.row.budgetId }).then(async res => {
         this.budgetForm = res.rows[0];
         if (this.budgetForm) {
           const budgetId = this.budgetForm.budgetId;
@@ -602,7 +603,7 @@ export default {
             amount: Number(site.amount).toFixed(2),
             amountAdjust: site.amountAdjust ? Number(site.amountAdjust).toFixed(2) : 0
           }));
-          this.budgetForm.siteSum = this.siteList.reduce((sum, site) => sum + Number(site.amount || 0), 0).toFixed(2);
+          this.budgetForm.siteCost = this.siteList.reduce((sum, site) => sum + Number(site.amount || 0), 0).toFixed(2);
           this.checkSiteCost = this.siteList.reduce((sum, site) => sum + Number(site.amountAdjust || 0), 0).toFixed(2);
 
           // 处理预算外开销
@@ -767,6 +768,7 @@ export default {
     handleSiteChange(newList) {
       this.siteList = newList;
       this.checkSiteCost = this.siteList.reduce((sum, site) => sum + (Number(site.amountAdjust) || 0), 0).toFixed(2);
+      this.budgetForm.siteAdjust = this.checkSiteCost
       this.getTotalBudgetAdjust();
     },
     async updateSiteList() {
@@ -778,8 +780,9 @@ export default {
         amountAdjust: site.amountAdjust ? Number(site.amountAdjust).toFixed(2) : 0
       }));
 
-      this.budgetForm.siteSum = this.siteList.reduce((sum, site) => sum + Number(site.amount || 0), 0).toFixed(2);
+      this.budgetForm.siteCost = this.siteList.reduce((sum, site) => sum + Number(site.amount || 0), 0).toFixed(2);
       this.checkSiteCost = this.siteList.reduce((sum, site) => sum + Number(site.amountAdjust || 0), 0).toFixed(2);
+      this.budgetForm.siteAdjust = this.checkSiteCost
     },
     // 处理经营相关数据变化
     handleBusinessChange(newData) {
@@ -1020,4 +1023,5 @@ table {
     color: #E6A23C;
     font-weight: bold;
   }
-}</style>
+}
+</style>

oa-ui/src/views/flowable/form/budget/adjust/newBudgetInfo.vue

@@ -392,7 +392,7 @@
           </tr>
           <tr>
             <td>现场开支成本</td>
-            <td style="text-align:right;">{{ isNaN(budgetForm.siteSum) ? 0 : Number(budgetForm.siteSum).toFixed(2) }}
+            <td style="text-align:right;">{{ isNaN(budgetForm.siteCost) ? 0 : Number(budgetForm.siteCost).toFixed(2) }}
             </td>
           </tr>
           <tr>
@@ -663,7 +663,7 @@ export default {
               amount: Number(site.amount).toFixed(2),
             };
           });
-          this.budgetForm.siteSum = this.siteList.reduce((sum, site) => sum + (Number(site.amount) || 0), 0);
+          this.budgetForm.siteCost = this.siteList.reduce((sum, site) => sum + (Number(site.amount) || 0), 0);
 
           // 检查内业人员绩效总额是否超过内业绩效总额
           const totalPerformance = this.innerStaffList.reduce((sum, staff) => sum + (Number(staff.performance) || 0), 0);
@@ -864,7 +864,7 @@ export default {
     updateSiteAmount(site, value) {
       site.amount = value;
       let siteTotal = this.siteList.reduce((sum, site) => sum + (Number(site.amount) || 0), 0);
-      this.budgetForm.siteSum = siteTotal.toFixed(2);
+      this.budgetForm.siteCost = siteTotal.toFixed(2);
       this.updateTotalJYAmount();
     },
     isPerformanceExceeded() {

oa-ui/src/views/flowable/form/budget/siteExpenses.vue

@@ -106,7 +106,7 @@ export default {
   computed: {
     totalAmount() {
       let sum = this.expensesList.reduce((sum, item) => sum + (Number(item.amount) || 0), 0);
-      this.$emit('siteSum', sum.toFixed(2))
+      this.$emit('siteCost', sum.toFixed(2))
       return sum.toFixed(2);
     }
   },

oa-ui/src/views/oa/brand/brandProject.vue

@@ -2,8 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="项目编号" prop="projectNumber">
-        <el-input v-model="queryParams.projectNumber" placeholder="请输入项目编号" clearable
-          @keyup.enter.native="handleQuery" />
+        <el-input v-model="queryParams.projectNumber" placeholder="请输入项目编号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="项目名称" prop="projectName">
         <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter.native="handleQuery" />
@@ -44,10 +43,36 @@
       </el-table-column>
       <el-table-column label="项目编号" align="center" prop="projectNumber" width="120px" />
       <el-table-column label="项目名称" align="center" prop="projectName" />
-      <el-table-column label="甲方单位" align="center" prop="partyA.partyAName" />
+      <el-table-column label="甲方单位" align="center">
+        <template slot-scope="scope">
+          <span v-if="scope.row.partyA && scope.row.partyA.partyAName == null">
+            {{ scope.row.partyAId.split(',').map(id => {
+              const partyA = partyAList.find(item => item.partyAId === id);
+              return partyA ? partyA.partyAName : '';
+            }).filter(Boolean).join(', ') }}
+          </span>
+          <span v-else-if="scope.row.partyA && scope.row.partyA.partyAName">
+            {{ scope.row.partyA.partyAName }}
+          </span>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="甲方单位联系人" align="center" prop="aPerson" />
       <el-table-column label="甲方单位联系电话" align="center" prop="aPhone" /> -->
-      <el-table-column label="合作单位" align="center" prop="partner.partnerName" />
+      <el-table-column label="合作单位" align="center">
+        <template slot-scope="scope">
+          <span v-if="scope.row.partner && scope.row.partner.partnerName == null">
+            {{ scope.row.partnerId.split(',').map(id => {
+              const partner = partnerList.find(item => item.partnerId === id);
+              return partner ? partner.partnerName : '';
+            }).filter(Boolean).join(', ') }}
+          </span>
+          <span v-else-if="scope.row.partner && scope.row.partner.partnerName">
+            {{ scope.row.partner.partnerName }}
+          </span>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="合作单位联系人" align="center" prop="contactPerson" />
       <el-table-column label="合作单位联系电话" align="center" prop="telephone" /> -->
       <el-table-column label="项目工期" align="center" prop="duration" />
@@ -93,12 +118,12 @@
             <template slot="label">
               甲方单位
             </template>
-            <el-form-item prop="partyAId">
-              <el-select allow-create v-model="form.partyAId" filterable placeholder="请选择" style="width: 100%;"
-                clearable>
-                <el-option v-for="item in partyAList" :key="item.value" :label="item.partyAName" :value="item.partyAId">
+            <el-form-item label="甲方单位" prop="partyAId">
+              <el-select v-model="form.partyAId" multiple filterable placeholder="请选择" disabled style="width: 80%;" clearable>
+                <el-option v-for="item in partyAList" :key="item.partyAId" :label="item.partyAName" :value="item.partyAId">
                 </el-option>
               </el-select>
+              <el-button type="primary" @click="partyAOpen = true">选择单位</el-button>
             </el-form-item>
           </el-descriptions-item>
           <el-descriptions-item>
@@ -121,13 +146,14 @@
             <template slot="label">
               合作单位
             </template>
-            <el-form-item prop="partnerId">
-              <el-select allow-create v-model="form.partnerId" filterable placeholder="请选择" style="width: 100%;"
-                clearable @change="handleSelectPartner">
+            <el-form-item label="合作单位" prop="partnerId">
+              <el-select allow-create v-model="form.partnerId" multiple filterable placeholder="请选择" style="width: 80%;" disabled
+                clearable>
                 <el-option v-for="item in partnerList" :key="item.value" :label="item.partnerName"
                   :value="item.partnerId">
                 </el-option>
               </el-select>
+              <el-button type="primary" @click="partnerOpen = true">选择单位</el-button>
             </el-form-item>
           </el-descriptions-item>
           <el-descriptions-item>
@@ -200,8 +226,7 @@
                   value-format="yyyy-MM-dd"></el-date-picker>
               </td>
               <td>
-                <el-input-number v-model="progress.percentage" :controls="false"
-                  style="width: 120px"></el-input-number>%
+                <el-input-number v-model="progress.percentage" :controls="false" style="width: 120px"></el-input-number>%
               </td>
               <td>
                 <el-input v-model="progress.situation" type="textarea"></el-input>
@@ -254,6 +279,12 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="选择甲方单位" :visible.sync="partyAOpen" width="60%" append-to-body>
+      <choose-party-a @confirm="confirmPartyA"></choose-party-a>
+    </el-dialog>
+    <el-dialog title="选择合作单位" :visible.sync="partnerOpen" width="60%" append-to-body>
+      <choose-partner @confirm="confirmPartners"></choose-partner>
+    </el-dialog>
   </div>
 </template>
 
@@ -264,9 +295,15 @@ import { listPartner, getPartner } from "@/api/oa/partner/partner";
 import { listBrandPayment, addBrandPayment, delBrandPayment } from "@/api/oa/brand/brandPayment";
 import { listBrand, getBrand } from '@/api/oa/brand/brand';
 import { listPartyA } from "@/api/oa/partyA/partyA";
+import ChoosePartyA from '@/views/flowable/form/components/choosePartyA.vue';
+import ChoosePartner from '@/views/flowable/form/components/choosePartner.vue';
 
 export default {
   name: "BrandProject",
+  components: {
+    ChoosePartyA,
+    ChoosePartner
+  },
   data() {
     return {
       baseUrl: process.env.VUE_APP_BASE_API,
@@ -297,6 +334,8 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      partyAOpen: false,
+      partnerOpen: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -314,7 +353,10 @@ export default {
         content: null,
       },
       // 表单参数
-      form: {},
+      form: {
+        partyAId: [],
+        partnerId: []
+      },
       progress: {},
       // 表单校验
       rules: {
@@ -327,9 +369,9 @@ export default {
     };
   },
   created() {
-    this.getList();
-    this.getPartnerList();
     this.getPartyAList();
+    this.getPartnerList();
+    this.getList();
   },
   methods: {
     /** 查询cmc品牌项目列表 */
@@ -358,6 +400,36 @@ export default {
         })
       });
     },
+    confirmPartyA(val) {
+      this.partyAOpen = false
+      if (val) {
+        this.getPartyAList();
+        let ids = []
+        val.map(item => {
+          ids.push(item.partyAId)
+        })
+        this.$set(this.form, 'partyAId', ids)
+      }
+    },
+    // 确定合作单位
+    confirmPartners(val) {
+      this.partnerOpen = false
+      if (val) {
+        let ids = []
+        let contactPerson = []
+        let telephone = []
+        val.map(item => {
+          ids.push(item.partnerId)
+          if (item.contactPerson)
+            contactPerson.push(item.contactPerson)
+          if (item.telephone)
+            telephone.push(item.telephone)
+        })
+        this.$set(this.form, 'contactPerson', contactPerson.join(','));
+        this.$set(this.form, 'telephone', telephone.join(','));
+        this.form.partnerId = ids
+      }
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -415,7 +487,8 @@ export default {
         partyA: null,
         aPerson: null,
         aPhone: null,
-        partnerId: null,
+        partyAId: [],
+        partnerId: [],
         contactPerson: null,
         telephone: null,
         duration: null,
@@ -475,7 +548,19 @@ export default {
         this.approvalDocument = ''
       }
       getBrandProject(projectId).then(response => {
-        this.form = response.data;
+        const data = response.data;
+        // 将字符串类型的ID转换为数组
+        if (data.partyAId) {
+          data.partyAId = Array.isArray(data.partyAId) ? data.partyAId : data.partyAId.split(',');
+        } else {
+          data.partyAId = [];
+        }
+        if (data.partnerId) {
+          data.partnerId = Array.isArray(data.partnerId) ? data.partnerId : data.partnerId.split(',');
+        } else {
+          data.partnerId = [];
+        }
+        this.form = data;
         this.open = true;
         this.title = "品牌项目";
       });
@@ -499,15 +584,21 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          // 准备提交数据，将数组转换为字符串
+          const submitData = {
+            ...this.form,
+            partyAId: Array.isArray(this.form.partyAId) ? this.form.partyAId.join(',') : this.form.partyAId,
+            partnerId: Array.isArray(this.form.partnerId) ? this.form.partnerId.join(',') : this.form.partnerId
+          };
           if (this.form.projectId != null) {
-            updateBrandProject(this.form).then(response => {
+            updateBrandProject(submitData).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
               this.updateProjectProgressList();
             });
           } else {
-            addBrandProject(this.form).then(response => {
+            addBrandProject(submitData).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();

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

@@ -45,6 +45,12 @@
       <el-table-column label="人员成本" align="center" prop="staffCost" />
       <el-table-column label="车辆成本" align="center" prop="carCost" />
       <el-table-column label="设备成本" align="center" prop="deviceCost" />
+      <el-table-column label="现场开支" align="center" prop="siteCost" />
+      <el-table-column label="经营相关" align="center" prop="businessCost">
+        <template slot-scope="scope">
+          {{ scope.row.outExpense + scope.row.letterExpense + scope.row.winExpense + scope.row.travelExpense + scope.row.taxExpense }}
+        </template>
+      </el-table-column>
       <el-table-column label="预算总额" align="center" prop="totalBudget" />
       <el-table-column label="编制人" align="center" prop="compiler">
         <template slot-scope="scope">
@@ -159,8 +165,8 @@ export default {
       },
       taskForm: {
         formId: '',
-        procInsId:'',
-        budgetId:'',
+        procInsId: '',
+        budgetId: '',
       },
       projectList: [],
       queryType: '1',

oa-ui/src/views/oa/titles/info.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-08-15 16:13:32
  * @LastEditors: wrh
- * @LastEditTime: 2026-01-22 16:40:59
+ * @LastEditTime: 2026-01-23 16:57:18
 -->
 <template>
   <div class="app-container">
@@ -77,17 +77,17 @@
 
       <el-table-column label="文件" align="center" prop="publicityFile">
         <template slot-scope="scope">
-          <el-link type="primary" @click="reviewWord(`${baseUrl}${scope.row.publicityFile}`)">
+          <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + scope.row.publicityFile}`)">
             {{ getFileName(scope.row.publicityFile) }}
           </el-link>
           <br>
-          <el-link class="ml20" type="warning" :href="`${baseUrl}${scope.row.publicityFile}`"
+          <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + scope.row.publicityFile}`"
             :underline="false" target="_blank">
           </el-link>
-          <el-link type="primary" @click="reviewWord(`${baseUrl}${scope.row.scanFile}`)">
+          <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + scope.row.scanFile}`)">
             {{ getFileName(scope.row.scanFile) }}
           </el-link>
-          <el-link class="ml20" type="warning" :href="`${baseUrl}${scope.row.scanFile}`"
+          <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + scope.row.scanFile}`"
             :underline="false" target="_blank">
           </el-link>
         </template>
@@ -146,10 +146,12 @@
         </el-form-item>
 
         <el-form-item label="公示红头文件" prop="publicityFile">
-          <file-upload v-model="form.publicityFile" :fileType="['pdf']" />
+          <file-upload v-model="form.publicityFile" :filePathName="'职称评审/公示红头文件/' + form.annual + '/' + getUserName(form.userId)" :fileType="['pdf']"
+            @input="getPublicityFilePath" />
         </el-form-item>
         <el-form-item label="证书扫描件" prop="scanFile">
-          <file-upload v-model="form.scanFile" :fileType="['pdf']" />
+          <file-upload v-model="form.scanFile" :filePathName="'职称评审/证书扫描件/' + form.annual + '/' + getUserName(form.userId)" :fileType="['pdf']"
+            @input="getScanFilePath" />
         </el-form-item>
         <el-form-item label="证书取得时间" prop="obtainTime">
           <el-date-picker clearable v-model="form.obtainTime" type="date" value-format="yyyy-MM-dd"
@@ -288,6 +290,20 @@ export default {
       this.open = false;
       this.reset();
     },
+    getPublicityFilePath(val) {
+      let arr = val.split('/upload')
+      this.form.publicityFile = arr[1]
+      if (val == "") {
+        this.form.publicityFile = ""
+      }
+    },
+    getScanFilePath(val) {
+      let arr = val.split('/upload')
+      this.form.scanFile = arr[1]
+      if (val == "") {
+        this.form.scanFile = ""
+      }
+    },
     // 表单重置
     reset() {
       this.form = {

oa-ui/src/views/oa/titles/record.vue

@@ -156,10 +156,12 @@
         </el-form-item>
         <template v-if="form.isApproved == '1'">
           <el-form-item label="公示红头文件" prop="publicityFile">
-            <file-upload v-model="form.publicityFile" :fileType="['pdf']" />
+            <file-upload v-model="form.publicityFile" :filePathName="'职称评审/公示红头文件/' + form.annual + '/' + getUserName(form.userId)" :fileType="['pdf']"
+              @input="getPublicityFilePath" />
           </el-form-item>
           <el-form-item label="证书扫描件" prop="scanFile">
-            <file-upload v-model="form.scanFile" :fileType="['pdf']" />
+            <file-upload v-model="form.scanFile" :filePathName="'职称评审/证书扫描件/' + form.annual + '/' + getUserName(form.userId)" :fileType="['pdf']"
+              @input="getScanFilePath" />
           </el-form-item>
           <el-form-item label="证书取得时间" prop="obtainTime">
             <el-date-picker clearable v-model="form.obtainTime" type="date" value-format="yyyy-MM-dd"
@@ -276,6 +278,20 @@ export default {
       this.open = false;
       this.reset();
     },
+    getPublicityFilePath(val) {
+      let arr = val.split('/upload')
+      this.form.publicityFile = arr[1]
+      if (val == "") {
+        this.form.publicityFile = ""
+      }
+    },
+    getScanFilePath(val) {
+      let arr = val.split('/upload')
+      this.form.scanFile = arr[1]
+      if (val == "") {
+        this.form.scanFile = ""
+      }
+    },
     // 表单重置
     reset() {
       this.form = {

oa-ui/src/views/oa/transfer/transferTab.vue

@@ -138,7 +138,12 @@ export default {
   computed: {
   },
   watch: {
-
+    taskForm: {
+      handler() {
+        this.initForm();
+      },
+      deep: true
+    }
   },
   data() {
     return {