Merge remote-tracking branch 'origin/dev'

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

@@ -140,7 +140,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) {
@@ -158,21 +158,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);
                     }
                 }
             }