From 895994ec4198a22b7e3311d9ce454fa0330a10d7 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Thu, 28 Sep 2023 15:02:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E6=9F=A5=E7=9C=8B=E5=B7=B2?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=9C=AA=E5=AE=A1=E6=A0=B8=EF=BC=8C=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=85=B3=E8=81=94=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application-dev.yml               |  2 +-
 .../mapper/auth/WarehouseBussinessTypeDao.xml        |  2 +-
 .../resources/mybatis/mapper/inout/IoOrderDao.xml    | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 3f6ea00c..f0db8fbc 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -3,7 +3,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms_ph?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari:
diff --git a/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml
index bfc1b9dc..a171a1c3 100644
--- a/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml
+++ b/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml
@@ -138,7 +138,7 @@
         from auth_warehouse_bustype
                      inner join basic_bussiness_type on auth_warehouse_bustype.action = basic_bussiness_type.action
         where code = #{code}
-        group by auth_warehouse_bustype.id
+        group by auth_warehouse_bustype.code
     </select>
 
 
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
index 4a922beb..e1e75cac 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
@@ -211,7 +211,7 @@
             </if>
             <if test="unionRemark != null and unionRemark != ''">
                 AND (io.remark like concat('%', #{unionRemark}, '%')
-                or io.outSickInfo like concat('%', #{unionRemark}, '%'))
+                        or io.outSickInfo like concat('%', #{unionRemark}, '%'))
             </if>
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 AND date_format(createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
@@ -273,7 +273,7 @@
                     <foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>
-                    and status = 7
+                    and (status = 7 or status = 10)
                             )
                 </if>
 
@@ -288,7 +288,7 @@
                     <foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>
-                    and status = 7)
+                    and (status = 7 or status = 10))
                             )
                 </if>
             </if>
@@ -322,8 +322,8 @@
                 AND fromCorp = #{fromCorp}
             </if>
             <if test="unionRemark != null and unionRemark != ''">
-                AND (io.remark like concat('%', #{unionRemark}, '%')
-                or io.outSickInfo like concat('%', #{unionRemark}, '%'))
+                AND (io_order.remark like concat('%', #{unionRemark}, '%')
+                        or io_order.outSickInfo like concat('%', #{unionRemark}, '%'))
             </if>
             <if test="customerId != null and customerId != ''">
                 AND customerId = #{customerId}
@@ -474,7 +474,7 @@
             </if>
             <if test="unionRemark != null and unionRemark != ''">
                 AND (io.remark like concat('%', #{unionRemark}, '%')
-                or io.outSickInfo like concat('%', #{unionRemark}, '%'))
+                        or io.outSickInfo like concat('%', #{unionRemark}, '%'))
             </if>
             <if test="inCodeStatus != null">
                 AND io.inCodeStatus = #{inCodeStatus}