Merge remote-tracking branch 'origin/zypms' into zypms

mrzhssss

2022-09-13 3536050491417982763e2f2f9d7c0d9982e16360

 src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java

@@ -118,8 +118,16 @@
            return R.error();
        }

        if (projectPlan.getDelay() < 0){
            throw new CoolException("延期天数不可为负数");

//        if (projectPlan.getDelay() < 0){
//            throw new CoolException("延期天数不可为负数");
//        }
        Date endTime = projectPlan.getEndTime();
        Date realEndTime = projectPlan.getRealEndTime();
        //如果实际结束时间大于预计时间
        if (realEndTime.getTime() > endTime.getTime() ){
            long day = (realEndTime.getTime() - endTime.getTime()) / 1000 / 60 / 60 / 24;
            projectPlan.setDelay((int) day);
        }

        projectPlan.setModifyTime(new Date());