From b995249911ee7781e3bec548e9098861e1dc4966 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com>
Date: Tue, 26 Aug 2025 17:05:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=BA=8F=E6=89=80?=
 =?UTF-8?q?=E5=B1=9E=E6=9C=BA=E5=8F=B0=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/pms/controller/PqcController.java |  2 +-
 .../pms/data/OperationForResource.java        |  3 +++
 .../pms/service/Impl/PqcServiceImpl.java      | 20 +++++++++++++++----
 .../sys/modules/pms/service/PqcService.java   |  2 +-
 src/main/resources/mapper/pms/PqcMapper.xml   |  6 ++++--
 5 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/PqcController.java b/src/main/java/com/xujie/sys/modules/pms/controller/PqcController.java
index 11221ab0..11788fdc 100644
--- a/src/main/java/com/xujie/sys/modules/pms/controller/PqcController.java
+++ b/src/main/java/com/xujie/sys/modules/pms/controller/PqcController.java
@@ -258,7 +258,7 @@ public class PqcController {
      */
     @PostMapping("/saveOperationForResource")
     public R saveOperationForResource(@RequestBody OperationForResource data){
-        int i  =  pqcService.saveOperationForResource(data);
+        pqcService.saveOperationForResource(data);
         return R.ok();
     }
     /**
diff --git a/src/main/java/com/xujie/sys/modules/pms/data/OperationForResource.java b/src/main/java/com/xujie/sys/modules/pms/data/OperationForResource.java
index cb505fdd..5f674002 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/OperationForResource.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/OperationForResource.java
@@ -3,6 +3,7 @@ package com.xujie.sys.modules.pms.data;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+import java.util.List;
 
 @Data
 @TableName("operation_resource")
@@ -10,6 +11,7 @@ public class OperationForResource {
     private int id;
     private String operation;
     private String resource;
+    private String resourceId;
     @TableField(exist = false)
     private Integer page;
     @TableField(exist = false)
@@ -22,4 +24,5 @@ public class OperationForResource {
     private String resourceDesc;
     @TableField(exist = false)
     private String operationDesc;
+    private List<OperationForResource> resourceList;
 }
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/PqcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/PqcServiceImpl.java
index 892ce76a..a7ea747a 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/PqcServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/PqcServiceImpl.java
@@ -738,7 +738,7 @@ public class PqcServiceImpl implements PqcService {
     }
 
     @Override
-    public int saveOperationForResource(OperationForResource data) {
+    public void saveOperationForResource(OperationForResource data) {
         // 获得 site 和 bu
         if (data.getBu().split("_").length >= 2 ) {
             data.setSite(data.getBu().split("_")[0]);
@@ -746,8 +746,16 @@ public class PqcServiceImpl implements PqcService {
         } else {
             throw new RuntimeException("工厂和部门有误!");
         }
-        int i = pqcMapper.saveOperationForResource(data);
-        return i;
+        //新增 数据模型
+        OperationForResource indata = new OperationForResource();
+        indata.setBu(data.getBu());
+        indata.setSite(data.getSite());
+        indata.setBuNo(data.getBuNo());
+        indata.setOperation(data.getOperation());
+        for (OperationForResource indata2 : data.getResourceList()) {
+            indata.setResource(indata2.getResourceId());
+            int i = pqcMapper.saveOperationForResource(indata);
+        }
     }
 
     @Override
@@ -800,7 +808,11 @@ public class PqcServiceImpl implements PqcService {
 
     @Override
     public List<OperationForResource> getResourceDataOperationForResource(OperationForResource data) {
-        return pqcMapper.getResourceDataOperationForResource(data);
+        List<OperationForResource> list =  pqcMapper.getResourceDataOperationForResource(data);
+        for (OperationForResource indata : list) {
+            indata.setResourceId(indata.getResource());
+        }
+        return list;
     }
 
     @Override
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/PqcService.java b/src/main/java/com/xujie/sys/modules/pms/service/PqcService.java
index 731fca39..f4f63055 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/PqcService.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/PqcService.java
@@ -50,7 +50,7 @@ public interface PqcService {
 
     IPage<OperationForResource> queryOperationForResourceList(OperationForResource data);
 
-    int saveOperationForResource(OperationForResource data);
+    void saveOperationForResource(OperationForResource data);
 
     List<ResourceData> queryResourceList();
 
diff --git a/src/main/resources/mapper/pms/PqcMapper.xml b/src/main/resources/mapper/pms/PqcMapper.xml
index 2aa3a035..aa3ca6eb 100644
--- a/src/main/resources/mapper/pms/PqcMapper.xml
+++ b/src/main/resources/mapper/pms/PqcMapper.xml
@@ -443,6 +443,9 @@
     <select id="queryResourceList2" resultType="com.xujie.sys.modules.pms.data.ResourceData">
         select * from resource
         <where>
+            <if test="site != null and site != ''">
+                and site like '%'+ #{site} +'%'
+            </if>
             <if test="resourceId != null and resourceId != ''">
                 and resource_id like '%'+ #{resourceId} +'%'
             </if>
@@ -453,9 +456,8 @@
     </select>
     <select id="getResourceDataOperationForResource"
             resultType="com.xujie.sys.modules.pms.data.OperationForResource">
-        select a.*,b.resource_desc
+        select a.*,dbo.getResourceDesc(a.site,a.resource) as resource_desc
         from operation_resource a
-        left join resource b on a.resource = b.resource_id
         where bu = #{bu} and operation = #{operation}
     </select>
     <select id="querySopNum" resultType="com.xujie.sys.modules.pms.data.PartSopData">