From afc95ef0eec3e8558b0c3844de6e28db38fdd9f1 Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Fri, 15 Oct 2021 18:14:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=95=B0=E6=8D=AE=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81-=E9=A1=B9=E7=9B=AE=E4=BF=A1=E6=81=AF=E4=B8=8A?=
 =?UTF-8?q?=E6=8A=A5=E6=8E=A5=E5=8F=A3-=E6=96=B0=E5=A2=9E=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=88=86=E7=B1=BB=E7=BC=96=E7=A0=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/dto/screen/result/UploadProjectInfoDTO.java    | 5 +++++
 .../main/resources/mapper/screen/ScreenProjectDataDao.xml    | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UploadProjectInfoDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UploadProjectInfoDTO.java
index f235c1fc..a9ecd255 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UploadProjectInfoDTO.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UploadProjectInfoDTO.java
@@ -79,6 +79,11 @@ public class UploadProjectInfoDTO  implements Serializable {
      */
     private String allCategoryName;
 
+    /**
+     * 所属类别编码
+     */
+    private String categoryCode;
+
     /**
      * 经度
      */
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
index c61e0b11..8efdf9e5 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
@@ -19,6 +19,7 @@
         <result property="longitude" column="longitude"/>
         <result property="projectStatusCode" column="projectStatusCode"/>
         <result property="allCategoryName" column="allCategoryName"/>
+        <result property="categoryCode" column="categoryCode"/>
         <result property="closeCaseTime" column="closeCaseTime"/>
         <result property="projectLevel" column="projectLevel"/>
         <result property="satisfactionScore" column="satisfactionScore"/>
@@ -63,8 +64,8 @@
         order by ID)a group by a.EVENT_ID) t1
         left join esua_epdc_events.epdc_img t2 on t1.EVENT_ID = t2.REFERENCE_ID and t1.DEL_FLAG = '0'
         left join esua_epdc_events.epdc_item_handle_process t3 on t3.ITEM_ID = t1.ID and t3.DEL_FLAG = '0' and t3.STATE = 10
-        where t1.UPDATED_TIME >= #{yearMonthDay}
-        and t1.UPDATED_TIME  &lt;= now()
+        where t1.UPDATED_TIME <![CDATA[ >= ]]> #{yearMonthDay}
+        and t1.UPDATED_TIME <![CDATA[ <= ]]> now()
         order by t2.CREATED_TIME
     </select>
     <resultMap type="com.elink.esua.epdc.dto.screen.result.UploadProjectProcessDTO" id="uploadprojectprocessMap">