Skip to content

J
jiedao-api-boot-master
Commit e2119947 authored by 332784038@qq.com's avatar 332784038@qq.com
Browse files
Options

Merge branch 'release-fix' into release

parents 61b11b55 101447ce
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 29 deletions
yudao-module-order/yudao-module-order-core/src/main/resources/mapper/order/OrderMapper.xml
View file @ e2119947
...@@ -434,10 +434,10 @@ ...@@ -434,10 +434,10 @@
AND o.release_ratio <![CDATA[ <= ]]> #{query.leReleaseRatio} AND o.release_ratio <![CDATA[ <= ]]> #{query.leReleaseRatio}
</if> </if>
<if test="query.geReleaseRatio != null "> <if test="query.geReleaseRatio != null ">
AND o.release_ratio <![CDATA[ >= ]]> #{geReleaseRatio} AND o.release_ratio <![CDATA[ >= ]]> #{query.geReleaseRatio}
</if> </if>
<if test="query.eqReleaseRatio != null "> <if test="query.eqReleaseRatio != null ">
AND o.release_ratio = #{eqReleaseRatio} AND o.release_ratio = #{query.eqReleaseRatio}
</if> </if>
<if test="query.searchKey != null and query.searchKey != '' "> <if test="query.searchKey != null and query.searchKey != '' ">
AND concat(IFNULL(o.`order_no`,''),IFNULL(o.`parent_number`,''),IFNULL(o.`initial_parent_order_no`,''), AND concat(IFNULL(o.`order_no`,''),IFNULL(o.`parent_number`,''),IFNULL(o.`initial_parent_order_no`,''),
...@@ -963,10 +963,10 @@ ...@@ -963,10 +963,10 @@
AND o.release_ratio <![CDATA[ <= ]]> #{query.leReleaseRatio} AND o.release_ratio <![CDATA[ <= ]]> #{query.leReleaseRatio}
</if> </if>
<if test="query.geReleaseRatio != null "> <if test="query.geReleaseRatio != null ">
AND o.release_ratio <![CDATA[ >= ]]> #{geReleaseRatio} AND o.release_ratio <![CDATA[ >= ]]> #{query.geReleaseRatio}
</if> </if>
<if test="query.eqReleaseRatio != null "> <if test="query.eqReleaseRatio != null ">
AND o.release_ratio = #{eqReleaseRatio} AND o.release_ratio = #{query.eqReleaseRatio}
</if> </if>
<if test="query.searchKey != null and query.searchKey != '' "> <if test="query.searchKey != null and query.searchKey != '' ">
AND concat(IFNULL(o.`order_no`,''),IFNULL(o.`parent_number`,''),IFNULL(o.`initial_parent_order_no`,''), AND concat(IFNULL(o.`order_no`,''),IFNULL(o.`parent_number`,''),IFNULL(o.`initial_parent_order_no`,''),
...@@ -1297,10 +1297,10 @@ ...@@ -1297,10 +1297,10 @@
AND o.release_ratio <![CDATA[ <= ]]> #{query.leReleaseRatio} AND o.release_ratio <![CDATA[ <= ]]> #{query.leReleaseRatio}
</if> </if>
<if test="query.geReleaseRatio != null "> <if test="query.geReleaseRatio != null ">
AND o.release_ratio <![CDATA[ >= ]]> #{geReleaseRatio} AND o.release_ratio <![CDATA[ >= ]]> #{query.geReleaseRatio}
</if> </if>
<if test="query.eqReleaseRatio != null "> <if test="query.eqReleaseRatio != null ">
AND o.release_ratio = #{eqReleaseRatio} AND o.release_ratio = #{query.eqReleaseRatio}
</if> </if>
<if test="query.searchKey != null and query.searchKey != '' "> <if test="query.searchKey != null and query.searchKey != '' ">
AND concat(IFNULL(o.`order_no`,''),IFNULL(o.`parent_number`,''),IFNULL(o.`initial_parent_order_no`,''), AND concat(IFNULL(o.`order_no`,''),IFNULL(o.`parent_number`,''),IFNULL(o.`initial_parent_order_no`,''),
...@@ -2479,10 +2479,10 @@ ...@@ -2479,10 +2479,10 @@
AND o.release_ratio <![CDATA[ <= ]]> #{query.leReleaseRatio} AND o.release_ratio <![CDATA[ <= ]]> #{query.leReleaseRatio}
</if> </if>
<if test="query.geReleaseRatio != null "> <if test="query.geReleaseRatio != null ">
AND o.release_ratio <![CDATA[ >= ]]> #{geReleaseRatio} AND o.release_ratio <![CDATA[ >= ]]> #{query.geReleaseRatio}
</if> </if>
<if test="query.eqReleaseRatio != null "> <if test="query.eqReleaseRatio != null ">
AND o.release_ratio = #{eqReleaseRatio} AND o.release_ratio = #{query.eqReleaseRatio}
</if> </if>
<if test="query.searchKey != null and query.searchKey != '' "> <if test="query.searchKey != null and query.searchKey != '' ">
AND concat(IFNULL(o.`order_no`,''), IFNULL(o.`old_numbers`,'') AND concat(IFNULL(o.`order_no`,''), IFNULL(o.`old_numbers`,'')
...@@ -2641,7 +2641,7 @@ ...@@ -2641,7 +2641,7 @@
</foreach> </foreach>
</if> </if>
<if test="query.airShipmentList.size() > 1"> <if test="query.airShipmentList.size() > 1">
(1!=1 AND (1!=1
<foreach item='airShipment' index="index" collection='query.airShipmentList'> <foreach item='airShipment' index="index" collection='query.airShipmentList'>
<choose> <choose>
<when test="airShipment == 1"> <when test="airShipment == 1">
...@@ -2784,14 +2784,14 @@ ...@@ -2784,14 +2784,14 @@
</if> </if>
<if test="query.statusList != null and query.statusList.size()>0"> <if test="query.statusList != null and query.statusList.size()>0">
<if test="query.statusList != null and query.statusList.size()==1 "> <if test="query.statusList.size()==1 ">
AND o.`status` = AND o.`status` =
<foreach item='status' index="index" collection='query.statusList' > <foreach item='status' index="index" collection='query.statusList' >
#{status} #{status}
</foreach> </foreach>
</if> </if>
<if test="query.statusList != null and query.statusList != '' and query.statusList.size()>1 "> <if test="and query.statusList.size()>1 ">
AND o.`status` in AND o.`status` in
<foreach item='status' index="index" collection='query.statusList' open='(' separator=',' close=')'> <foreach item='status' index="index" collection='query.statusList' open='(' separator=',' close=')'>
#{status} #{status}
...@@ -2883,14 +2883,14 @@ ...@@ -2883,14 +2883,14 @@
</if> </if>
<if test="query.shipmentStateList != null and query.shipmentStateList.size()>0"> <if test="query.shipmentStateList != null and query.shipmentStateList.size()>0">
<if test="query.shipmentStateList != null and query.shipmentStateList.size()==1 "> <if test=" query.shipmentStateList.size()==1 ">
AND o.`shipment_State` = AND o.`shipment_State` =
<foreach item='shipmentState' index="index" collection='query.shipmentStateList' > <foreach item='shipmentState' index="index" collection='query.shipmentStateList' >
#{shipmentState} #{shipmentState}
</foreach> </foreach>
</if> </if>
<if test="query.shipmentStateList != null and query.shipmentStateList.size()>1 "> <if test=" query.shipmentStateList.size()>1 ">
AND o.`shipment_State` in AND o.`shipment_State` in
<foreach item='shipmentState' index="index" collection='query.shipmentStateList' open='(' separator=',' close=')'> <foreach item='shipmentState' index="index" collection='query.shipmentStateList' open='(' separator=',' close=')'>
#{shipmentState} #{shipmentState}
...@@ -3348,10 +3348,10 @@ ...@@ -3348,10 +3348,10 @@
AND o.release_ratio <![CDATA[ <= ]]> #{query.leReleaseRatio} AND o.release_ratio <![CDATA[ <= ]]> #{query.leReleaseRatio}
</if> </if>
<if test="query.geReleaseRatio != null "> <if test="query.geReleaseRatio != null ">
AND o.release_ratio <![CDATA[ >= ]]> #{geReleaseRatio} AND o.release_ratio <![CDATA[ >= ]]> #{query.geReleaseRatio}
</if> </if>
<if test="query.eqReleaseRatio != null "> <if test="query.eqReleaseRatio != null ">
AND o.release_ratio = #{eqReleaseRatio} AND o.release_ratio = #{query.eqReleaseRatio}
</if> </if>
<if test="query.searchKey != null and query.searchKey != '' "> <if test="query.searchKey != null and query.searchKey != '' ">
AND concat(IFNULL(o.`order_no`,''), IFNULL(o.`old_numbers`,'') AND concat(IFNULL(o.`order_no`,''), IFNULL(o.`old_numbers`,'')
...@@ -3586,7 +3586,7 @@ ...@@ -3586,7 +3586,7 @@
</foreach> </foreach>
</if> </if>
<if test="query.airShipmentList.size() > 1"> <if test="query.airShipmentList.size() > 1">
(1!=1 AND (1!=1
<foreach item='airShipment' index="index" collection='query.airShipmentList'> <foreach item='airShipment' index="index" collection='query.airShipmentList'>
<choose> <choose>
<when test="airShipment == 1"> <when test="airShipment == 1">
...@@ -4208,10 +4208,10 @@ ...@@ -4208,10 +4208,10 @@
AND o.release_ratio <![CDATA[ <= ]]> #{query.leReleaseRatio} AND o.release_ratio <![CDATA[ <= ]]> #{query.leReleaseRatio}
</if> </if>
<if test="query.geReleaseRatio != null "> <if test="query.geReleaseRatio != null ">
AND o.release_ratio <![CDATA[ >= ]]> #{geReleaseRatio} AND o.release_ratio <![CDATA[ >= ]]> #{query.geReleaseRatio}
</if> </if>
<if test="query.eqReleaseRatio != null "> <if test="query.eqReleaseRatio != null ">
AND o.release_ratio = #{eqReleaseRatio} AND o.release_ratio = #{query.eqReleaseRatio}
</if> </if>
<if test="query.searchKey != null and query.searchKey != '' "> <if test="query.searchKey != null and query.searchKey != '' ">
AND concat(IFNULL(o.`order_no`,''), IFNULL(o.`old_numbers`,'') AND concat(IFNULL(o.`order_no`,''), IFNULL(o.`old_numbers`,'')
...@@ -5716,10 +5716,10 @@ ...@@ -5716,10 +5716,10 @@
AND o.release_ratio <![CDATA[ <= ]]> #{query.leReleaseRatio} AND o.release_ratio <![CDATA[ <= ]]> #{query.leReleaseRatio}
</if> </if>
<if test="query.geReleaseRatio != null "> <if test="query.geReleaseRatio != null ">
AND o.release_ratio <![CDATA[ >= ]]> #{geReleaseRatio} AND o.release_ratio <![CDATA[ >= ]]> #{query.geReleaseRatio}
</if> </if>
<if test="query.eqReleaseRatio != null "> <if test="query.eqReleaseRatio != null ">
AND o.release_ratio = #{eqReleaseRatio} AND o.release_ratio = #{query.eqReleaseRatio}
</if> </if>
<if test="query.searchKey != null and query.searchKey != '' "> <if test="query.searchKey != null and query.searchKey != '' ">
AND concat(IFNULL(o.`order_no`,''), IFNULL(o.`old_numbers`,'') AND concat(IFNULL(o.`order_no`,''), IFNULL(o.`old_numbers`,'')
...@@ -6205,7 +6205,6 @@ ...@@ -6205,7 +6205,6 @@
<if test="query.auditTypeList != null and query.auditTypeList.size()==1 "> <if test="query.auditTypeList != null and query.auditTypeList.size()==1 ">
<foreach item='auditType' index="index" collection='query.auditTypeList' > <foreach item='auditType' index="index" collection='query.auditTypeList' >
<choose> <choose>
<when test="auditType != 0"> <when test="auditType != 0">
<choose> <choose>
...@@ -6350,10 +6349,10 @@ ...@@ -6350,10 +6349,10 @@
AND o.release_ratio <![CDATA[ <= ]]> #{query.leReleaseRatio} AND o.release_ratio <![CDATA[ <= ]]> #{query.leReleaseRatio}
</if> </if>
<if test="query.geReleaseRatio != null "> <if test="query.geReleaseRatio != null ">
AND o.release_ratio <![CDATA[ >= ]]> #{geReleaseRatio} AND o.release_ratio <![CDATA[ >= ]]> #{query.geReleaseRatio}
</if> </if>
<if test="query.eqReleaseRatio != null "> <if test="query.eqReleaseRatio != null ">
AND o.release_ratio = #{eqReleaseRatio} AND o.release_ratio = #{query.eqReleaseRatio}
</if> </if>
<if test="query.searchKey != null and query.searchKey != '' "> <if test="query.searchKey != null and query.searchKey != '' ">
AND concat(IFNULL(o.`order_no`,''), IFNULL(o.`old_numbers`,'') AND concat(IFNULL(o.`order_no`,''), IFNULL(o.`old_numbers`,'')
...@@ -6651,14 +6650,13 @@ ...@@ -6651,14 +6650,13 @@
</if> </if>
<if test="query.shipmentStateList != null and query.shipmentStateList.size()>0"> <if test="query.shipmentStateList != null and query.shipmentStateList.size()>0">
<if test="query.shipmentStateList != null and query.shipmentStateList.size()==1 "> <if test="query.shipmentStateList.size()==1 ">
AND o.`shipment_State` = AND o.`shipment_State` =
<foreach item='shipmentState' index="index" collection='query.shipmentStateList' > <foreach item='shipmentState' index="index" collection='query.shipmentStateList' >
#{shipmentState} #{shipmentState}
</foreach> </foreach>
</if> </if>
<if test=" query.shipmentStateList.size()>1 ">
<if test="query.shipmentStateList != null and query.shipmentStateList.size()>1 ">
AND o.`shipment_State` in AND o.`shipment_State` in
<foreach item='shipmentState' index="index" collection='query.shipmentStateList' open='(' separator=',' close=')'> <foreach item='shipmentState' index="index" collection='query.shipmentStateList' open='(' separator=',' close=')'>
#{shipmentState} #{shipmentState}
...@@ -6832,10 +6830,10 @@ ...@@ -6832,10 +6830,10 @@
AND o.release_ratio <![CDATA[ <= ]]> #{query.leReleaseRatio} AND o.release_ratio <![CDATA[ <= ]]> #{query.leReleaseRatio}
</if> </if>
<if test="query.geReleaseRatio != null "> <if test="query.geReleaseRatio != null ">
AND o.release_ratio <![CDATA[ >= ]]> #{geReleaseRatio} AND o.release_ratio <![CDATA[ >= ]]> #{query.geReleaseRatio}
</if> </if>
<if test="query.eqReleaseRatio != null "> <if test="query.eqReleaseRatio != null ">
AND o.release_ratio = #{eqReleaseRatio} AND o.release_ratio = #{query.eqReleaseRatio}
</if> </if>
<if test="query.searchKey != null and query.searchKey != '' "> <if test="query.searchKey != null and query.searchKey != '' ">
AND concat(IFNULL(o.`order_no`,''), IFNULL(o.`old_numbers`,'') AND concat(IFNULL(o.`order_no`,''), IFNULL(o.`old_numbers`,'')
......
yudao-server/src/main/resources/application-dev.yaml
View file @ e2119947
...@@ -170,7 +170,7 @@ spring: ...@@ -170,7 +170,7 @@ spring:
logging: logging:
level: level:
root: INFO root: INFO
cn.iocoder.yudao: INFO cn.iocoder.yudao: DEBUG
--- #################### 微信公众号相关配置 #################### --- #################### 微信公众号相关配置 ####################
wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md 文档 wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md 文档
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment