From 0bcb12f84236171ae4e1ef84e77c1a9280c52c7a Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Thu, 23 Dec 2021 14:02:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=20/screen/index/adv?=
 =?UTF-8?q?ancedbranchrank=20report/screen/user/partypointrank=20user/user?=
 =?UTF-8?q?pointrank/withoutpartymember=20=E5=A2=9E=E5=8A=A0customerId?=
 =?UTF-8?q?=E5=8F=AF=E9=80=89=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/dto/form/AdvancedBranchRankFormDTO.java          | 5 +++++
 .../screen/dto/form/PartyPointRankFormDTO.java              | 5 +++++
 .../screen/dto/form/UserPointRankFormDTO.java               | 4 ++++
 .../resources/mapper/screen/ScreenIndexDataMonthlyDao.xml   | 3 +++
 .../resources/mapper/screen/ScreenPartyUserRankDataDao.xml  | 6 ++++++
 5 files changed, 23 insertions(+)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AdvancedBranchRankFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AdvancedBranchRankFormDTO.java
index a3116f7c96..4c0cc40b42 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AdvancedBranchRankFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AdvancedBranchRankFormDTO.java
@@ -33,5 +33,10 @@ public class AdvancedBranchRankFormDTO implements Serializable {
      */
     private String areaCode;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
     public interface AddUserInternalGroup {}
 }
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/PartyPointRankFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/PartyPointRankFormDTO.java
index a47f3e2cb1..fbca1af11d 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/PartyPointRankFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/PartyPointRankFormDTO.java
@@ -36,5 +36,10 @@ public class PartyPointRankFormDTO implements Serializable {
      * */
     private String monthId;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 
 }
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/UserPointRankFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/UserPointRankFormDTO.java
index 397f50aa7d..8ab170d826 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/UserPointRankFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/UserPointRankFormDTO.java
@@ -36,5 +36,9 @@ public class UserPointRankFormDTO implements Serializable {
      * */
     private String monthId;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
 
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
index 9da7db0673..b41886353e 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
@@ -261,6 +261,9 @@
             dm.del_flag = '0'
         AND rd.del_flag = '0'
         <choose>
+            <when test="customerId != null and customerId != ''">
+                AND org.CUSTOMER_ID = #{customerId}
+            </when>
             <when test="areaCode != null and areaCode != ''">
                 AND org.AREA_CODE LIKE concat(#{areaCode}, '%')
             </when>
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
index 4e84fe035c..cdf670c98e 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
@@ -171,6 +171,9 @@
                 AND u.grid_id = #{orgId}
             </if>
         </if>
+        <if test="customerId != null and customerId != ''">
+            u.CUSTOMER_ID = #{customerId}
+        </if>
         ORDER BY
         u.point_total DESC,convert(u.user_name using gbk) ASC
         LIMIT #{topNum}
@@ -212,6 +215,9 @@
                     AND u.grid_id = #{orgId}
                 </if>
             </if>
+            <if test="customerId != null and customerId != ''">
+                    AND u.CUSTOMER_ID = #{customerId}
+            </if>
             ORDER BY
             u.point_total DESC
             LIMIT #{topNum}