From b9d53b1b8a1d5b31dc74e6cb9f1f948be5341539 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Wed, 30 Sep 2020 10:50:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E7=BA=A7=E6=8C=87=E6=95=B0=E6=8E=92?=
 =?UTF-8?q?=E8=A1=8C=20=E6=B7=BB=E5=8A=A0orgType=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/dto/form/SubAgencyIndexRankYMFormDTO.java     | 5 +++++
 .../resources/mapper/screen/ScreenIndexDataYearlyDao.xml | 9 ++++++++-
 .../screen/impl/ScreenCustomerDeptServiceImpl.java       | 1 +
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/SubAgencyIndexRankYMFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/SubAgencyIndexRankYMFormDTO.java
index fc7e43593e..e973fefa50 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/SubAgencyIndexRankYMFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/SubAgencyIndexRankYMFormDTO.java
@@ -48,4 +48,9 @@ public class SubAgencyIndexRankYMFormDTO implements Serializable {
      * 月份Id
      */
     private String monthId;
+
+    /**
+     * 组织类型 组织：agency  网格：grid
+     */
+    private String orgType;
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
index 6c0ebfb5e8..5b445202d5 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
@@ -13,7 +13,6 @@
             screen_index_data_yearly
         WHERE
             del_flag = '0'
-            AND org_type = 'agency'
             AND org_id = #{agencyId}
             AND year_id = DATE_FORMAT(NOW(),'%Y')
     </select>
@@ -34,6 +33,14 @@
         del_flag = '0'
         AND parent_id = #{agencyId}
         AND year_id = YEAR(CURDATE())
+        <choose>
+            <when test="orgType != null and orgType != ''">
+                AND ORG_TYPE = #{orgType,jdbcType=VARCHAR}
+            </when>
+            <otherwise>
+                AND ORG_TYPE != 'department'
+            </otherwise>
+        </choose>
         <if test="sort == 'asc'">
             ORDER BY index_total ASC
         </if>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerDeptServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerDeptServiceImpl.java
index 037681a247..95e7f066c0 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerDeptServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerDeptServiceImpl.java
@@ -61,6 +61,7 @@ public class ScreenCustomerDeptServiceImpl extends BaseServiceImpl<ScreenCustome
      * @param depts2Add
      * @param depts2Update
      */
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public void addAndUpdateDepartments(List<CustomerDepartmentEntity> depts2Add, List<CustomerDepartmentEntity> depts2Update) {
         String dateStr = DateUtils.format(new Date(), "YYYYmmdd");