From 9f2788cf9d695cfa40d4a74d754abf7169e4f680 Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Thu, 17 Nov 2022 16:28:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E4=BA=8B=E9=A1=B9=E6=A3=80=E7=B4=A2=E6=8A=A5=E5=B7=A5?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E3=80=81=E8=B4=A8=E9=87=8F=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=BA=8B=E9=A1=B9=E4=B8=8A=E6=8A=A5=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 anomaly/src/main/resources/mapper/AbnormalBillMapper.xml | 2 +-
 .../mesnac/quality/dto/InspectionTaskManageRequest.java  | 9 +++++++++
 .../main/resources/mapper/InspectionTaskManageMapper.xml | 3 +++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
index 23faa4fc..aea15b57 100644
--- a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
+++ b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
@@ -1012,7 +1012,7 @@
                     zab.SITE = #{abnormalBill.site}
                 </if>
                 <if test="abnormalBill.checkUsr != null and abnormalBill.checkUsr != ''">
-                    AND CFA.VALUE = #{abnormalBill.checkUsr}
+                    AND ZNU.FULL_NAME = #{abnormalBill.checkUsr}
                 </if>
                 <if test="abnormalBill.resrce != null and abnormalBill.resrce != ''">
                     AND zab.RESRCE = #{abnormalBill.resrce}
diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/dto/InspectionTaskManageRequest.java b/quality/src/main/java/com/foreverwin/mesnac/quality/dto/InspectionTaskManageRequest.java
index 326beb67..71e9ba91 100644
--- a/quality/src/main/java/com/foreverwin/mesnac/quality/dto/InspectionTaskManageRequest.java
+++ b/quality/src/main/java/com/foreverwin/mesnac/quality/dto/InspectionTaskManageRequest.java
@@ -25,6 +25,15 @@ public class InspectionTaskManageRequest implements Serializable {
     private String result;
     private String sfcdispatchBo;
     private String trueCheckUser;
+    private String dispatchUser;
+
+    public String getDispatchUser() {
+        return dispatchUser;
+    }
+
+    public void setDispatchUser(String dispatchUser) {
+        this.dispatchUser = dispatchUser;
+    }
 
     public String getTrueCheckUser() {
         return trueCheckUser;
diff --git a/quality/src/main/resources/mapper/InspectionTaskManageMapper.xml b/quality/src/main/resources/mapper/InspectionTaskManageMapper.xml
index 3c203125..8ae2194c 100644
--- a/quality/src/main/resources/mapper/InspectionTaskManageMapper.xml
+++ b/quality/src/main/resources/mapper/InspectionTaskManageMapper.xml
@@ -70,6 +70,9 @@
         <if test="checkUser != null and checkUser != ''">
             AND CF.VALUE = #{checkUser}
         </if>
+        <if test="dispatchUser != null and dispatchUser != ''">
+            AND ZSD.EMPLOYEE_DESCRIPTION = #{dispatchUser}
+        </if>
         <if test="trueCheckUser != null and trueCheckUser != ''">
             AND ZNU2.FULL_NAME like '%'||#{trueCheckUser}||'%'
         </if>