Merge branch 'dev'

# Conflicts:
#	epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
#	epmet-module/data-report/data-report-server/pom.xml

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 {}
 }

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;
+
 
 }

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;
 
 }

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>

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}