From 823c3570f03f4d3d58ebdab74a8f8e957f49ec6b Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Wed, 16 Sep 2020 10:42:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E7=BA=A7=E7=BB=84=E7=BB=87/=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E6=8C=87=E6=95=B0=E6=8E=92=E8=A1=8C=20=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=20=20=20=E9=83=A8=E9=97=A8=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/datareport/controller/screen/IndexController.java    | 2 +-
 .../dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java  | 2 +-
 .../service/evaluationindex/screen/IndexService.java           | 2 +-
 .../service/evaluationindex/screen/impl/IndexServiceImpl.java  | 2 +-
 .../main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml | 3 ++-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java
index fd3564c53b..6da1ba9359 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java
@@ -67,8 +67,8 @@ public class IndexController {
     }
 
     /**
-     * @Description  4、下级部门指数排行
      * @param subAgencyIndexRankFormDTO
+     * @Description 4、下级组织/部门指数排行 (不包含部门的数据)
      * @author zxc
      * @date 2020/8/20 10:02 上午
      */
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java
index 3128862ece..cc6c9e9e2b 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java
@@ -54,8 +54,8 @@ public interface ScreenIndexDataMonthlyDao{
     List<MonthBarchartResult> selectMonthBarchart(@Param("agencyId")String agencyId);
 
     /**
-     * @Description  4、下级部门指数排行
      * @param subAgencyIndexRankFormDTO
+     * @Description 4、下级组织/部门指数排行 (不包含部门的数据)
      * @author zxc
      * @date 2020/8/20 10:04 上午
      */
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/IndexService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/IndexService.java
index 761d369b7a..4ff9cf0fd4 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/IndexService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/IndexService.java
@@ -38,8 +38,8 @@ public interface IndexService {
     MonthBarchartResultDTO monthBarchart(MonthBarchartFormDTO monthBarchartFormDTO);
 
     /**
-     * @Description  4、下级部门指数排行
      * @param subAgencyIndexRankFormDTO
+     * @Description 4、下级组织/部门指数排行 (不包含部门的数据)
      * @author zxc
      * @date 2020/8/20 10:04 上午
      */
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java
index b0c9715031..651fa7484f 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java
@@ -179,8 +179,8 @@ public class IndexServiceImpl implements IndexService {
     }
 
     /**
-     * @Description  4、下级部门指数排行
      * @param subAgencyIndexRankFormDTO
+     * @Description 4、下级组织/部门指数排行 (不包含部门的数据)
      * @author zxc
      * @date 2020/8/20 10:04 上午
      */
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 0a040c2ccb..57c70a403c 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
@@ -43,7 +43,7 @@
             LIMIT 12
     </select>
 
-    <!-- 下级部门指数排行 -->
+    <!-- 下级组织/部门指数排行 (不包含部门的数据) -->
     <select id="selectSubAgencyIndexRank" parameterType="com.epmet.evaluationindex.screen.dto.form.SubAgencyIndexRankFormDTO" resultType="com.epmet.evaluationindex.screen.dto.result.SubAgencyIndexRankResultDTO">
         SELECT
             org_name AS NAME,
@@ -57,6 +57,7 @@
             del_flag = '0'
             AND parent_id = #{agencyId}
             AND year_id = #{yearId}
+            AND ORG_TYPE != 'department'
         ORDER BY index_total DESC
             LIMIT #{topNum}
     </select>