From fb65ffe3606482e15bcdf1fd5adfb1acb1b8e846 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 16 八月 2023 11:24:49 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes

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

diff --git a/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java
index e3229c1..4bb8e2c 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java
@@ -213,12 +213,12 @@
 //                p.setDistributNum(tp.getDistributNum());
 //                p.setDoneNum(tp.getDoneNum());
                 p.setIsStock(wStockExtService.isStockForPlan(p));
+                p.setHasExpire(false);
+                p.setStatus(Constants.formatIntegerNum(p.getStatus()));
                 if ( !p.getStatus().equals(Constants.PLAN_STATUS.done) &&
                         !p.getStatus().equals(Constants.PLAN_STATUS.close)){
                     if (Objects.nonNull(p.getPlanDate())){
                         p.setHasExpire(DateUtil.toDateLocalDateTime(p.getWorkPlanPlanDate()).toLocalDate().isBefore(LocalDate.now()));
-                    }else {
-                        p.setHasExpire(false);
                     }
                 }
             }
@@ -1531,7 +1531,7 @@
     }
     /**
      * 鎭㈠璁″垝
-     * @param p
+     * @param
      */
     @Transactional(rollbackFor = {BusinessException.class,Exception.class})
     @Override

--
Gitblit v1.9.3