From daa40768433dba31b2397d54dd62bd2cd3bcbca3 Mon Sep 17 00:00:00 2001
From: yinzuomei <yinzuomei@elink-cn.com>
Date: Wed, 12 Feb 2020 17:59:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E8=B0=83=E5=BA=A6=E5=B7=B2?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E3=80=81=E6=9C=AA=E8=A7=A3=E5=86=B3=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/ReportSolvedItemResultDTO.java     |  3 +-
 .../result/ReportUnsolvedItemResultDTO.java   |  3 +-
 .../resources/mapper/item/ItemAnalysisDao.xml | 56 ++++++-------------
 3 files changed, 18 insertions(+), 44 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportSolvedItemResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportSolvedItemResultDTO.java
index 71adffc99..978df82f1 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportSolvedItemResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportSolvedItemResultDTO.java
@@ -1,6 +1,5 @@
 package com.elink.esua.epdc.dto.item.result;
 
-import com.sun.org.apache.xpath.internal.operations.String;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -45,7 +44,7 @@ public class ReportSolvedItemResultDTO implements Serializable {
 	/**
 	 * 最新处理时间
 	 */
-	private String lasthandlerDept;
+	private String lastHandlerDept;
 	/**
 	 * 项目状态
 	 */
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportUnsolvedItemResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportUnsolvedItemResultDTO.java
index 9f78ba40b..ed0119d1f 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportUnsolvedItemResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportUnsolvedItemResultDTO.java
@@ -1,6 +1,5 @@
 package com.elink.esua.epdc.dto.item.result;
 
-import com.sun.org.apache.xpath.internal.operations.String;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -45,5 +44,5 @@ public class ReportUnsolvedItemResultDTO implements Serializable {
 	/**
 	 * 最新进展处理时间
 	 */
-	private String lasthandlerDept;
+	private String lastHandlerDept;
 }
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemAnalysisDao.xml
index 69405afc3..4da8ddd36 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemAnalysisDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemAnalysisDao.xml
@@ -196,27 +196,17 @@
     <select id="selectListReportUnsolvedItemResultDTO"
             resultType="com.elink.esua.epdc.dto.item.result.ReportUnsolvedItemResultDTO">
         SELECT
-        t.ID,
-        t.ITEM_CONTENT,
-        t.CREATED_TIME,
-        t.GRID,
-        t.reportDept,
-        t.reportTime,
-        t.lastHandlerTime,
-        t.lasthandlerDept
-        FROM (
-        SELECT
-        ei.ID,
-        ei.ITEM_CONTENT,
-        ei.CREATED_TIME,
-        ei.GRID,
+        ei.ID as id,
+        ei.ITEM_CONTENT as itemContent,
+        ei.CREATED_TIME as createdTime,
+        ei.GRID as grid,
         ( SELECT eihp.HANDLER_DEPT FROM esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND
         eihp.STATE = 15 AND eihp.ITEM_ID = eigp.REFERENCE_ID LIMIT 1 ) AS reportDept,
         eigp.CREATED_TIME AS reportTime,
         ( SELECT eihp.CREATED_TIME FROM esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND
         eihp.ITEM_ID = eigp.REFERENCE_ID ORDER BY eihp.CREATED_TIME DESC LIMIT 1 ) AS lastHandlerTime,
         ( SELECT eihp.HANDLER_DEPT FROM esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND
-        eihp.ITEM_ID = eigp.REFERENCE_ID ORDER BY eihp.CREATED_TIME DESC LIMIT 1 ) AS lasthandlerDept
+        eihp.ITEM_ID = eigp.REFERENCE_ID ORDER BY eihp.CREATED_TIME DESC LIMIT 1 ) AS lastHandlerDept
         FROM
         esua_epdc_events.epdc_item_grid_platform eigp
         LEFT JOIN esua_epdc_events.epdc_item ei ON ei.ID = eigp.REFERENCE_ID
@@ -246,9 +236,6 @@
         <if test="gridId != null and gridId != ''">
             AND ei.GRID_ID = #{gridId}
         </if>
-        ORDER BY
-        ei.CREATED_TIME DESC ) t
-        WHERE 1=1
         <if test='reportDept != null and reportDept != ""'>
             AND EXISTS (
             SELECT eihp.HANDLER_DEPT FROM esua_epdc_events.epdc_item_handle_process eihp
@@ -259,37 +246,27 @@
             LIMIT 1
             )
         </if>
+        ORDER BY
+        ei.CREATED_TIME DESC
     </select>
 
     <!--  区域调度-已解决项目列表  -->
     <select id="selectListReportSolvedItemResultDTO"
             resultType="com.elink.esua.epdc.dto.item.result.ReportSolvedItemResultDTO">
         SELECT
-        t.ID,
-        t.ITEM_CONTENT,
-        t.CREATED_TIME,
-        t.GRID,
-        t.reportDept,
-        t.reportTime,
-        t.lastHandlerTime,
-        t.lasthandlerDept,
-        t.ITEM_STATE,
-        t.EVALUATION_SCORE
-        FROM (
-        SELECT
-        ei.ID,
-        ei.ITEM_CONTENT,
-        ei.CREATED_TIME,
-        ei.GRID,
+        ei.ID as id,
+        ei.ITEM_CONTENT as itemContent,
+        ei.CREATED_TIME as createdTime,
+        ei.GRID as grid,
         ( SELECT eihp.HANDLER_DEPT FROM esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND
         eihp.STATE = 15 AND eihp.ITEM_ID = eigp.REFERENCE_ID LIMIT 1 ) AS reportDept,
         eigp.CREATED_TIME AS reportTime,
         ( SELECT eihp.CREATED_TIME FROM esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND
         eihp.ITEM_ID = eigp.REFERENCE_ID ORDER BY eihp.CREATED_TIME DESC LIMIT 1 ) AS lastHandlerTime,
         ( SELECT eihp.HANDLER_DEPT FROM esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND
-        eihp.ITEM_ID = eigp.REFERENCE_ID ORDER BY eihp.CREATED_TIME DESC LIMIT 1 ) AS lasthandlerDept,
-        ei.ITEM_STATE,
-        ei.EVALUATION_SCORE
+        eihp.ITEM_ID = eigp.REFERENCE_ID ORDER BY eihp.CREATED_TIME DESC LIMIT 1 ) AS lastHandlerDept,
+        ei.ITEM_STATE as itemState,
+        ei.EVALUATION_SCORE as evaluationScore
         FROM
         esua_epdc_events.epdc_item_grid_platform eigp
         LEFT JOIN esua_epdc_events.epdc_item ei ON ei.ID = eigp.REFERENCE_ID
@@ -319,9 +296,6 @@
         <if test="gridId != null and gridId != ''">
             AND ei.GRID_ID = #{gridId}
         </if>
-        ORDER BY
-        ei.CREATED_TIME DESC ) t
-        WHERE 1=1
         <if test='reportDept != null and reportDept != ""'>
             AND EXISTS (
             SELECT eihp.HANDLER_DEPT FROM esua_epdc_events.epdc_item_handle_process eihp
@@ -332,6 +306,8 @@
             LIMIT 1
             )
         </if>
+        ORDER BY
+        ei.CREATED_TIME DESC
     </select>
 
     <select id="selectOneItemSurvey" resultType="com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO">