#

tqs

2022-09-16 643a7b479b5f309ae1014d9c1644586c1047cdd5

 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 (!Cools.isEmpty(endTime) && !Cools.isEmpty(realEndTime) && realEndTime.getTime() > endTime.getTime() ){
            long day = (realEndTime.getTime() - endTime.getTime()) / 1000 / 60 / 60 / 24;
            projectPlan.setDelay((int) day);
        }

        projectPlan.setModifyTime(new Date());
@@ -133,14 +141,19 @@
    public R updateByHomepage(@RequestParam HashMap<String,Object> param){
        String itemId = (String) param.get("itemId");
        String weightNum = (String) param.get("weightNum");
        String realStartTime = (String) param.get("realStartTime");
        //String realStartTime = (String) param.get("realStartTime");
        String realEndTime = (String) param.get("realEndTime");
        ProjectPlan projectPlan = projectPlanService.selectOne(new EntityWrapper<ProjectPlan>()
                .eq("item_id", itemId)
                .eq("weight_num", weightNum));
        try {
            projectPlan.setRealStartTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(realStartTime));
            projectPlan.setRealEndTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(realEndTime));
            //projectPlan.setRealStartTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(realStartTime));
            if (realEndTime == null || realEndTime.equals("")) {

            }else {
                projectPlan.setRealEndTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(realEndTime));

            }
        } catch (ParseException e) {
            throw new RuntimeException(e);
        }
@@ -148,6 +161,7 @@
        return R.ok();
    }


    @RequestMapping(value = "/projectPlan/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value = "ids[]") Long[] ids) {