feat 添加客户维护地址数量功能

opt: 修改客户历史表查询方式

src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java

@@ -452,6 +452,8 @@ public class BmsSupplier implements Serializable {
         userSupplier.setBizRegionFourthly(this.getRegion2Fourthly());
         userSupplier.setSupplierFlag(this.getSupplierFlag());
         userSupplier.setType(type);
+        userSupplier.setCountAddr(this.getCountAddr());
+        userSupplier.setCountAddrFlag(this.getCountAddrFlag());
         userSupplier.setCostFlag(this.costFlag);
         userSupplier.setStopFlag(this.stopFlag);
         userSupplier.setStopFlagDate(this.stopFlagDate);

src/main/java/com/qs/serve/modules/his/entity/HisUserSupplierTemp.java

@@ -111,6 +111,19 @@ public class HisUserSupplierTemp implements Serializable {
     /** 闭户 */
     private Integer stopFlag;
 
+
+    /** 统计维护的地址数量 */
+    @TableField(exist = false)
+    private Integer countAddr;
+
+    /**
+     * 查询维护的地址
+     * countAddrFlag=0 表示未维护的收货地址
+     * countAddrFlag=1 表示已维护的收货地址
+     */
+    @TableField(exist = false)
+    private Integer countAddrFlag;
+
     /** 闭户日期 */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")

src/main/resources/application.yml

@@ -58,7 +58,7 @@ logging:
     ROOT: info
     com.qs.serve: debug
     #com.qs.serve.modules.his: info
-    #com.qs.serve.modules.sys: debug
+    com.qs.serve.modules.sys: info
     com.qs.serve.modules.tag: info
     org.xnio.nio: info
     org.springframework: info

src/main/resources/mapper/bms/BmsSupplierMapper.xml

@@ -91,9 +91,9 @@
         left join (select count(1) as count_addr,supplier_id from bms_supplier_address where del_flag = 0 group by supplier_id) supplier_addr
         on supplier_addr.supplier_id = bms_supplier.id
         <where>
-<!--            <if test="query.countAddr != null"> and `supplier_addr`.`count_addr` = #{query.countAddr} </if>-->
-<!--            <if test="query.countAddrFlag != null and query.countAddrFlag=0 "> and `supplier_addr`.`count_addr` is null </if>-->
-<!--            <if test="query.countAddrFlag != null and query.countAddrFlag=1 "> and `supplier_addr`.`count_addr` is not null </if>-->
+            <if test="query.countAddr != null"> and `supplier_addr`.`count_addr` = #{query.countAddr} </if>
+            <if test="query.countAddrFlag != null and query.countAddrFlag==0 "> and `supplier_addr`.`count_addr` is null </if>
+            <if test="query.countAddrFlag != null and query.countAddrFlag==1 "> and `supplier_addr`.`count_addr` =#{query.countAddrFlag} </if>
             <if test="query.id != null"> and `bms_supplier`.`id` = #{query.id}</if>
             <if test="query.regionFirst != null"> and `bms_supplier`.`region_first` = #{query.regionFirst}</if>
             <if test="query.regionSecond != null"> and `bms_supplier`.`region_second` = #{query.regionSecond}</if>

src/main/resources/mapper/his/HisUserSupplierMapper.xml

@@ -73,8 +73,13 @@
     <select id="selectSupplierIdByQuery" resultType="java.lang.Long">
         select distinct his_user_supplier.supplier_id
         from his_user_supplier
+        left join (select count(1) as count_addr,supplier_id from bms_supplier_address where del_flag = 0 group by supplier_id) supplier_addr
+        on supplier_addr.supplier_id = his_user_supplier.supplier_id
         where
         his_user_supplier.supplier_id != 0
+        <if test="query.countAddr != null"> and `supplier_addr`.`count_addr` = #{query.countAddr} </if>
+        <if test="query.countAddrFlag != null and query.countAddrFlag==0 "> and `supplier_addr`.`count_addr` is null </if>
+        <if test="query.countAddrFlag != null and query.countAddrFlag==1 "> and `supplier_addr`.`count_addr` =#{query.countAddrFlag} </if>
         <if test="query.queryValue != null and query.queryValue != ''">
          and
          (