From 10fb74cf70c92ef971e4e1cf4e5524ce6129d9ae Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Mon, 7 Apr 2025 15:32:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E5=88=86=E9=85=8D=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op/open/service/impl/OpenServiceImpl.java    | 16 ++++++++--------
 .../main/resources/mapper/open/OpenMapper.xml    |  4 +---
 .../controller/QcCheckTypeProjectController.java |  2 +-
 .../com/op/quality/domain/QcUserMaterial.java    |  9 +++++++++
 .../service/impl/QcUserMaterialServiceImpl.java  | 15 ++++++++++++++-
 .../mapper/quality/QcCheckTaskIncomeMapper.xml   |  6 ++----
 6 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
index 61f7a06bb..dc7a63064 100644
--- a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
+++ b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
@@ -432,14 +432,14 @@ public class OpenServiceImpl implements OpenService {
         if (CollectionUtils.isEmpty(users)) {
             users = openMapper.getCheckUsers(qcCheckTaskProduce.getCheckType());
         }
-            for (QcUserMaterialDTO user : users) {
-                user.setId(IdUtils.fastSimpleUUID());
-                user.setBelongTo(beLongId);
-                user.setCheckNo(qcCheckTaskProduce.getCheckNo());
-                user.setCreateBy(createBy);
-                user.setFactoryCode(factoryCode);
-                user.setCreateTime(nowDate);
-            }
+        for (QcUserMaterialDTO user : users) {
+            user.setId(IdUtils.fastSimpleUUID());
+            user.setBelongTo(beLongId);
+            user.setCheckNo(qcCheckTaskProduce.getCheckNo());
+            user.setCreateBy(createBy);
+            user.setFactoryCode(factoryCode);
+            user.setCreateTime(nowDate);
+        }
         /**qc_check_task_user**/
         int m = openMapper.addCheckUsers(users);
         logger.info(qcCheckTaskProduce.getOrderNo()+":检查人新增" + m + "成功");
diff --git a/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml b/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml
index ab9ba336e..2d45742f4 100644
--- a/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml
+++ b/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml
@@ -228,9 +228,7 @@
             qum.user_name userName
         from qc_user_material qum
         where qum.material_code = #{checkType} and qum.del_flag = '0'
-        and qum.attr2 in(
-            select workorder_name from pro_order_workorder where workorder_code = #{orderNo} and del_flag = '0'
-        )
+        and qum.attr2 like concat ('%',#{checkLoc},'%')
     </select>
     <select id="getSampNum" resultType="java.lang.String">
             select sample_quality
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTypeProjectController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTypeProjectController.java
index 536eaca88..ef9a2c140 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTypeProjectController.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTypeProjectController.java
@@ -194,7 +194,7 @@ public class QcCheckTypeProjectController extends BaseController {
      * 导入订单信息接口
      *
      * @param file
-     * @return
+     * @return/updateBelongTo
      * @throws Exception
      */
     @Log(title = "导入线体产品信息", businessType = BusinessType.IMPORT)
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcUserMaterial.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcUserMaterial.java
index c4bdb7e27..c8dceb98a 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcUserMaterial.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcUserMaterial.java
@@ -101,11 +101,20 @@ public class QcUserMaterial extends BaseEntity {
     private String[] userCodes;
     private String[] userNames;
     private String[] attr1List;
+    private String[] attr2List;
     private String label;
     private String key;
 
     private List<String> selectedValues;
 
+    public String[] getAttr2List() {
+        return attr2List;
+    }
+
+    public void setAttr2List(String[] attr2List) {
+        this.attr2List = attr2List;
+    }
+
     public void setId(String id) {
         this.id = id;
     }
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcUserMaterialServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcUserMaterialServiceImpl.java
index df2b47454..5c1125aa0 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcUserMaterialServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcUserMaterialServiceImpl.java
@@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
 import com.op.quality.mapper.QcUserMaterialMapper;
 import com.op.quality.domain.QcUserMaterial;
 import com.op.quality.service.IQcUserMaterialService;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
@@ -122,6 +123,9 @@ public class QcUserMaterialServiceImpl implements IQcUserMaterialService {
     @DS("#header.poolName")
     public int updateQcUserMaterial(QcUserMaterial qcUserMaterial) {
         qcUserMaterial.setUpdateTime(DateUtils.getNowDate());
+        if(qcUserMaterial.getAttr2List().length>0){
+            qcUserMaterial.setAttr2(String.join(", ", qcUserMaterial.getAttr2List()));
+        }
         return qcUserMaterialMapper.updateQcUserMaterial(qcUserMaterial);
     }
 
@@ -183,7 +187,16 @@ public class QcUserMaterialServiceImpl implements IQcUserMaterialService {
     @Override
     @DS("#header.poolName")
     public List<QcUserMaterial> getSelectedUsers(QcUserMaterial qcUserMaterial) {
-        return qcUserMaterialMapper.getSelectedUsers(qcUserMaterial);
+        List<QcUserMaterial> dtos = qcUserMaterialMapper.getSelectedUsers(qcUserMaterial);
+        for(QcUserMaterial dto:dtos){
+            String str = dto.getAttr2();
+            if(StringUtils.isNotBlank(str)){
+                // 以逗号和空格为分隔符分割字符串
+                String[] array = str.split(", ");
+                dto.setAttr2List(array);
+            }
+        }
+        return dtos;
     }
 
     @Override
diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml
index 598ec7b30..8b4de7f98 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml
@@ -593,7 +593,7 @@
                qum.user_name userName
         from qc_user_material qum
         where qum.material_code = #{checkType} and qum.del_flag = '0'
-        and qum.attr2 = #{belongTo}
+        and qum.attr2 like concat ('%',#{belongTo},'%')
         <if test = "orderType!=null">
             and qum.attr1 = #{orderType}
         </if>
@@ -901,9 +901,7 @@
                qum.user_name userName
         from qc_user_material qum
         where qum.material_code = #{checkType} and qum.del_flag = '0'
-          and qum.attr2 in(
-            select workorder_name from pro_order_workorder where workorder_code = #{orderNo} and del_flag = '0'
-        )
+          and qum.attr2 like concat ('%',#{checkLoc},'%')
     </select>
 
     <!--批量更新原始表-->