feat: 修复

dev_no_inv
chenhc 10 months ago
parent 3d59c98962
commit 8346812955

@ -4,7 +4,7 @@ server:
spring: spring:
datasource: datasource:
driver-class-name: com.p6spy.engine.spy.P6SpyDriver driver-class-name: com.p6spy.engine.spy.P6SpyDriver
jdbc-url: jdbc:p6spy:mysql://dm.xmglxp.com:33066/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true jdbc-url: jdbc:p6spy:mysql://dm.xmglxp.com:33066/udi_wms_yxfy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
username: root username: root
password: Glxp@6066 password: Glxp@6066
hikari: hikari:

@ -157,12 +157,12 @@
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''"> <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND date_format(ico.billTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d') AND date_format(ico.billTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
</if> </if>
<if test="keywords != null and keywords != ''"> <!-- <if test="keywords != null and keywords != ''">-->
and (ico.billNo like concat('%', #{keywords}, '%') <!-- and (ico.billNo like concat('%', #{keywords}, '%')-->
or ico.fromCorp like concat('%', #{keywords}, '%') <!-- or ico.fromCorp like concat('%', #{keywords}, '%')-->
or ico.fromCorpName like concat('%', #{keywords}, '%') <!-- or ico.fromCorpName like concat('%', #{keywords}, '%')-->
or ico.fromType like concat('%', #{keywords}, '%')) <!-- or ico.fromType like concat('%', #{keywords}, '%'))-->
</if> <!-- </if>-->
</where> </where>
GROUP BY GROUP BY
ico.billNo ico.billNo

Loading…
Cancel
Save