From 3ee87ed1b200c63aaf74e5d1cb7d7102c620b174 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Mon, 1 Mar 2021 18:05:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=BE=E7=82=B9=E5=A0=B5=E7=82=B9=20bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/screen/ScreenPublicDataDao.xml   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml
index 057fe635..19099664 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml
@@ -1905,7 +1905,7 @@ select  gr.id as orgId,
     <select id="getDifficultydata" resultType="com.elink.esua.epdc.dto.screen.result.DifficultydataResultDTO">
         SELECT
             'grid' as orgType ,
-            ee.GRID orgId,
+            ee.GRID_ID orgId,
             dd.PIDS allParentIds,
             dd.PID parentId,
             ee.GRID orgName,
@@ -1922,7 +1922,8 @@ select  gr.id as orgId,
             (case ee.ITEM_STATE when 0 then '处理中' when 5 then '已关闭' when 10 then '已结案' end) as latestOperateDesc,
             date_format( now( ), '%Y%m%d' ) dataEndTime,
             IFNULL(ee.HANDLE_TOTAL,0) eventHandledCount,
-            dd.area_code as areaCode
+            dd.area_code as areaCode,
+            LEFT(ee.ITEM_CONTENT,50)eventTitle
         FROM
             esua_epdc_analysis.epdc_difficult_item ee
             left join esua_epdc_admin.sys_dept dd on dd.ID = ee.GRID_ID
@@ -1932,7 +1933,7 @@ select  gr.id as orgId,
         AND dd.`id` NOT IN( SELECT t.`dept_id`
             FROM `esua_epdc_admin`.`sys_dept_config` t
             WHERE t.`del_flag`= 0)
-        and	ee.CREATED_TIME >= date_format( date_add( now( ), INTERVAL - 1 MONTH ), '%Y-%m-%d' )
+        and	ee.DISTRIBUTE_TIME &lt;= date_format( date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m-%d' )
     </select>
     <!-- 007 -->
     <select id="getUserjoin" resultType="com.elink.esua.epdc.dto.screen.result.UserjoinResultDTO">