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/PlansExtServiceImpl.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 271a637..10f2345 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java
@@ -34,6 +34,7 @@
import org.springframework.web.multipart.MultipartFile;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -197,6 +198,14 @@
// 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()));
+ }
+ }
}
}
return PageData.from(new PageInfo<>(result));
@@ -1507,7 +1516,7 @@
}
/**
* 鎭㈠璁″垝
- * @param p
+ * @param
*/
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
@Override
--
Gitblit v1.9.3