From dc2c77d18ac631ad81d1a53dba3578323d8c0a8e Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Wed, 10 Apr 2024 11:23:20 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/plan/ProOrderWorkorderMapper.xml  |  6 +++---
 .../com/op/quality/mapper/QcCheckTaskIncomeMapper.java |  2 ++
 .../service/impl/QcCheckTaskIncomeServiceImpl.java     |  2 +-
 .../mapper/quality/QcCheckTaskIncomeMapper.xml         | 10 ++++++++++
 .../system/service/impl/SysDatasourceServiceImpl.java  |  5 +++++
 5 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
index ef438b38..df8ce078 100644
--- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
+++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
@@ -116,12 +116,12 @@
                 #{workorderName}, '%')
             </if>
             <if test="orderId != null  and orderId != ''">and pow.order_id = #{orderId}</if>
-            <if test="orderCode != null  and orderCode != ''">and pow.order_code like concat('%', #{orderCode}, '%')</if>
+            <if test="orderCode != null  and orderCode != ''">and pow.workorder_code_sap like concat('%', #{orderCode}, '%')</if>
             <if test="productCode != null  and productCode != ''">
-                and ppow.product_code like concat('%', #{productCode},'%')
+                and pow.product_code like concat('%', #{productCode},'%')
             </if>
             <if test="productName != null  and productName != ''">
-                and ppow.product_name like concat('%', #{productName},'%')
+                and pow.product_name like concat('%', #{productName},'%')
             </if>
             <if test="productDate != null ">and pow.product_date = #{productDate}</if>
             <if test="shiftId != null  and shiftId != ''">and pow.shift_id = #{shiftId}</if>
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java
index 36465d1c..cb0a3676 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java
@@ -90,6 +90,8 @@ public interface QcCheckTaskIncomeMapper {
 
     List<QcUserMaterialDTO> getUserByCheckType(String checkType);
 
+    List<QcUserMaterialDTO> getCheckUser(QcCheckTaskIncome qcCheckTaskIncome);
+
     int addCheckUsers(@Param("list") List<QcUserMaterialDTO> users);
 
     int addQcCheckTaskDefects(@Param("list") List<QcCheckTaskDefect> defects);
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
index 4ef7ca3f..ce575efd 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
@@ -220,7 +220,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 			qcCheckTaskIncome.setCheckManName("");
 			qcCheckTaskIncome.setCheckManCode("");
 			/**qc_user_material取默认检查人**/
-			List<QcUserMaterialDTO> users = qcCheckTaskIncomeMapper.getUserByCheckType(qcCheckTaskIncome.getCheckType());
+			List<QcUserMaterialDTO> users = qcCheckTaskIncomeMapper.getCheckUser(qcCheckTaskIncome);
 			if(CollectionUtils.isEmpty(users)){
 				QcUserMaterialDTO dto0 = new QcUserMaterialDTO();
 				dto0.setId(IdUtils.fastSimpleUUID());
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 2cf55975..75b79be5 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
@@ -351,6 +351,16 @@
         where material_code = #{checkType} and del_flag = '0'
     </select>
 
+    <select id="getCheckUser" resultType="com.op.system.api.domain.quality.QcUserMaterialDTO">
+        select user_code userCode,
+               user_name userName
+        from qc_user_material
+        where material_code = #{checkType} and del_flag = '0'
+          <if test = "orderType!=null">
+             and attr1 = #{orderType}
+          </if>
+    </select>
+
     <select id="getCkeckDefectList" resultType="com.op.quality.domain.QcCheckTaskDefect">
 		select
 			qctd.defect_code defectCode,
diff --git a/op-modules/op-system/src/main/java/com/op/system/service/impl/SysDatasourceServiceImpl.java b/op-modules/op-system/src/main/java/com/op/system/service/impl/SysDatasourceServiceImpl.java
index c7a63422..4a2cfedc 100644
--- a/op-modules/op-system/src/main/java/com/op/system/service/impl/SysDatasourceServiceImpl.java
+++ b/op-modules/op-system/src/main/java/com/op/system/service/impl/SysDatasourceServiceImpl.java
@@ -102,6 +102,11 @@ public class SysDatasourceServiceImpl implements ISysDatasourceService {
         //修改之后status->1 不生效，需要重新测试链接才生效
         sysDatasource.setStatus("1");
         sysDatasource.setUpdateTime(DateUtils.getNowDate());
+        if (StringUtils.isNotEmpty(sysDatasource.getIpPort())) {
+            sysDatasource.setUrl(mysqlPrev + sysDatasource.getIpPort().split("/")[0]
+                    + mysqlAffter + sysDatasource.getIpPort().split("/")[1]);
+        }
+
         return sysDatasourceMapper.updateSysDatasource(sysDatasource);
     }