#副PLAN

LSH

2023-11-09 a33070f3623761e8c14e818294d0f30e388a57ae

#副PLAN

 src/main/java/com/zy/crm/manager/controller/PlanController.java

@@ -189,6 +189,84 @@
        return R.ok();
    }

    @RequestMapping(value = "/plan/assistantPlan/add/auth")
    @ManagerAuth(memo = "添加副规划申请单")
    @Transactional
    public R assistantPlanAdd(@RequestParam Long hostPlanId) {
        Plan hostPlan = planService.selectById(hostPlanId);
        if (!Cools.isEmpty(hostPlan.getAssistantPlanId()) && hostPlan.getAssistantPlanId()!=0){
            return R.error("此规划单已存在副规划单，id为"+hostPlan.getAssistantPlanId());
        }
        // pre
        Plan plan = new Plan(hostPlan);
        // begin
        Long hostId = getHostId();
        if (planService.selectByUuid(hostId, plan.getUuid()) != null) {
            throw new CoolException("规划单已存在");
        }

        Order order = orderService.selectById(plan.getOrderId());
        if (Cools.isEmpty(order)) {
            throw new CoolException("跟踪项目不存在");
        }

        if (!order.getDirector().equals(getUserId())){
            throw new CoolException("只允许跟踪项目负责人添加所选项目规划申请单");
        }

        Date now = new Date();
        plan.setHostId(hostId);
        plan.setUuid(planService.getUuid(hostId));  // 规划单代号
        plan.setDeptId(getDeptId());               // 所属部门
        plan.setUserId(getUserId());               // 所属人员

        plan.setAppleTime(now);
        plan.setCreateBy(getUserId());
        plan.setCreateTime(now);
        plan.setUpdateBy(getUserId());
        plan.setUpdateTime(now);
        plan.setStatus(0);
        plan.setStatus2(0);
        plan.setStep(1);
        plan.setSettle(1);  // 1.开始
        plan.setAssistantHostSign(1);//副规划单

        User manager = new User();
        try{
            manager = userService.getDeptManager(getHostId(), getUser().getDeptId());        // 获取部门领导
        }catch (Exception e){
            manager = getUser();
        }
        PlanType planType = new PlanType(hostPlan.getHostId(),1);//1:货架
        User planLeader = planTypeService.findPlanLeader(planType);
        plan.setSettleMsg(JSON.toJSONString(SettleDto.init(plan, manager, planLeader)));

        plan.setDirector(planLeader.getId());

        if (!planService.insert(plan)) {
            throw new CoolException("保存失败，请重试");
        }
        plan.setAssistantPlanId(plan.getId());
        plan.setHostPlanId(hostPlanId);
        if (!planService.updateById(plan)) {
            throw new CoolException("更新失败，请重试");
        }
        // 自动添加跟进人
        PlanFoll planFoll = new PlanFoll();
        planFoll.setPlanId(plan.getId());
        planFoll.setUserId(planLeader.getId());
        if (!planFollService.insert(planFoll)) {
            throw new CoolException("保存失败，请重试");
        }

        hostPlan.setAssistantPlanId(plan.getId());
        hostPlan.setHostPlanId(hostPlanId);
        if (!planService.updateById(hostPlan)) {
            throw new CoolException("更新失败，请重试");
        }
        return R.ok("保存成功");
    }

    @RequestMapping(value = "/plan/update/auth")
    @ManagerAuth(memo = "更新规划申请单")
    @Transactional
