#

LSH

2023-10-17 fabb29dfd7fdcc19727c459c8ef309a86d73ed09

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

@@ -65,7 +65,7 @@
        assert priOnline2 != null;
        JSONObject resultObj = JSON.parseObject(JSON.toJSONString(priOnline2));
        // 步骤条相关
        resultObj.put("step", priOnline2.getSettle() == 4 ? 0 : priOnline2.getSettle() + 1);
        resultObj.put("step", priOnline2.getSettle() == 3 ? 0 : priOnline2.getSettle() + 1);
        return R.ok().add(resultObj);
    }

@@ -180,21 +180,20 @@
//        }catch (Exception e){
//            manager = getUser();
//        }
        String node="2-";

        PlanType planType = planTypeService.selectById(plan.getPlanType());
        node = node+planType.getType();

        ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 5).eq("process", node));//2：核价流程
        User manager = userService.selectById(processPermissions.getUserId());       // 获取核价流程节点2确认人
//        String node="2-";
//        PlanType planType = planTypeService.selectById(plan.getPlanType());
//        node = node+planType.getType();
//        ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 5).eq("process", node));//2：核价流程
//        User manager = userService.selectById(processPermissions.getUserId());       // 获取核价流程节点2确认人

                                // 获取业务员
        List<String> initNames = new ArrayList<>();
        initNames.add("接取核价任务");
        initNames.add("完成核价");
        initNames.add("经理审核");
//        initNames.add("经理审核");
        initNames.add("业务员确认");
        priOnline2.setSettleMsg(JSON.toJSONString(SettleDto.initSalesPricing(manager,getUser(),userUp,initNames,3)));
        priOnline2.setSettleMsg(JSON.toJSONString(SettleDto.initSalesPricingPriOnline2(getUser(),userUp,initNames,2)));

        //设置项目流程
        plan.setStep(2);
@@ -469,6 +468,8 @@
        }
        priOnline2.setStatus(0);
        priOnline2.setSettle(0);
        priOnline2.setUpdateUserId(getUserId());
        priOnline2.setUpdateTime(now);

        priOnline2.setSettleMsg(JSON.toJSONString(planDtoList));
        priOnline2Service.updateById(priOnline2);
@@ -488,10 +489,10 @@
                User user = userService.selectById(priOnline2.getMemberId());

                Plan plan1 = planService.selectById(priOnline2.getItemId());
                PlanType planType1 = planTypeService.selectById(plan1.getPlanType());

                ProcessPermissions processPermissions1 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 5).eq("process", "2-"+planType1.getType()));//2：核价流程
                User manager1 = userService.selectById(processPermissions1.getUserId());       // 获取报价流程节点2确认人
//                PlanType planType1 = planTypeService.selectById(plan1.getPlanType());
//
//                ProcessPermissions processPermissions1 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 5).eq("process", "2-"+planType1.getType()));//2：核价流程
//                User manager1 = userService.selectById(processPermissions1.getUserId());       // 获取报价流程节点2确认人

                if (Cools.isEmpty(getUser())) {
                    return R.error("抱歉，您没有提交的权限");
@@ -524,63 +525,63 @@
                priOnline2.setSettle(1);
                priOnline2.setUpdateUserId(getUserId());
                priOnline2.setUpdateTime(now);
                priOnline2.setMemberId(manager1.getId());
                priOnline2.setMemberId(plan1.getUserId());

                if (!priOnline2Service.updateById(priOnline2)) {
                    throw new CoolException("提交失败，请联系管理员");
                }
                break;
            case 1:
                // 本部门经理审核  节点负责人
                Plan plan = planService.selectById(priOnline2.getItemId());
                PlanType planType = planTypeService.selectById(plan.getPlanType());

                ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 5).eq("process", "2-"+planType.getType()));//2：报价流程
                User manager = userService.selectById(processPermissions.getUserId());       // 获取报价流程节点2确认人

