#

LSH

2023-11-04 aa0161bf05195ccb00bc1d8da4b1b8218f93f4d3

 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() == 3 ? 0 : priOnline2.getSettle() + 1);
        resultObj.put("step", priOnline2.getSettle().equals(priOnline2.getSettleSize()) ? 0 : priOnline2.getSettle() + 1);
        return R.ok().add(resultObj);
    }

@@ -88,13 +88,15 @@
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<PriOnline2> wrapper = new EntityWrapper<>();
        wrapper.setSqlSelect("id,title,create_time as createTime,filepath,settle,item_id as itemId,order_num as orderNum,template_name as templateName,user_id as userId,dept_id as deptId,status,update_time as updateTime,check_data as checkData,update_user_id as updateUserId,member_id as memberId");
        wrapper.setSqlSelect("id,title,create_time as createTime,filepath,settle,settle_size as settleSize,item_id as itemId,order_num as orderNum,template_name as templateName,user_id as userId,dept_id as deptId,status,update_time as updateTime,check_data as checkData,update_user_id as updateUserId,member_id as memberId");
//        wrapper.in("member_id", getUserRoleBelongsToUserId("allopen"));
        excludeTrash(param);
        convert(param, wrapper);
        allLike(PriOnline2.class, param.keySet(), wrapper, condition);
        wrapper.or().eq("member_id",getUserId());
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
        return R.ok(priOnline2Service.selectPage(new Page<>(curr, limit), wrapper));
    }

@@ -188,18 +190,29 @@
//        }

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

                                // 获取业务员
        List<String> initNames = new ArrayList<>();
        initNames.add("接取核价任务");
        initNames.add("完成核价");
        if (planType.getType().equals(2)) {
            initNames.add("完成核价");
        }
//        initNames.add("经理审核");
        initNames.add("业务员确认");
        priOnline2.setSettleMsg(JSON.toJSONString(SettleDto.initSalesPricingPriOnline2(getUser(),userUp,initNames,2)));
        List<User> users = new ArrayList<>();
        users.add(getUser());
        users.add(getUser());
        if (planType.getType().equals(2)) {
            users.add(userService.selectById(73));
        }
        users.add(userUp);
        priOnline2.setSettleMsg(JSON.toJSONString(SettleDto.InItFlowPath(users, initNames, users.size())));
        priOnline2.setSettleSize(users.size());

        //设置项目流程
        plan.setStep(2);
@@ -489,149 +502,57 @@
        PriOnline2 priOnline2 = priOnline2Service.selectById(priOnlineId);
        assert priOnline2 != null;
        Date now = new Date();
        switch (priOnline2.getSettle()) {
            case 0:
                // 本部门经理审核  节点负责人
                User user = userService.selectById(priOnline2.getMemberId());
        Long nextUserId = getUserId();
        User user = new User();
        List<SettleDto> list = new ArrayList<>();

                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确认人
        user = userService.selectById(priOnline2.getMemberId());

                if (Cools.isEmpty(getUser())) {
                    return R.error("抱歉，您没有提交的权限");
        if (Cools.isEmpty(getUser()) || Cools.isEmpty(user)){
            return R.error("抱歉，您无需确认！！！");
                }

                if (!getUserId().equals(user.getId())) {
                    return R.error("抱歉，您没有提交的权限");
                }
                // 修改 settle 步骤数据
                List<SettleDto> list1 = JSON.parseArray(priOnline2.getSettleMsg(), SettleDto.class);
                for (SettleDto dto : list1) {
                    switch (dto.getStep()) {
                        case 0:
                            dto.setCurr(Boolean.FALSE);
                            break;
                        case 1:
                            dto.setCurr(Boolean.TRUE);
                            if (Cools.isEmpty(dto.getMsg())){
                                dto.setMsg(user.getNickname() + "提交完成");
                            }else {
                                dto.setMsg(dto.getMsg()+PZH+DateUtils.convert(new Date())+" " + user.getNickname() + "提交完成");
                            }
                            dto.setTime(DateUtils.convert(now));
                            break;
                        default:
                            break;
                    }
                }
                priOnline2.setSettleMsg(JSON.toJSONString(list1));
                // 修改规划单状态
                priOnline2.setSettle(1);
                priOnline2.setUpdateUserId(getUserId());
                priOnline2.setUpdateTime(now);
                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;
////                }
//                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 1:
                // 业务员
                User salesman0 = userService.selectById(priOnline2.getUserId());
                if (!getUserId().equals(salesman0.getId())) {
                    return R.error("抱歉，您无需确认！！！");
                }
                // 修改 settle 步骤数据
                List<SettleDto> list2 = JSON.parseArray(priOnline2.getSettleMsg(), SettleDto.class);
                for (SettleDto dto : list2) {
                    switch (dto.getStep()) {
                        case 1:
        list = JSON.parseArray(priOnline2.getSettleMsg(), SettleDto.class);
        for (SettleDto dto : list) {
            if (dto.getStep().equals(priOnline2.getSettle())) {
                            dto.setCurr(Boolean.TRUE);
                            break;
                        case 2:
            } else if (dto.getStep().equals(priOnline2.getSettle() + 1)) {
                            dto.setCurr(Boolean.TRUE);
                            if (Cools.isEmpty(dto.getMsg())){
                                dto.setMsg("业务员" + salesman0.getNickname() + "审批通过");
                    dto.setMsg(user.getNickname() + "审批通过");
                            }else {
                                dto.setMsg(dto.getMsg()+PZH+DateUtils.convert(new Date())+" "+"业务员" + salesman0.getNickname() + "审批通过");
                    dto.setMsg(dto.getMsg() + PZH + DateUtils.convert(new Date()) + " " + user.getNickname() + "审批通过");
                            }
                            dto.setTime(DateUtils.convert(new Date()));
                            break;
                        default:
                            break;
            } else if (dto.getStep().equals(priOnline2.getSettle() + 2)) {
                nextUserId=dto.getUserId();
                    }
                }
                priOnline2.setSettleMsg(JSON.toJSONString(list2));
        priOnline2.setSettleMsg(JSON.toJSONString(list));
                // 修改规划单状态
                priOnline2.setSettle(2);  // 审批通过
        priOnline2.setSettle(priOnline2.getSettle() + 1);  // 审批通过
        if (user.getId().equals(priOnline2.getUserId())) {
                priOnline2.setStatus(1);
                priOnline2.setUpdateTime(new Date());
        }
        priOnline2.setUpdateTime(now);
                priOnline2.setUpdateUserId(getUserId());
        priOnline2.setMemberId(nextUserId);

                if (!priOnline2Service.updateById(priOnline2)) {
                    throw new CoolException("确认失败，请联系管理员");
                }
        if (user.getId().equals(priOnline2.getUserId())) {
                try{
                    priQuoteAdd(priOnline2.getId(),plannerId);
                }catch (Exception e){
                    return R.error("自动生成报价单失败");
                }
                break;
            default:
                return R.error();
        }

        return R.ok("审批成功");
    }