From 7c9247a11f5edffaebd1aeba648eab49167b8c1b Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Thu, 6 Jun 2024 11:30:45 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E6=B7=BB=E5=8A=A0=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E5=9C=B0=E5=9D=80=E6=95=B0=E9=87=8F=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=20opt:=20=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qs/serve/modules/bms/entity/BmsSupplier.java    |  2 ++
 .../modules/his/entity/HisUserSupplierTemp.java     | 13 +++++++++++++
 src/main/resources/application.yml                  |  2 +-
 src/main/resources/mapper/bms/BmsSupplierMapper.xml |  6 +++---
 .../resources/mapper/his/HisUserSupplierMapper.xml  |  5 +++++
 5 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java
index 79203ae1..86c8e4f4 100644
--- a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java
+++ b/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);
diff --git a/src/main/java/com/qs/serve/modules/his/entity/HisUserSupplierTemp.java b/src/main/java/com/qs/serve/modules/his/entity/HisUserSupplierTemp.java
index 2d9db50b..ed44f216 100644
--- a/src/main/java/com/qs/serve/modules/his/entity/HisUserSupplierTemp.java
+++ b/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")
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index fc9ee4a8..18d6ec1e 100644
--- a/src/main/resources/application.yml
+++ b/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
diff --git a/src/main/resources/mapper/bms/BmsSupplierMapper.xml b/src/main/resources/mapper/bms/BmsSupplierMapper.xml
index 79bb958a..65a03216 100644
--- a/src/main/resources/mapper/bms/BmsSupplierMapper.xml
+++ b/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>
diff --git a/src/main/resources/mapper/his/HisUserSupplierMapper.xml b/src/main/resources/mapper/his/HisUserSupplierMapper.xml
index 20be5ea7..c55c6444 100644
--- a/src/main/resources/mapper/his/HisUserSupplierMapper.xml
+++ b/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
          (