@@ -250,6 +328,20 @@
             if (priOnline2!=0){
                 return R.error("存在关联的核价单，禁止删除！！！");
             }
             Plan planA = planService.selectById(id);
             if (planA.getAssistantHostSign()==1){
                 Plan planB = planService.selectById(planA.getHostPlanId());
                 planB.setAssistantPlanId(0L);
                 planB.setHostPlanId(0L);
                 planService.updateById(planB);
             }else {
                 if (!Cools.isEmpty(planA.getAssistantPlanId()) && planA.getAssistantPlanId()!=0){
                     Plan planB = planService.selectById(planA.getAssistantPlanId());
                     if (!Cools.isEmpty(planB)){
                         return R.error("存在关联的副规划单，禁止删除！！！ 副规划单ID："+planB.getId());
                     }
                 }
             }
             planService.deleteById(id);
        }
        return R.ok();

 src/main/java/com/zy/crm/manager/entity/Plan.java

@@ -33,327 +33,380 @@
    /**
     * ID
     */
    @ApiModelProperty(value= "ID")
    @ApiModelProperty(value = "ID")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /**
     * 所属商户
     */
    @ApiModelProperty(value= "所属商户")
    @ApiModelProperty(value = "所属商户")
    @TableField("host_id")
    private Long hostId;

    /**
     * 所属部门
     */
    @ApiModelProperty(value= "所属部门")
    @ApiModelProperty(value = "所属部门")
    @TableField("dept_id")
    private Long deptId;

    /**
     * 业务类型
     */
    @ApiModelProperty(value= "业务类型")
    @ApiModelProperty(value = "业务类型")
    @TableField("plan_type")
    private Long planType;

    /**
     * 业务员
     */
    @ApiModelProperty(value= "业务员")
    @ApiModelProperty(value = "业务员")
    @TableField("user_id")
    private Long userId;

    /**
     * 跟踪项目
     */
    @ApiModelProperty(value= "跟踪项目")
    @ApiModelProperty(value = "跟踪项目")
    @TableField("order_id")
    private Long orderId;

    /**
     * 甲方单位
     */
    @ApiModelProperty(value= "甲方单位")
    @ApiModelProperty(value = "甲方单位")
    @TableField("cstmr_id")
    private Long cstmrId;

    /**
     * 规划单代号
     */
    @ApiModelProperty(value= "规划单代号")
    @ApiModelProperty(value = "规划单代号")
    private String uuid;

    /**
     * 规划单名称
     */
    @ApiModelProperty(value= "规划单名称")
    @ApiModelProperty(value = "规划单名称")
    private String name;

    /**
     * 申请日期
     */
    @ApiModelProperty(value= "申请日期")
    @ApiModelProperty(value = "申请日期")
    @TableField("apple_time")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date appleTime;

    /**
     * 方案所需
     */
    @ApiModelProperty(value= "方案所需")
    @ApiModelProperty(value = "方案所需")
    @TableField("plan_need")
    private String planNeed;

    /**
     * 立项 1: 是  0: 否
     */
    @ApiModelProperty(value= "立项 1: 是  0: 否  ")
    @ApiModelProperty(value = "立项 1: 是  0: 否  ")
    @TableField("be_item")
    private Integer beItem;

    /**
     * 表单内容
     */
    @ApiModelProperty(value= "表单内容")
    @ApiModelProperty(value = "表单内容")
    private String form;

    /**
     * 规划员
     */
    @ApiModelProperty(value= "规划员")
    @ApiModelProperty(value = "规划员")
    private Long planner;

    /**
     * 完成时间
     */
    @ApiModelProperty(value= "完成时间")
    @ApiModelProperty(value = "完成时间")
    @TableField("finish_time")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date finishTime;

    /**
     * 更改方案 1: 是  0: 否
     */
    @ApiModelProperty(value= "更改方案 1: 是  0: 否  ")
    @ApiModelProperty(value = "更改方案 1: 是  0: 否  ")
    private Integer change;

    /**
     * 更改次数
     */
    @ApiModelProperty(value= "更改次数")
    @ApiModelProperty(value = "更改次数")
    @TableField("change_time")
    private Integer changeTime;

    /**
     * 更改方案原因
     */
    @ApiModelProperty(value= "更改方案原因")
    @ApiModelProperty(value = "更改方案原因")
    @TableField("change_reason")
    private String changeReason;

    /**
     * 规格奖金
     */
    @ApiModelProperty(value= "规格奖金")
    @ApiModelProperty(value = "规格奖金")
    @TableField("plan_bonus")
    private Double planBonus;

    /**
     * 规格组长奖金
     */
    @ApiModelProperty(value= "规格组长奖金")
    @ApiModelProperty(value = "规格组长奖金")
    @TableField("plan_leader_bonus")
    private Double planLeaderBonus;

    /**
     * 附件
     */
    @ApiModelProperty(value= "附件")
    @ApiModelProperty(value = "附件")
    private String files;

    /**
     * 进度 1: 开始  2: 组长审核  3: 售前组长审核  4: 规划员审核  5: 审批通过
     */
    @ApiModelProperty(value= "进度 1: 开始  2: 组长审核  3: 售前审核  4: 规划员审核  5: 审批通过  ")
    @ApiModelProperty(value = "进度 1: 开始  2: 组长审核  3: 售前审核  4: 规划员审核  5: 审批通过  ")
    private Integer settle;

    /**
     * 审核进度
     */
    @ApiModelProperty(value= "审核进度")
    @ApiModelProperty(value = "审核进度")
    @TableField("settle_msg")
    private String settleMsg;

    /**
     * 评论
     */
    @ApiModelProperty(value= "评论")
    @ApiModelProperty(value = "评论")
    private String comment;

    /**
     * 状态 1: 正常  0: 禁用
     */
    @ApiModelProperty(value= "状态 1: 正常  0: 禁用  ")
    @ApiModelProperty(value = "状态 1: 正常  0: 禁用  ")
    private Integer status;

    /**
     * 添加人员
     */
    @ApiModelProperty(value= "添加人员")
    @ApiModelProperty(value = "添加人员")
    @TableField("create_by")
    private Long createBy;

    /**
     * 添加时间
     */
    @ApiModelProperty(value= "添加时间")
    @ApiModelProperty(value = "添加时间")
    @TableField("create_time")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    /**
     * 修改人员
     */
    @ApiModelProperty(value= "修改人员")
    @ApiModelProperty(value = "修改人员")
    @TableField("update_by")
    private Long updateBy;

    /**
     * 修改时间
     */
    @ApiModelProperty(value= "修改时间")
    @ApiModelProperty(value = "修改时间")
    @TableField("update_time")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date updateTime;

    /**
     * 注释
     */
    @ApiModelProperty(value= "注释")
    @ApiModelProperty(value = "注释")
    private String memo;

    /**
     * 项目进度流程{1：项目创建，2：核价处理，3：产品费用明细，4：报价预算单，5：报价单}
     */
    @ApiModelProperty(value= "项目进度流程{1：项目创建，2：核价处理，3：产品费用明细，4：报价预算单，5：报价单}")
    @ApiModelProperty(value = "项目进度流程{1：项目创建，2：核价处理，3：产品费用明细，4：报价预算单，5：报价单}")
    private Integer step;

    /**
     * 业务员联系方式
     */
    @ApiModelProperty(value= "业务员联系方式")
    @ApiModelProperty(value = "业务员联系方式")
    private String userXmlSelPhone;

    /**
     * 节点负责人
     */
    @ApiModelProperty(value= "节点负责人")
    @ApiModelProperty(value = "节点负责人")
    private Long director;

    public Plan() {}
    /**
     * 集成项目货架核价状态
     */
    @ApiModelProperty(value = "状态 3: 完成核价 2: 开始核价 1: 等待核价  0: 初始  ")
    private Integer status2;

    public String getHostId$(){
    /**
     * 节点负责人
     */
    @ApiModelProperty(value = "副planId")
    @TableField("assistant_plan_id")
    private Long assistantPlanId;

    /**
     * 节点负责人
     */
    @ApiModelProperty(value = "主planId")
    @TableField("host_plan_id")
    private Long hostPlanId;

    /**
     * 节点负责人
     */
    @ApiModelProperty(value = "主planId")
    @TableField("assistant_host_sign")
    private Integer assistantHostSign;

    public Plan() {
    }

    public Plan(Plan plan) {
        this.hostId = plan.getHostId();
        this.deptId = plan.getDeptId();
        this.planType = plan.getPlanType();
        this.userId = plan.getUserId();
        this.orderId = plan.getOrderId();
        this.cstmrId = plan.getCstmrId();
        this.name = plan.getName();
        this.planNeed = plan.getPlanNeed();
        this.beItem = plan.getBeItem();
        this.form = plan.getForm();
        this.finishTime = plan.getFinishTime();
        this.change = plan.getChange();
        this.changeTime = plan.getChangeTime();
        this.changeReason = plan.getChangeReason();
        this.planBonus = plan.getPlanBonus();
        this.planLeaderBonus = plan.getPlanLeaderBonus();
        this.files = plan.getFiles();
        this.comment = plan.getComment();
        this.memo = plan.getMemo();
        this.userXmlSelPhone = plan.getUserXmlSelPhone();
    }

    public String getHostId$() {
        HostService service = SpringUtils.getBean(HostService.class);
        Host host = service.selectById(this.hostId);
        if (!Cools.isEmpty(host)){
        if (!Cools.isEmpty(host)) {
            return String.valueOf(host.getName());
        }
        return null;
    }

    public String getDirector$(){
        if (this.director==null) return "";
    public String getDirector$() {
        if (this.director == null) return "";
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.director);
        if (!Cools.isEmpty(user)){
        if (!Cools.isEmpty(user)) {
            return String.valueOf(user.getNickname());
        }
        return null;
    }

    public String getDeptId$(){
    public String getDeptId$() {
        DeptService service = SpringUtils.getBean(DeptService.class);
        Dept dept = service.selectById(this.deptId);
        if (!Cools.isEmpty(dept)){
        if (!Cools.isEmpty(dept)) {
            return String.valueOf(dept.getName());
        }
        return null;
    }

    public String getPlanType$(){
    public String getPlanType$() {
        PlanTypeService service = SpringUtils.getBean(PlanTypeService.class);
        PlanType planType = service.selectById(this.planType);
        if (!Cools.isEmpty(planType)){
        if (!Cools.isEmpty(planType)) {
            return String.valueOf(planType.getName());
        }
        return null;
    }

    public Integer getPLType$(){
    public Integer getPLType$() {
        PlanTypeService service = SpringUtils.getBean(PlanTypeService.class);
        PlanType planType = service.selectById(this.planType);
        if (!Cools.isEmpty(planType)){
        if (!Cools.isEmpty(planType)) {
            return planType.getType();
        }
        return null;
    }

    public String getUserId$(){
    public String getUserId$() {
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.userId);
        if (!Cools.isEmpty(user)){
        if (!Cools.isEmpty(user)) {
            return String.valueOf(user.getNickname());
        }
        return null;
    }

    public String getOrderId$(){
    public String getOrderId$() {
        OrderService service = SpringUtils.getBean(OrderService.class);
        Order order = service.selectById(this.orderId);
        if (!Cools.isEmpty(order)){
        if (!Cools.isEmpty(order)) {
            return String.valueOf(order.getName());
        }
        return null;
    }

    public String getCstmrId$(){
    public String getCstmrId$() {
        CstmrService service = SpringUtils.getBean(CstmrService.class);
        Cstmr cstmr = service.selectById(this.cstmrId);
        if (!Cools.isEmpty(cstmr)){
        if (!Cools.isEmpty(cstmr)) {
            return String.valueOf(cstmr.getName());
        }
        return null;
    }

    public String getAppleTime$(){
        if (Cools.isEmpty(this.appleTime)){
    public String getAppleTime$() {
        if (Cools.isEmpty(this.appleTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd").format(this.appleTime);
    }

    public String getPlanNeed$(){
        if (Cools.isEmpty(this.planNeed)){
    public String getPlanNeed$() {
        if (Cools.isEmpty(this.planNeed)) {
            return null;
        }
        PlanNeedService service = SpringUtils.getBean(PlanNeedService.class);
        String[] planNeeds = this.planNeed.split("-");
        String name="";
        for (String planNeeda : planNeeds){
        String name = "";
        for (String planNeeda : planNeeds) {
            PlanNeed planNeed = service.selectById(Integer.parseInt(planNeeda));
            if (!Cools.isEmpty(planNeed)){
            if (!Cools.isEmpty(planNeed)) {
//                return String.valueOf(planNeed.getName());
                name = name+planNeed.getName()+";";
                name = name + planNeed.getName() + ";";
            }
        }
        return name;
    }

    public String getBeItem$(){
        if (null == this.beItem){ return null; }
        switch (this.beItem){
    public String getBeItem$() {
        if (null == this.beItem) {
            return null;
        }
        switch (this.beItem) {
            case 1:
                return "是";
            case 0:
@@ -363,16 +416,18 @@
        }
    }

    public String getFinishTime$(){
        if (Cools.isEmpty(this.finishTime)){
    public String getFinishTime$() {
        if (Cools.isEmpty(this.finishTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd").format(this.finishTime);
    }

    public String getChange$(){
        if (null == this.change){ return null; }
        switch (this.change){
    public String getChange$() {
        if (null == this.change) {
            return null;
        }
        switch (this.change) {
            case 1:
                return "是";
            case 0:
@@ -382,9 +437,11 @@
        }
    }

    public String getSettle$(){
        if (null == this.settle){ return null; }
        switch (this.settle){
    public String getSettle$() {
        if (null == this.settle) {
            return null;
        }
        switch (this.settle) {
//            case 1:
//                return "等待组长审核";
            case 1:
@@ -400,29 +457,31 @@
        }
    }

    public String getPlanner$(){
        if (this.planner==null) return "未分配";
    public String getPlanner$() {
        if (this.planner == null) return "未分配";
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.planner);
        if (!Cools.isEmpty(user)){
        if (!Cools.isEmpty(user)) {
            return String.valueOf(user.getNickname());
        }
        return "";
    }

    public String getNowHeadman$(){
    public String getNowHeadman$() {
        PlanTypeService planTypeService = SpringUtils.getBean(PlanTypeService.class);
        PlanType planType = planTypeService.selectById(this.planType);
        User user = planTypeService.findPlanLeader(planType);
        if (!Cools.isEmpty(user)){
        if (!Cools.isEmpty(user)) {
            return String.valueOf(user.getNickname());
        }
        return null;
    }

    public String getStatus$(){
        if (null == this.status){ return null; }
        switch (this.status){
    public String getStatus$() {
        if (null == this.status) {
            return null;
        }
        switch (this.status) {
            case 2:
                return "开始核价";
            case 1:
@@ -434,33 +493,33 @@
        }
    }

    public String getCreateBy$(){
    public String getCreateBy$() {
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.createBy);
        if (!Cools.isEmpty(user)){
        if (!Cools.isEmpty(user)) {
            return String.valueOf(user.getNickname());
        }
        return null;
    }

    public String getCreateTime$(){
        if (Cools.isEmpty(this.createTime)){
    public String getCreateTime$() {
        if (Cools.isEmpty(this.createTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
    }

    public String getUpdateBy$(){
    public String getUpdateBy$() {
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.updateBy);
        if (!Cools.isEmpty(user)){
        if (!Cools.isEmpty(user)) {
            return String.valueOf(user.getNickname());
        }
        return null;
    }

    public String getUpdateTime$(){
        if (Cools.isEmpty(this.updateTime)){
    public String getUpdateTime$() {
        if (Cools.isEmpty(this.updateTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);

 src/main/java/com/zy/crm/manager/entity/PlanType.java

@@ -122,6 +122,11 @@

    public PlanType() {}

    public PlanType(Long hostId,Integer type) {
        this.hostId = hostId;
        this.type = type;
    }

    public PlanType(Long hostId,String name,String flag,String formId,String data,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
        this.hostId = hostId;
        this.name = name;

 src/main/resources/mapper/PlanMapper.xml

@@ -36,6 +36,10 @@
        <result column="memo" property="memo" />
        <result column="user_xml_sel_phone" property="userXmlSelPhone" />
        <result column="director" property="director" />
        <result column="status2" property="status2" />
        <result column="assistant_plan_id" property="assistantPlanId" />
        <result column="host_plan_id" property="hostPlanId" />
        <result column="assistant_host_sign" property="assistantHostSign" />

    </resultMap>


 src/main/webapp/static/js/plan/plan.js

@@ -139,7 +139,7 @@
        skin: 'line',
        cols: [[
            {type: 'checkbox'}
            // ,{field: 'id', align: 'center',title: 'ID'}
            ,{field: 'id', align: 'center',title: 'ID'}
            // ,{field: 'hostId$', align: 'center',title: '所属商户'}
            ,{field: 'userId$', align: 'left',title: '业务员',hide: false, width: 100}
            ,{field: 'planType$', align: 'left',title: '业务类型', width: 150,hide: false}
@@ -201,7 +201,9 @@
            ,{field: 'updateBy$', align: 'left',title: '修改人', width: 100}
            ,{field: 'updateTime$', align: 'left',title: '修改时间', hide: true}
            ,{field: 'memo', align: 'left',title: '注释', hide: true}

            ,{field: 'assistantHostSign', align: 'left',title: '主副标记', hide: false}
            ,{field: 'hostPlanId', align: 'left',title: '主ID', hide: false}
            ,{field: 'assistantPlanId', align: 'left',title: '副ID', hide: false}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width: 340}
        ]],
        request: {
@@ -594,6 +596,9 @@
                    approvalEnd(data.id);
                });
                break;
            case 'assistantPlan':
                assistantPlan(data);
                break;
            case 'edit':
                showEditModel(data);
                break;
@@ -808,6 +813,36 @@
        });
    }

    /* 新建 */
    function assistantPlan(data) {
        layer.confirm('确定要新建货架规划审批吗？', {
            skin: 'layui-layer-admin',
            shade: .1
        }, function (i) {
            layer.close(i);
            var loadIndex = layer.load(2);
            $.ajax({
                url: baseUrl+"/plan/assistantPlan/add/auth",
                headers: {'token': localStorage.getItem('token')},
                data: {
                    hostPlanId: data.id
                },
                method: 'POST',
                success: function (res) {
                    layer.close(loadIndex);
                    if (res.code === 200){
                        layer.msg(res.msg, {icon: 1});
                        tableReload();
                    } else if (res.code === 403){
                        top.location.href = baseUrl+"/";
                    } else {
                        layer.msg(res.msg, {icon: 2});
                    }
                }
            })
        });
    }

    /* 删除 */
    function del(ids) {
        layer.confirm('确定要删除选中数据吗？', {

 src/main/webapp/views/plan/plan.html

@@ -144,6 +144,9 @@
        <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a>
        <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a>
    {{# } }}
    {{# if (d.assistantHostSign == 0) { }}
        <a class="layui-btn layui-btn-xs btn-edit" lay-event="assistantPlan">创建货架规划任务</a>
    {{# } }}

</script>


 src/main/webapp/views/priOnline2/priOnline.html

@@ -66,7 +66,7 @@
<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-sm" lay-event="addBlank">新增核价</button>
        <button class="layui-btn layui-btn-sm" lay-event="addBlank2">接取集成核价任务</button>
<!--        <button class="layui-btn layui-btn-sm" lay-event="addBlank2">接取集成核价任务</button>-->
        <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="deleteData">删除</button>
    </div>
</script>