From 94a054273b0e62017da6e88ca9454a0404147bde Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 26 Nov 2021 21:00:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E6=A0=87=E6=95=B0=E6=8D=AE=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2bug2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/screen/ScreenIndexDataMonthlyDao.xml   | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

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 8e29ff2cec..9da7db0673 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
@@ -307,12 +307,21 @@
         </if>
 
         WHERE
-        score.del_flag = '0'
+            score.del_flag = '0'
+            AND score.MONTH_ID = #{monthId,jdbcType=VARCHAR}
         <if test="customerId != null and customerId != ''">
             AND score.CUSTOMER_ID = #{customerId,jdbcType=VARCHAR}
         </if>
-        AND score.PARENT_ID = #{agencyId,jdbcType=VARCHAR}
-        AND score.MONTH_ID = #{monthId,jdbcType=VARCHAR}
+        <!--孔村镇ID 则跳过 直接查社区级别的-->
+        <choose>
+            <when test="agencyId == '1234085031077498881'">
+                AND org.PIDS like  concat(#{agencyId},'%')
+                AND org.LEVEL = 'community'
+            </when>
+            <otherwise>
+                AND score.PARENT_ID = #{agencyId,jdbcType=VARCHAR}
+            </otherwise>
+        </choose>
         <choose>
             <when test="orgType != null and orgType != ''">
                 AND score.ORG_TYPE = #{orgType,jdbcType=VARCHAR}