From ba938a99587a7ce836401cb5fd25d5313bc74313 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 30 Jun 2020 14:22:03 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=BB=A9=E6=95=88=E8=80=83=E6=A0=B8?=
 =?UTF-8?q?=E3=80=91=E3=80=90=E7=BD=91=E6=A0=BC=E5=AE=9E=E4=BD=93=E5=8C=96?=
 =?UTF-8?q?=E8=BF=90=E4=BD=9C=E6=89=93=E5=88=86=E3=80=91-=E7=8E=8B?=
 =?UTF-8?q?=E5=85=AC=E5=B3=B0-2020-06-30?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/elink/esua/epdc/dao/KpiCommunityBuildingDao.java   | 2 +-
 .../src/main/java/com/elink/esua/epdc/dao/KpiGridEntityDao.java | 2 +-
 .../main/java/com/elink/esua/epdc/dao/KpiMassEvaluationDao.java | 2 +-
 .../main/java/com/elink/esua/epdc/dao/KpiPublicOpinionDao.java  | 2 +-
 .../src/main/resources/mapper/KpiGridEntityDao.xml              | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiCommunityBuildingDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiCommunityBuildingDao.java
index 157f6de16..8dc09a8cb 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiCommunityBuildingDao.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiCommunityBuildingDao.java
@@ -44,7 +44,7 @@ public interface KpiCommunityBuildingDao extends BaseDao<KpiCommunityBuildingEnt
     List<KpiCommunityBuildingDTO> getInfoPage(Map<String, Object> params);
 
     /**
-     * 条件查询
+     * 查询已打分部门提示
      * @param checkIsScoredFormDTO
      * @return
      */
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiGridEntityDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiGridEntityDao.java
index 1edc7ecf0..5a38b7b04 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiGridEntityDao.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiGridEntityDao.java
@@ -42,7 +42,7 @@ public interface KpiGridEntityDao extends BaseDao<KpiGridEntityEntity> {
     List<KpiGridEntityDTO> getInfoPage(Map<String, Object> params);
 
     /**
-     * 条件查询
+     * 查询已打分部门提示
      * @param checkIsScoredFormDTO
      * @return
      */
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiMassEvaluationDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiMassEvaluationDao.java
index 1eaa17fbc..af0bc6d6e 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiMassEvaluationDao.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiMassEvaluationDao.java
@@ -42,7 +42,7 @@ public interface KpiMassEvaluationDao extends BaseDao<KpiMassEvaluationEntity> {
     List<KpiMassEvaluationDTO> getInfoPage(Map<String, Object> params);
 
     /**
-     * 条件查询
+     * 查询已打分部门提示
      * @param checkIsScoredByYearFormDTO
      * @return
      */
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiPublicOpinionDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiPublicOpinionDao.java
index 19ff84633..1a9b14d71 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiPublicOpinionDao.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiPublicOpinionDao.java
@@ -42,7 +42,7 @@ public interface KpiPublicOpinionDao extends BaseDao<KpiPublicOpinionEntity> {
     List<KpiPublicOpinionDTO> getInfoPage(Map<String, Object> params);
 
     /**
-     * 条件查询
+     * 查询已打分部门提示
      * @param checkIsScoredFormDTO
      * @return
      */
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiGridEntityDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiGridEntityDao.xml
index eb38ac5f6..dd20a34d9 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiGridEntityDao.xml
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiGridEntityDao.xml
@@ -58,7 +58,7 @@
         order by UPDATED_TIME desc
     </select>
 
-    <select id="getDuplicateData" resultType="com.elink.esua.epdc.dto.KpiCommunityBuildingDTO" parameterType="com.elink.esua.epdc.dto.form.CheckIsScoredFormDTO">
+    <select id="getDuplicateData" resultType="com.elink.esua.epdc.dto.KpiGridEntityDTO" parameterType="com.elink.esua.epdc.dto.form.CheckIsScoredFormDTO">
         select
         ID,
         DEPT_ID,