#流程相关

LSH

2023-10-09 03b0a7674513a528354ca91d70a8e71857984d33

#流程相关

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

@@ -42,7 +42,10 @@
    private PlanService planService;

    @Autowired
    private PriSalesService priSalesService;
    private  PlanTypeService planTypeService;

    @Autowired
    private ProcessPermissionsService processPermissionsService;

    @Autowired
    private PriQuoteService priQuoteService;
@@ -165,12 +168,20 @@

        priOnline2.setSettle(0);

        User manager = new User();
        try{
            manager = userService.getDeptManager(getHostId(), getUser().getDeptId());        // 获取部门领导
        }catch (Exception e){
            manager = getUser();
        }
//        User manager = new User();
//        try{
//            manager = userService.getDeptManager(getHostId(), getUser().getDeptId());        // 获取部门领导
//        }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确认人

        User userUp = userService.selectById(plan.getUserId());                               // 获取业务员
        List<String> initNames = new ArrayList<>();
        initNames.add("接取核价任务");
@@ -469,14 +480,21 @@
                }
                break;
            case 1:
                // 本部门经理审核
                User user = userService.selectById(priOnline2.getUserId());
                User manager = new User();
                try{
                    manager = userService.getDeptManager(getHostId(), getUser().getDeptId());        // 获取部门领导
                }catch (Exception e){
                    manager = user;
                }

                // 本部门经理审核  节点负责人
                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 步骤数据
@@ -488,7 +506,7 @@
                                break;
                            case 2:
                                dto.setCurr(Boolean.TRUE);
                                dto.setMsg("部门经理" + manager.getNickname() + "审批通过");
                                dto.setMsg(manager.getNickname() + "审批通过");
                                dto.setTime(DateUtils.convert(now));
                                break;
                            default:
@@ -532,6 +550,7 @@
                priOnline2.setSettleMsg(JSON.toJSONString(list2));
                // 修改规划单状态
                priOnline2.setSettle(3);  // 审批通过
                priOnline2.setStatus(1);
                priOnline2.setUpdateTime(new Date());

                if (!priOnline2Service.updateById(priOnline2)) {

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

@@ -133,6 +133,8 @@
                return "报销流程";
            case 4:
                return "出差流程";
            case 5:
                return "核价流程";
            case 7:
                return "合同管理";
            default:

 src/main/webapp/views/processPermissions/processPermissions.html

@@ -32,6 +32,7 @@
                                <option value="2">报价流程</option>
                                <option value="3">报销流程</option>
<!--                                <option value="4">出差流程</option>-->
                                <option value="5">核价流程</option>
                                <option value="7">合同管理</option>
                            </select>
                        </div>
@@ -43,6 +44,7 @@
                                <option value="">请选择状态</option>
                                <option value="1-1">1-1</option>
                                <option value="2-1">2-1</option>
                                <option value="2-2">2-2</option>
                                <option value="3-1">3-1</option>
                                <option value="3-2">3-2</option>
                                <option value="4-1">4-1</option>