#产出计算

jiaosong

2023-08-18 2b0e875855e781c16e32187aa5552ee12ddcefa0

 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);
                    }
                }

@@ -399,7 +398,7 @@
        }

        Date pDate = DateUtil.getDateFromString(DateUtil.getShortTime(p.getPlanDate()) +" 00:00:00");
        Date nDate =  DateUtil.getDateFromString(DateUtil.getShortTime(DateUtil.getCurrentDate()) +" 00:00:00");
        Date nDate =  DateUtil.getDateFromString(DateUtil.getShortTime(DateUtil.getCurrentDate()) +" 23:59:59");
        if( nDate.getTime() > pDate.getTime()){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，计划生产日期必须为今天以后的日期！");
        }