From af00e89990ae9757cc9261cbe560873c2066b69c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 18 八月 2023 14:34:11 +0800
Subject: [PATCH] 大屏统计
---
server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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 c99011c..4885ee4 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java
@@ -97,7 +97,9 @@
|| Objects.isNull(workPlansSaveDTO.getNum())
|| Objects.isNull(workPlansSaveDTO.getFactoryId())
|| Objects.isNull(workPlansSaveDTO.getUnitId())
- || Objects.isNull(workPlansSaveDTO.getMaterialId())){
+ || Objects.isNull(workPlansSaveDTO.getMaterialId())
+ || Objects.isNull(workPlansSaveDTO.getStartDate())
+ || workPlansSaveDTO.getStartDate().getTime() > workPlansSaveDTO.getPlanDate().getTime()){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
WorkPlans workPlans = new WorkPlans();
@@ -173,12 +175,16 @@
i.setFinishUnQualifiedNum(Objects.isNull(plansExtListVO.getUnqulifiedNum())?Constants.ZERO:plansExtListVO.getUnqulifiedNum());
i.setFinishNum(Objects.isNull(plansExtListVO.getDoneNum())?Constants.ZERO:plansExtListVO.getDoneNum());
}
- if (Objects.nonNull(i.getPlanDate())){
- i.setHasExpire(DateUtil.toDateLocalDateTime(i.getPlanDate()).toLocalDate().isBefore(LocalDate.now()));
- }else {
- i.setHasExpire(false);
+ 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()));
+ }
}
+
});
}
return PageData.from(new PageInfo<>(result));
--
Gitblit v1.9.3