From ab91277787e79b7cef867cc4d674e9a54a20119d Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Fri, 16 Aug 2024 15:06:52 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9-?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B=E3=80=81=E6=9D=A5=E6=BA=90?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/glxp/api/res/basic/SysWorkplaceResponse.java | 3 +++
 src/main/resources/mybatis/mapper/auth/SysWorkplaceDao.xml     | 2 +-
 .../resources/mybatis/mapper/collect/IoCollectOrderMapper.xml  | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/res/basic/SysWorkplaceResponse.java b/src/main/java/com/glxp/api/res/basic/SysWorkplaceResponse.java
index db12686cf..99e62f131 100644
--- a/src/main/java/com/glxp/api/res/basic/SysWorkplaceResponse.java
+++ b/src/main/java/com/glxp/api/res/basic/SysWorkplaceResponse.java
@@ -24,4 +24,7 @@ public class SysWorkplaceResponse extends SysWorkplace {
 
     //单据名称
     private String busTypeName;
+
+    //单据来源系统
+    private String fromTypeName;
 }
diff --git a/src/main/resources/mybatis/mapper/auth/SysWorkplaceDao.xml b/src/main/resources/mybatis/mapper/auth/SysWorkplaceDao.xml
index d38bf43f3..714bd8fec 100644
--- a/src/main/resources/mybatis/mapper/auth/SysWorkplaceDao.xml
+++ b/src/main/resources/mybatis/mapper/auth/SysWorkplaceDao.xml
@@ -8,7 +8,7 @@
     </select>
     <select id="filterList" resultType="com.glxp.api.res.basic.SysWorkplaceResponse">
         select sw.*, aw.name invName,auth_user.employeeName as employeeName,scps.name as categoryName,
-        bcb.code as busTypeCode,bcb.name as busTypeName
+        bcb.code as busTypeCode,bcb.name as busTypeName,bcb.fromType as fromTypeName
         from sys_workplace sw
                  left join auth_warehouse aw on sw.invCode = aw.code
                  left join auth_user on sw.chargeUser = auth_user.id
diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
index 839a7a266..a8806f7e6 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
@@ -23,7 +23,7 @@
                 AND busType = #{busType}
             </if>
             <if test="fromType != null and fromType != ''">
-                AND fromType = #{fromType}
+                AND bcb.fromType LIKE concat('%', #{fromType}, '%')
             </if>
             <if test="fromCorp != '' and fromCorp != null">
                 AND fromCorp LIKE concat('%', #{fromCorp}, '%')