From b7581556a9af4482a9cfb8a636cfe560fb9237bd Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 18 Jun 2024 11:24:18 +0800
Subject: [PATCH] =?UTF-8?q?2024-06-18=20=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=962?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/pms/controller/QcController.java  | 11 ++++++++
 .../sys/modules/pms/mapper/QcMapper.java      |  2 ++
 .../pms/service/Impl/QcServiceImpl.java       | 18 +++++++++++++
 .../sys/modules/pms/service/QcService.java    |  2 ++
 src/main/resources/mapper/pms/QcMapper.xml    | 25 ++++++++++++++++---
 5 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java b/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java
index d6b49bca..e1b958eb 100644
--- a/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java
+++ b/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java
@@ -1845,6 +1845,17 @@ public class QcController {
         return R.ok().put("rows", list);
     }
 
+    /**
+     * 获取责任人列表
+     * @param data
+     * @return
+     */
+    @PostMapping("/getResponsibleOperatorList")
+    public R getResponsibleOperatorList(@RequestBody EamAdminData data){
+        List<EamAdminData> list = qcService.getResponsibleOperatorList(data);
+        return R.ok().put("rows", list);
+    }
+
 }
 
 
diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java
index 3a2a8d89..fcbd965e 100644
--- a/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java
+++ b/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java
@@ -508,4 +508,6 @@ public interface QcMapper {
     void saveFileList(List<SysOssEntity> fileList);
 
     List<EquipmentFolderLocationData> getEquipmentNoList(EquipmentFolderLocationData data);
+
+    List<EamAdminData> getResponsibleOperatorList(EamAdminData data);
 }
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
index 811e310f..479c0aeb 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
@@ -14,6 +14,7 @@ import com.xujie.sys.modules.pms.data.*;
 import com.xujie.sys.modules.pms.entity.vo.CheckSubDetailValueVo;
 import com.xujie.sys.modules.pms.mapper.QcDao;
 import com.xujie.sys.modules.pms.mapper.QcMapper;
+import com.xujie.sys.modules.pms.service.EamService;
 import com.xujie.sys.modules.pms.service.QcService;
 import com.xujie.sys.modules.pms.util.HttpClientUtil;
 import com.xujie.sys.modules.pms.util.ResponseData;
@@ -4859,6 +4860,23 @@ public class QcServiceImpl implements QcService {
         return list;
     }
 
+    /**
+     * 获取责任人列表
+     * @param data
+     * @return
+     */
+    @Override
+    public List<EamAdminData> getResponsibleOperatorList(EamAdminData data) {
+        // 获得 site 和 bu
+        if (data.getBu().split("_").length >= 2 ) {
+            data.setSite(data.getBu().split("_")[0]);
+            data.setBuNo(data.getBu().split("_")[1]);
+        } else {
+            throw new RuntimeException("工厂和部门有误!");
+        }
+        List<EamAdminData> list = qcMapper.getResponsibleOperatorList(data);
+        return list;
+    }
 
     public static File multipartFileToFile(MultipartFile file ,String fileName) throws Exception {
         File toFile = null;
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/QcService.java b/src/main/java/com/xujie/sys/modules/pms/service/QcService.java
index 1ea6d677..12fe1715 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/QcService.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/QcService.java
@@ -288,4 +288,6 @@ public interface QcService {
     Map<String, Integer> dataAcquisition(QcFAIRecordData data);
 
     List<EquipmentFolderLocationData> getEquipmentNoList(EquipmentFolderLocationData data);
+
+    List<EamAdminData> getResponsibleOperatorList(EamAdminData data);
 }
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index e7bf6c5e..da630175 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -1592,7 +1592,7 @@
         isnull(dbo.joint_id(site, bu_no, inspection_no, 'coordination'), '') as operator,
         isnull(dbo.joint_name(site, bu_no, inspection_no, 'coordination'), '') as operatorName,
         isnull(dbo.joint_id(site, bu_no, inspection_no, 'responsible'), '') as responsiblePerson,
-        isnull(dbo.joint_name(site, bu_no, inspection_no, 'responsible'), '') as responsiblePersonName
+        isnull(dbo.joint_name2(site, bu_no, inspection_no, 'responsible'), '') as responsiblePersonName
         FROM qc_fai_record
         <where>
             site in (select site from eam_access_site where username = #{query.userName})
@@ -1922,7 +1922,7 @@
         isnull(dbo.joint_id(site, bu_no, inspection_no, 'coordination'), '') as operator,
         isnull(dbo.joint_name(site, bu_no, inspection_no, 'coordination'), '') as operatorName,
         isnull(dbo.joint_id(site, bu_no, inspection_no, 'responsible'), '') as responsiblePerson,
-        isnull(dbo.joint_name(site, bu_no, inspection_no, 'responsible'), '') as responsiblePersonName
+        isnull(dbo.joint_name2(site, bu_no, inspection_no, 'responsible'), '') as responsiblePersonName
         FROM qc_ipqc_record
         <where>
             site in (select site from eam_access_site where username = #{query.userName})
@@ -2281,7 +2281,7 @@
         isnull(dbo.joint_id(site, bu_no, inspection_no, 'coordination'), '') as operator,
         isnull(dbo.joint_name(site, bu_no, inspection_no, 'coordination'), '') as operatorName,
         isnull(dbo.joint_id(site, bu_no, inspection_no, 'responsible'), '') as responsiblePerson,
-        isnull(dbo.joint_name(site, bu_no, inspection_no, 'responsible'), '') as responsiblePersonName
+        isnull(dbo.joint_name2(site, bu_no, inspection_no, 'responsible'), '') as responsiblePersonName
         FROM qc_iqc_record
         <where>
             site in (select site from eam_access_site where username = #{query.userName})
@@ -2626,7 +2626,7 @@
         isnull(dbo.joint_id(site, bu_no, inspection_no, 'coordination'), '') as operator,
         isnull(dbo.joint_name(site, bu_no, inspection_no, 'coordination'), '') as operatorName,
         isnull(dbo.joint_id(site, bu_no, inspection_no, 'responsible'), '') as responsiblePerson,
-        isnull(dbo.joint_name(site, bu_no, inspection_no, 'responsible'), '') as responsiblePersonName
+        isnull(dbo.joint_name2(site, bu_no, inspection_no, 'responsible'), '') as responsiblePersonName
         FROM qc_fqc_record
         <where>
             site in (select site from eam_access_site where username = #{query.userName})
@@ -3515,6 +3515,23 @@
         from Equipment_folder_location
         where site = #{site} and bu_no = #{buNo}
     </select>
+
+    <!-- 获取责任人员列表 -->
+    <select id="getResponsibleOperatorList" resultType="EamAdminData" parameterType="EamAdminData">
+        SELECT
+            operator_id as adminID,
+            operator_name as adminName
+        FROM operator
+        <where>
+            site in (select site from eam_access_site where username = #{userName})
+            <if test = "adminID != null and adminID != ''">
+                AND operator_id LIKE '%' + #{adminID} + '%'
+            </if>
+            <if test = "adminName != null and adminName != ''">
+                AND operator_name LIKE '%' + #{adminName} + '%'
+            </if>
+        </where>
+    </select>
 </mapper>