Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/operate/SettlementOfflineService.java

@@ -78,6 +78,7 @@ public class SettlementOfflineService {
             }
             settlementOfflineVo.setPayPrice(df.format(Objects.isNull(a.getPayPrice()) ? new BigDecimal("0.0") : a.getPayPrice()));
             settlementOfflineVo.setTopayPrice(df.format(Objects.isNull(a.getTopayPrice()) ? new BigDecimal("0.0") : a.getTopayPrice()));
+            settlementOfflineVo.appendPrefix();
             return settlementOfflineVo;
         }).collect(Collectors.toList());
         return PageRes.build(pageInfo, collect);

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/ManagementLogisticsOrderVO.java

@@ -102,6 +102,11 @@ public class ManagementLogisticsOrderVO /*extends PageRequest*/ {
      * 装货区域名称
      */
     private String loadCityName;
+
+    /**
+     * 装货区域code
+     */
+    private String loadCityCode;
     /**
      * 数据库id
      */
@@ -205,6 +210,11 @@ public class ManagementLogisticsOrderVO /*extends PageRequest*/ {
      * 卸货区域名称
      */
     private String unloadCityName;
+
+    /**
+     * 卸货区域code
+     */
+    private String unloadCityCode;
 //    /**
 //     * 关联承运订单号
 //     */

sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderMapper.xml

@@ -1439,10 +1439,10 @@
                 and a.create_time <=#{query.createEndTime}
             </if>
             <if test="query.loadAddressCode != null and query.loadAddressCode != ''">
-                and b.city_code = #{query.loadAddressCode}
+                and b.city_code LIKE CONCAT(#{query.loadAddressCode},'%')
             </if>
             <if test="query.unloadAddressCode != null and query.unloadAddressCode != ''">
-                and c.city_code = #{query.unloadAddressCode}
+                and c.city_code LIKE CONCAT(#{query.unloadAddressCode},'%')
             </if>
             <if test="query.billingMode != null and query.billingMode != ''">
                 and a.billing_mode =#{query.billingMode}
@@ -1611,13 +1611,13 @@
                 and a.create_time &lt;=#{query.createEndTime}
             </if>
             <if test="query.loadAddressCode != null and query.loadAddressCode != ''">
-                and b.city_code = #{query.loadAddressCode}
+                and b.city_code LIKE CONCAT(#{query.loadAddressCode},'%')
             </if>
             <if test="query.unloadAddressCode != null and query.unloadAddressCode != ''">
-                and c.city_code = #{query.unloadAddressCode}
+                and c.city_code LIKE CONCAT(#{query.unloadAddressCode},'%')
             </if>
             <if test="query.billingMode != null and query.billingMode != ''">
-                and a.billing_mode =#{query.billingMode}
+                and a.billing_mode = #{query.billingMode}
             </if>
         </where>
         group by a.status
@@ -2177,10 +2177,10 @@
                 and a.create_time &lt;=#{query.createEndTime}
             </if>
             <if test="query.loadAddressCode != null and query.loadAddressCode != ''">
-                and b.city_code = #{query.loadAddressCode}
+                and b.city_code  LIKE CONCAT(#{query.loadAddressCode},'%')
             </if>
             <if test="query.unloadAddressCode != null and query.unloadAddressCode != ''">
-                and c.city_code = #{query.unloadAddressCode}
+                and c.city_code LIKE CONCAT(#{query.unloadAddressCode},'%')
             </if>
             <if test="query.billingMode != null and query.billingMode != ''">
                 and a.billing_mode =#{query.billingMode}
@@ -2269,10 +2269,11 @@
                 and a.create_time &lt;=#{query.createEndTime}
             </if>
             <if test="query.loadAddressCode != null and query.loadAddressCode != ''">
-                and b.city_code = #{query.loadAddressCode}
+<!--                and b.city_code = #{query.loadAddressCode}-->
+                and b.city_code LIKE CONCAT(#{query.loadAddressCode},'%')
             </if>
             <if test="query.unloadAddressCode != null and query.unloadAddressCode != ''">
-                and c.city_code = #{query.unloadAddressCode}
+                and c.city_code LIKE CONCAT(#{query.unloadAddressCode},'%')
             </if>
             <if test="query.billingMode != null and query.billingMode != ''">
                 and a.billing_mode =#{query.billingMode}
@@ -2363,10 +2364,12 @@
                 and a.create_time &lt;=#{query.createEndTime}
             </if>
             <if test="query.loadAddressCode != null and query.loadAddressCode != ''">
-                and b.city_code = #{query.loadAddressCode}
+<!--                and b.city_code = #{query.loadAddressCode}-->
+                and b.city_code LIKE CONCAT(#{query.loadAddressCode},'%')
             </if>
             <if test="query.unloadAddressCode != null and query.unloadAddressCode != ''">
-                and c.city_code = #{query.unloadAddressCode}
+<!--                and c.city_code = #{query.unloadAddressCode}-->
+                and c.city_code LIKE CONCAT(#{query.unloadAddressCode},'%')
             </if>
             <if test="query.billingMode != null and query.billingMode != ''">
                 and a.billing_mode =#{query.billingMode}
@@ -2457,10 +2460,10 @@
                 and a.create_time &lt;=#{query.createEndTime}
             </if>
             <if test="query.loadAddressCode != null and query.loadAddressCode != ''">
-                and b.city_code = #{query.loadAddressCode}
+                and b.city_code LIKE CONCAT(#{query.loadAddressCode},'%')
             </if>
             <if test="query.unloadAddressCode != null and query.unloadAddressCode != ''">
-                and c.city_code = #{query.unloadAddressCode}
+                and c.city_code LIKE CONCAT(#{query.unloadAddressCode},'%')
             </if>
             <if test="query.billingMode != null and query.billingMode != ''">
                 and a.billing_mode =#{query.billingMode}
@@ -2550,10 +2553,12 @@
                 and a.create_time &lt;=#{query.createEndTime}
             </if>
             <if test="query.loadAddressCode != null and query.loadAddressCode != ''">
-                and b.city_code = #{query.loadAddressCode}
+<!--                and b.city_code = #{query.loadAddressCode}-->
+                and b.city_code LIKE CONCAT(#{query.loadAddressCode},'%')
             </if>
             <if test="query.unloadAddressCode != null and query.unloadAddressCode != ''">
-                and c.city_code = #{query.unloadAddressCode}
+<!--                and c.city_code = #{query.unloadAddressCode}-->
+                and c.city_code LIKE CONCAT(#{query.unloadAddressCode},'%')
             </if>
             <if test="query.billingMode != null and query.billingMode != ''">
                 and a.billing_mode =#{query.billingMode}