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
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 @@
AND (io.remark like concat('%', #{unionRemark}, '%')
- or io.outSickInfo like concat('%', #{unionRemark}, '%'))
+ or io.outSickInfo like concat('%', #{unionRemark}, '%'))
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 @@
#{item}
- and status = 7
+ and (status = 7 or status = 10)
)
@@ -288,7 +288,7 @@
#{item}
- and status = 7)
+ and (status = 7 or status = 10))
)
@@ -322,8 +322,8 @@
AND fromCorp = #{fromCorp}
- 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}, '%'))
AND customerId = #{customerId}
@@ -474,7 +474,7 @@
AND (io.remark like concat('%', #{unionRemark}, '%')
- or io.outSickInfo like concat('%', #{unionRemark}, '%'))
+ or io.outSickInfo like concat('%', #{unionRemark}, '%'))
AND io.inCodeStatus = #{inCodeStatus}