Merge remote-tracking branch 'origin/dev_0421bug_yzm' into dev

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectDistributionResultDTO.java

@@ -1,8 +1,10 @@
 package com.epmet.dataaggre.dto.govproject.result;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 项目分布（实时只适用于e事通客户）返参
@@ -12,6 +14,7 @@ import java.io.Serializable;
  */
 @Data
 public class ProjectDistributionResultDTO implements Serializable {
+    private String customerId;
     private String projectId;
     private String projectTitle;
     private String statusDesc;
@@ -22,4 +25,6 @@ public class ProjectDistributionResultDTO implements Serializable {
     // @JsonIgnore
     private String statusCode;
     private String gridId;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date shiftProjectTime;
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml

@@ -130,7 +130,9 @@
             p.TITLE AS projectTitle,
             ( CASE WHEN p.`STATUS` = 'pending' THEN '处理中' WHEN p.`STATUS` = 'closed' THEN '已结案' ELSE '' END ) AS statusDesc,
             p.`STATUS` as statusCode,
-            p.ORIGIN_ID as issueId
+            p.ORIGIN_ID as issueId,
+            p.customer_id as customerId,
+            p.CREATED_TIME as shiftProjectTime
         FROM
             project p
         WHERE
@@ -140,5 +142,6 @@
             <foreach item="issueId" collection="list" separator="," open="(" close=")" index="">
                 #{issueId}
             </foreach>
+            order by p.CREATED_TIME desc
     </select>
 </mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml

@@ -51,9 +51,6 @@
                 #{orgId}
             </foreach>
             AND rankData.MONTH_ID =#{monthId}
-            ORDER BY
-            (rankData.RESPONSE_RATIO + rankData.RESOLVED_RATIO + rankData.GOVERN_RATIO + rankData.SATISFACTION_RATIO) DESC,
-             rankData.RESPONSE_RATIO DESC,rankData.RESOLVED_RATIO DESC,rankData.GOVERN_RATIO DESC,rankData.SATISFACTION_RATIO DESC
          )
         union
         (
@@ -78,11 +75,14 @@
                 #{orgId}
             </foreach>
             AND rankData.MONTH_ID =#{monthId}
-            ORDER BY
-            (rankData.RESPONSE_RATIO + rankData.RESOLVED_RATIO + rankData.GOVERN_RATIO + rankData.SATISFACTION_RATIO) DESC,
-            rankData.RESPONSE_RATIO DESC,rankData.RESOLVED_RATIO DESC,rankData.GOVERN_RATIO DESC,rankData.SATISFACTION_RATIO
-            DESC
         )
+        ORDER BY
+        (RESPONSE_RATIO + RESOLVED_RATIO + GOVERN_RATIO + SATISFACTION_RATIO) DESC,
+        RESPONSE_RATIO DESC,
+        RESOLVED_RATIO DESC,
+        GOVERN_RATIO DESC,
+        SATISFACTION_RATIO DESC
+        DESC
     </select>
 
 </mapper>