##

mrzhssss

2022-09-13 1b941effd3153c45a2b50f5462b54a7f64a3411d

##

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

 src/main/java/zy/cloud/wms/manager/entity/ProjectPlan.java

@@ -43,6 +43,8 @@
import com.baomidou.mybatisplus.annotations.TableName;
import zy.cloud.wms.manager.service.FlowStatusService;
import zy.cloud.wms.manager.service.ItemService;
import zy.cloud.wms.system.entity.Dept;
import zy.cloud.wms.system.service.DeptService;

import java.io.Serializable;

@@ -425,4 +427,15 @@
        }
        return null;
    }

    public String getDutyDepartment$(){
        DeptService bean = SpringUtils.getBean(DeptService.class);
        Dept id1 = bean.selectOne(new EntityWrapper<Dept>()
                .eq("id", this.dutyDepartment));
        if (id1 != null){
            return id1.getName();
        }else {
            return "";
        }
    }
}

 src/main/java/zy/cloud/wms/system/controller/DeptController.java

@@ -131,4 +131,17 @@
        return R.ok();
    }

    @RequestMapping("/dutyDepartment/auth")
    public R dutyDeaprtment(){
        List<Map<String,Object>> result = new ArrayList<>();
        List<Dept> depts = deptService.selectList(null);
        for (Dept dept : depts) {
            Map<String,Object> content = new HashMap<>();
            content.put("id",dept.getId());
            content.put("value",dept.getName());
            result.add(content);
        }
        return R.ok(result);
    }

}

 src/main/webapp/static/js/projectPlan/projectPlan.js

@@ -44,7 +44,7 @@
            ,{field: 'delay', align: 'center',title: '延期天数', width:90}
            ,{field: 'delayReason', align: 'center',title: '延期原因'}
            ,{field: 'memo', align: 'center',title: '备注'}
            ,{field: 'dutyDepartment', align: 'center',title: '责任部门'}
            ,{field: 'dutyDepartment$', align: 'center',title: '责任部门'}
            ,{field: 'dutyMan', align: 'center',title: '责任人', width:80}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:70}
        ]],

 src/main/webapp/views/projectPlan/projectPlan.html

@@ -185,18 +185,36 @@
                </div>


<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label">延期天数: </label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input class="layui-input" name="delay" placeholder="请输入延期天数" type="number" oninput="if(value>100)value=0;if(value<0)value=0">-->
<!--                    </div>-->
<!--                </div>-->


<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label">责任部门: </label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input class="layui-input" name="dutyDepartment" placeholder="请输入责任部门">-->
<!--                    </div>-->
<!--                </div>-->
                <div class="layui-form-item">
                    <label class="layui-form-label">延期天数: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="delay" placeholder="请输入延期天数" type="number" oninput="if(value>100)value=0;if(value<0)value=0">
                    <label class="layui-form-label layui-form-required">责任部门: </label>
                    <div class="layui-input-block cool-auto-complete">
                        <input id="dutyDepartment" class="layui-input" name="dutyDepartment" placeholder="请输入责任部门" style="display: none" lay-vertype="tips" lay-verify="required">
                        <input id="dutyDepartment$" name="dutyDepartment$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入责任部门" onfocus=this.blur()>
                        <div class="cool-auto-complete-window">
                            <input class="cool-auto-complete-window-input"   data-key="dutyDepartmentBydutyDepartment" onkeyup="autoLoad(this.getAttribute('data-key'))">
                            <select class="cool-auto-complete-window-select"  data-key="dutyDepartmentBydutyDepartmentSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                            </select>
                        </div>
                    </div>
                </div>


                <div class="layui-form-item">
                    <label class="layui-form-label">责任部门: </label>
                    <label class="layui-form-label">延期原因: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="dutyDepartment" placeholder="请输入责任部门">
                        <input class="layui-input" name="delayReason" placeholder="请输入延期原因">
                    </div>
                </div>

@@ -226,12 +244,7 @@
                        <input class="layui-input" name="realEndTime" id="realEndTime" placeholder="请输入实际结束时间">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">延期原因: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="delayReason" placeholder="请输入延期原因">
                    </div>
                </div>

                <div class="layui-form-item">
                    <label class="layui-form-label">责任人: </label>
                    <div class="layui-input-block">