Merge remote-tracking branch 'origin/dev_data_fusion' into develop

epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectDifficultRankResultDTO.java

@@ -3,7 +3,6 @@ package com.epmet.project.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -25,11 +24,17 @@ public class ProjectDifficultRankResultDTO implements Serializable {
      * 项目标题
      * */
     private String title;
-
+    // 3个街道和产品这边状态码不一样..
     /**
      * 状态: 待处理: pending; 结案closed
      * */
     private String statusCode;
+    // pending	处理中
+    // closed	已结案
+    // 10	已结案
+    // 5	已关闭
+    // 0	处理中
+    private String statusDesc;
 
     /**
      * 社区-网格名

epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml

@@ -273,6 +273,7 @@
         diff.EVENT_ID AS projectId,
         ifnull(diff.EVENT_CONTENT,diff.EVENT_TITLE) AS title,
         diff.EVENT_STATUS_CODE AS statusCode,
+        IFNULL(diff.EVENT_STATUS_DESC,'') as statusDesc,
         diff.EVENT_SOURCE AS gridName,
         diff.EVENT_IMG_URL AS imgUrl,
         floor(diff.EVENT_COST_TIME/60) AS totalHours,