#

Junjie

2023-09-08 3041a7d6dba13e237c4f21d3e46b88c35d376bf3

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

@@ -120,7 +120,7 @@
    }

    @RequestMapping(value = "/priQuote/add/auth")
    @ManagerAuth
    @ManagerAuth(memo = "添加报价单")
    public R add(@RequestBody Map<String,Object> map) {
        PriQuoteBudget priQuoteBudget = priQuoteBudgetService.selectById(Long.parseLong(map.get("priQuoteBudgetId").toString()));

@@ -153,8 +153,8 @@
        priQuote.setForm(JSON.toJSONString(map));     // 自定义表单内容
        priQuote.setSettle(1);  // 1.开始
        User manager = userService.getDeptManager(getHostId(), getUser().getDeptId());        // 获取部门领导
        ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 2).eq("process", 3));//2：报价流程
        User president = userService.selectById(processPermissions.getUserId());       // 获取报价流程节点3确认人
        ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 2).eq("process", "3-1"));//2：报价流程
        User president = userService.selectById(processPermissions.getUserId());       // 获取报价流程节点3-1确认人
        priQuote.setSettleMsg(JSON.toJSONString(SettleDto.initPriQuote(plan, manager,president,getUser())));

        planService.updateById(plan);
@@ -164,7 +164,7 @@
    }

    @RequestMapping(value = "/priQuote/addOther/auth")
    @ManagerAuth
    @ManagerAuth(memo = "另存报价单")
    public R addOther(@RequestBody Map<String,Object> map) {
        PriQuote quote = priQuoteService.selectById(Long.parseLong(map.get("id").toString()));

@@ -195,7 +195,7 @@
    }

    @RequestMapping(value = "/priQuote/update/auth")
    @ManagerAuth
    @ManagerAuth(memo = "更新报价单")
    public R update(@RequestBody Map<String,Object> map){
        PriQuote priQuote = priQuoteService.selectById(Long.parseLong(map.get("id").toString()));
        priQuote.setTitle(map.get("title").toString());
@@ -209,7 +209,7 @@
    }

    @RequestMapping(value = "/priQuote/updateForm/auth")
    @ManagerAuth
    @ManagerAuth(memo = "更新报价单")
    public R updateForm(Long id,String templateName,String title){
        PriQuote priQuote = priQuoteService.selectById(id);
        priQuote.setTemplateName(templateName);
@@ -223,7 +223,7 @@
    }

    @RequestMapping(value = "/priQuote/delete/auth")
    @ManagerAuth
    @ManagerAuth(memo = "删除报价单")
    public R delete(Long[] ids){
        if (Cools.isEmpty(ids)){
            return R.error();
@@ -470,11 +470,10 @@
                }
                break;
            case 2:
                // 查找规划组长
                ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 2).eq("process", 3));//2：报价流程
                ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 2).eq("process", "3-1"));//2：报价流程
                User planLeader = userService.selectById(processPermissions.getUserId());       // 获取报价流程节点3确认人
                if (Cools.isEmpty(planLeader)) {
                    throw new CoolException("未查找到报价流程节点3确认人，请联系在审批权限添加确认人！");
                    throw new CoolException("未查找到报价流程节点3-1确认人，请联系在审批权限添加确认人！");
                }
                if (!getUserId().equals(planLeader.getId())) {
                    return R.error("抱歉，您没有审核的权限");
@@ -590,10 +589,10 @@
//                }
//                break;
//            case 2:
//                // 查找规划组长
//                User planLeader = userService.selectOne(new EntityWrapper<User>().eq("username","王开杰"));
//                ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 2).eq("process", "3-1"));//2：报价流程
//                User planLeader = userService.selectById(processPermissions.getUserId());       // 获取报价流程节点3确认人
//                if (Cools.isEmpty(planLeader)) {
//                    throw new CoolException("未查找总裁办，请联系管理员");
//                    throw new CoolException("未查找到报价流程节点3-1确认人，请联系在审批权限添加确认人！");
//                }
//                if (!getUserId().equals(planLeader.getId())) {
//                    return R.error("抱歉，您没有审核的权限");