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

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenProjectDataInfoFormDTO.java

@@ -1,9 +1,11 @@
 package com.epmet.dto.screen.form;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * @description:
@@ -47,7 +49,8 @@ public class ScreenProjectDataInfoFormDTO implements Serializable {
     /**
      * 事件时间
      */
-    private String projectCreateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date projectCreateTime;
 
     /**
      * 上报人

epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.20__add_satisfaction_score.sql

@@ -1,2 +1,11 @@
 -- epmet_evaluation_index库执行以下sql：  增加群众不满得分
 alter table screen_project_data add COLUMN  `SATISFACTION_SCORE` decimal(10,6) DEFAULT NULL COMMENT '满意度得分' AFTER LATITUDE;
+
+ALTER TABLE `epmet_evaluation_index`.`screen_govern_rank_data_daily`
+    ADD COLUMN `RESPONSE_COUNT` int(11) NULL COMMENT '响应次数' AFTER `RESPONSE_RATIO`,
+    ADD COLUMN `TRANSFER_COUNT` int(11) NULL COMMENT '项目转入次数' AFTER `RESPONSE_COUNT`,
+    ADD COLUMN `RESOLVED_COUNT` int(11) NULL COMMENT '解决项目数' AFTER `RESOLVED_RATIO`,
+    ADD COLUMN `CLOSED_COUNT` int(11) NULL COMMENT '已关闭项目数' AFTER `RESOLVED_COUNT`,
+    ADD COLUMN `GOVERN_COUNT` int(11) NULL COMMENT '自治项目数' AFTER `GOVERN_RATIO`,
+    ADD COLUMN `SATISFACTION_COUNT` int(11) NULL COMMENT '满意项目数' AFTER `SATISFACTION_RATIO`,
+    ADD COLUMN `CLOSED_PROJECT_COUNT` int(11) NULL COMMENT '已关闭项目（由议题转的项目）数' AFTER `SATISFACTION_COUNT`;