jiangping
2023-08-16 627df19827a77ea226dea1a3eeb575ae7c05a4e6
server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java
@@ -198,12 +198,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);
                    }
                }
            }
@@ -1516,7 +1516,7 @@
    }
    /**
     * 恢复计划
     * @param p
     * @param
     */
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    @Override