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

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/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java

@@ -61,12 +61,6 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
 
     @Resource
     private ScreenProjectImgDataDao screenProjectImgDataDao;
-    @Resource
-    private ScreenCustomerAgencyDao agencyDao;
-    @Resource
-    private ScreenCustomerDeptDao deptDao;
-    @Resource
-    private ScreenCustomerGridDao gridDao;
 
     @Override
     public PageData<ScreenProjectDataDTO> page(Map<String, Object> params) {
@@ -141,7 +135,7 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
                 //如果结案 结案时间立项时间；
                 if ("closed_case".equals(projectStatusCode)) {
                     try {
-                        Date createTime = sdf.parse(item.getProjectCreateTime());
+                        Date createTime = item.getProjectCreateTime();
                         Date closeCaseTime = sdf.parse(item.getCloseCaseTime());
 
                         if (closeCaseTime.getTime() - createTime.getTime() <= 1000 * 60 * 60 * 24 * 4) {
@@ -159,21 +153,17 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
                     }
                 } else if ("pending".equals(projectStatusCode)) {
                     //如果处理中 当前时间-立项时间；
-                    try {
-                        Date createTime = sdf.parse(item.getProjectCreateTime());
+                    Date createTime = item.getProjectCreateTime();
 
-                        if (today.getTime() - createTime.getTime() <= 1000 * 60 * 60 * 24 * 4) {
-                            //如果当前时间-立项时间小于等于4天 未超期 level3
-                            item.setProjectLevel(3);
-                        } else if (today.getTime() - createTime.getTime() <= 1000 * 60 * 60 * 24 * 5) {
-                            //如果当前时间-立项时间大于4天小于5天 即将超期 level2
-                            item.setProjectLevel(2);
-                        } else {
-                            //大于5天 已超期 level1
-                            item.setProjectLevel(1);
-                        }
-                    } catch (ParseException e) {
-                        e.printStackTrace();
+                    if (today.getTime() - createTime.getTime() <= 1000 * 60 * 60 * 24 * 4) {
+                        //如果当前时间-立项时间小于等于4天 未超期 level3
+                        item.setProjectLevel(3);
+                    } else if (today.getTime() - createTime.getTime() <= 1000 * 60 * 60 * 24 * 5) {
+                        //如果当前时间-立项时间大于4天小于5天 即将超期 level2
+                        item.setProjectLevel(2);
+                    } else {
+                        //大于5天 已超期 level1
+                        item.setProjectLevel(1);
                     }
                 }
             }

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`;