From aa7c28808dc1699858444fc74a3ee43dbee0003e Mon Sep 17 00:00:00 2001
From: shijie <648688341@qq.com>
Date: Wed, 19 May 2021 14:21:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=88=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DgEfficiencyServiceImpl.java   | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java
index 3523ef2b..fd1eddf1 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java
@@ -722,12 +722,14 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
         Date endTime = null;
         if(endAuditProcess !=null){
             endTime = endAuditProcess.getCreateTime();
-        }else{
+        }/*else{
             endTime = new Date();
-        }
-
+        }*/
+        long currentTimeTime=new Date().getTime();
         //转换成毫秒统计时间差
-        long currentTimeTime = endTime.getTime();
+        if(endTime != null){
+            currentTimeTime = endTime.getTime();
+        }
         long previousTimeTime = beginTime.getTime();
         //累计耗时,毫秒
         if(currentTimeTime > previousTimeTime){
@@ -762,7 +764,12 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
         }
 
         hashMap.put("countTime", countTime(String.valueOf(totalTime)));
-        hashMap.put("endTime", new SimpleDateFormat("yyyy-MM-dd").format(endTime));
+        if(endTime != null){
+            hashMap.put("endTime", new SimpleDateFormat("yyyy-MM-dd").format(endTime));
+        }else{
+            hashMap.put("endTime","");
+        }
+
         return hashMap;
     }