From 627df19827a77ea226dea1a3eeb575ae7c05a4e6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 16 八月 2023 11:24:30 +0800
Subject: [PATCH] 修復bug

---
 server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java
index e0e1c37..4885ee4 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java
@@ -175,13 +175,12 @@
                     i.setFinishUnQualifiedNum(Objects.isNull(plansExtListVO.getUnqulifiedNum())?Constants.ZERO:plansExtListVO.getUnqulifiedNum());
                     i.setFinishNum(Objects.isNull(plansExtListVO.getDoneNum())?Constants.ZERO:plansExtListVO.getDoneNum());
                 }
-
+                i.setHasExpire(false);
+                i.setStatus(Constants.formatIntegerNum(i.getStatus()));
                 if ( !i.getStatus().equals(Constants.WORKPLANHISTORY_TYPE.done) &&
                         !i.getStatus().equals(Constants.WORKPLANHISTORY_TYPE.close)){
                     if (Objects.nonNull(i.getPlanDate())){
                         i.setHasExpire(DateUtil.toDateLocalDateTime(i.getPlanDate()).toLocalDate().isBefore(LocalDate.now()));
-                    }else {
-                        i.setHasExpire(false);
                     }
                 }
 

--
Gitblit v1.9.3