From 92c29b03af6e8e9451454119f430c0477de39022 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 15 Oct 2021 17:08:28 +0800
Subject: [PATCH] =?UTF-8?q?closeCaseTime=E6=94=B9=E4=B8=BADate?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/ScreenProjectDataInfoFormDTO.java    |  3 ++-
 .../impl/ScreenProjectDataServiceImpl.java    | 27 ++++++++-----------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenProjectDataInfoFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenProjectDataInfoFormDTO.java
index f0f6422e94..b977e08472 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenProjectDataInfoFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenProjectDataInfoFormDTO.java
@@ -104,7 +104,8 @@ public class ScreenProjectDataInfoFormDTO implements Serializable {
     /**
      * 结案日期
      */
-    private String closeCaseTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date closeCaseTime;
 
     /**
      * 所有上级ID，用英文逗号分开
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
index 855e1a6a29..10678a2fbc 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
@@ -44,7 +44,6 @@ import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Date;
@@ -136,22 +135,18 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
                 //todo 动态获取超时时间
                 //如果结案 结案时间立项时间；
                 if ("closed_case".equals(projectStatusCode)) {
-                    try {
-                        Date createTime = item.getProjectCreateTime();
-                        Date closeCaseTime = sdf.parse(item.getCloseCaseTime());
+                    Date createTime = item.getProjectCreateTime();
+                    Date closeCaseTime = item.getCloseCaseTime();
 
-                        if (closeCaseTime.getTime() - createTime.getTime() <= 1000 * 60 * 60 * 24 * 4) {
-                            //如果结案时间-立项时间小于等于4天 未超期 level3
-                            item.setProjectLevel(3);
-                        } else if (closeCaseTime.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 (closeCaseTime.getTime() - createTime.getTime() <= 1000 * 60 * 60 * 24 * 4) {
+                        //如果结案时间-立项时间小于等于4天 未超期 level3
+                        item.setProjectLevel(3);
+                    } else if (closeCaseTime.getTime() - createTime.getTime() <= 1000 * 60 * 60 * 24 * 5) {
+                        //如果结案时间-立项时间大于4天小于5天 即将超期 level2
+                        item.setProjectLevel(2);
+                    } else {
+                        //大于5天 已超期 level1
+                        item.setProjectLevel(1);
                     }
                 } else if ("pending".equals(projectStatusCode)) {
                     //如果处理中 当前时间-立项时间；