//                User manager = new User();
//                try{
//                    manager = userService.getDeptManager(getHostId(), getUser().getDeptId());        // 获取部门领导
//                }catch (Exception e){
//                    manager = user;
//            case 1:
//                // 本部门经理审核  节点负责人
//                Plan plan = planService.selectById(priOnline2.getItemId());
//                PlanType planType = planTypeService.selectById(plan.getPlanType());
//
//                ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 5).eq("process", "2-"+planType.getType()));//2：报价流程
//                User manager = userService.selectById(processPermissions.getUserId());       // 获取报价流程节点2确认人
//
////                User manager = new User();
////                try{
////                    manager = userService.getDeptManager(getHostId(), getUser().getDeptId());        // 获取部门领导
////                }catch (Exception e){
////                    manager = user;
////                }
//                if (manager.getId().equals(getUserId())) {
//
//                    // 修改 settle 步骤数据
//                    List<SettleDto> list = JSON.parseArray(priOnline2.getSettleMsg(), SettleDto.class);
//                    for (SettleDto dto : list) {
//                        switch (dto.getStep()) {
//                            case 1:
//                                dto.setCurr(Boolean.FALSE);
//                                break;
//                            case 2:
//                                dto.setCurr(Boolean.TRUE);
//                                if (Cools.isEmpty(dto.getMsg())){
//                                    dto.setMsg(manager.getNickname() + "审批通过");
//                                }else {
//                                    dto.setMsg(dto.getMsg()+PZH+DateUtils.convert(new Date())+" " + manager.getNickname() + "审批通过");
//                                }
//                                dto.setTime(DateUtils.convert(now));
//                                break;
//                            default:
//                                break;
//                        }
//                    }
//                    priOnline2.setSettleMsg(JSON.toJSONString(list));
//
//                    // 修改规划单状态
//                    priOnline2.setSettle(2);  // 申请通过
//                    priOnline2.setUpdateTime(now);
//                    priOnline2.setUpdateUserId(getUserId());
//                    priOnline2.setMemberId(plan.getUserId());
//                    if (!priOnline2Service.updateById(priOnline2)) {
//                        throw new CoolException("审核失败，请联系管理员");
//                    }
//                } else {
//                    return R.error("抱歉，您没有审核的权限！！！");
//                }
                if (manager.getId().equals(getUserId())) {

                    // 修改 settle 步骤数据
                    List<SettleDto> list = JSON.parseArray(priOnline2.getSettleMsg(), SettleDto.class);
                    for (SettleDto dto : list) {
                        switch (dto.getStep()) {
                            case 1:
                                dto.setCurr(Boolean.FALSE);
                                break;
                            case 2:
                                dto.setCurr(Boolean.TRUE);
                                if (Cools.isEmpty(dto.getMsg())){
                                    dto.setMsg(manager.getNickname() + "审批通过");
                                }else {
                                    dto.setMsg(dto.getMsg()+PZH+DateUtils.convert(new Date())+" " + manager.getNickname() + "审批通过");
                                }
                                dto.setTime(DateUtils.convert(now));
                                break;
                            default:
                                break;
                        }
                    }
                    priOnline2.setSettleMsg(JSON.toJSONString(list));

                    // 修改规划单状态
                    priOnline2.setSettle(2);  // 申请通过
                    priOnline2.setUpdateTime(now);
                    priOnline2.setUpdateUserId(getUserId());
                    priOnline2.setMemberId(plan.getUserId());
                    if (!priOnline2Service.updateById(priOnline2)) {
                        throw new CoolException("审核失败，请联系管理员");
                    }
                } else {
                    return R.error("抱歉，您没有审核的权限！！！");
                }
                break;
            case 2:
//                break;
            case 1:
                // 业务员
                User salesman0 = userService.selectById(priOnline2.getUserId());
                if (!getUserId().equals(salesman0.getId())) {
@@ -590,10 +591,10 @@
                List<SettleDto> list2 = JSON.parseArray(priOnline2.getSettleMsg(), SettleDto.class);
                for (SettleDto dto : list2) {
                    switch (dto.getStep()) {
                        case 2:
                        case 1:
                            dto.setCurr(Boolean.TRUE);
                            break;
                        case 3:
                        case 2:
                            dto.setCurr(Boolean.TRUE);
                            if (Cools.isEmpty(dto.getMsg())){
                                dto.setMsg("业务员" + salesman0.getNickname() + "审批通过");
@@ -608,7 +609,7 @@
                }
                priOnline2.setSettleMsg(JSON.toJSONString(list2));
                // 修改规划单状态
                priOnline2.setSettle(3);  // 审批通过
                priOnline2.setSettle(2);  // 审批通过
                priOnline2.setStatus(1);
                priOnline2.setUpdateTime(new Date());
                priOnline2.setUpdateUserId(getUserId());