#流程相关

LSH

2023-10-09 064e2b95e2a88f9679a1834e4dec95038c0482ff

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

@@ -138,11 +138,16 @@
        plan.setCreateTime(now);
        plan.setUpdateBy(getUserId());
        plan.setUpdateTime(now);
        plan.setStatus(1);
        plan.setStatus(0);

        plan.setForm(JSON.toJSONString(param));     // 自定义表单内容
        plan.setSettle(1);  // 1.开始
        User manager = userService.getDeptManager(hostId, getUser().getDeptId());        // 获取部门领导
        User manager = new User();
        try{
            manager = userService.getDeptManager(getHostId(), getUser().getDeptId());        // 获取部门领导
        }catch (Exception e){
            manager = getUser();
        }
        PlanType planType = planTypeService.selectById(plan.getPlanType());
        User planLeader = planTypeService.findPlanLeader(planType);
        plan.setSettleMsg(JSON.toJSONString(SettleDto.init(plan, manager, planLeader)));
@@ -337,7 +342,12 @@
//            case 1:
//                // 本组组长审核
//                User user = userService.selectById(plan.getUserId());
//                User manager = userService.getDeptManager(getHostId(), user.getDeptId());
//                User manager = new User();
//                try{
//                    manager = userService.getDeptManager(getHostId(), getUser().getDeptId());        // 获取部门领导
//                }catch (Exception e){
//                    manager = user;
//                }
//                if (manager.getId().equals(getUserId())) {
//
//                    // 查找规划组长
@@ -516,6 +526,7 @@
                plan.setSettleMsg(JSON.toJSONString(list1));
                // 修改规划单状态
                plan.setSettle(4);  // 审批通过
                plan.setStatus(1);  // 审批通过
                plan.setUpdateBy(getUserId());
                plan.setUpdateTime(new Date());

@@ -595,6 +606,39 @@
        return R.ok(result);
    }

    @RequestMapping(value = "/planQueryNameToRob/auth")
    @ManagerAuth
    public R planQueryNameToRob(String condition) {
        EntityWrapper<Plan> wrapper = new EntityWrapper<>();
        wrapper.like("name", condition);
        wrapper.eq("status",1);

        int type =1;
        if (getUser().getNickname().equals("李世豪3级")){
            type=2;
        }

        List<Long> typeList = new ArrayList<>();
        List<PlanType> planTypes = planTypeService.selectList(new EntityWrapper<PlanType>().eq("type", type));
        for (PlanType planType : planTypes){
            typeList.add(planType.getId());
        }
        wrapper.in("plan_type",typeList);

//        Page<Plan> page = planService.selectPage(new Page<>(0, 10), wrapper);
        List<Plan> plans = planService.selectList(wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
//        for (Plan plan : page.getRecords()){
        for (Plan plan : plans){
            Map<String, Object> map = new HashMap<>();
            map.put("id", plan.getId());
//            map.put("value", plan.getName()+"---"+plan.getId());
            map.put("value", plan.getName());
            result.add(map);
        }
        return R.ok(result);
    }

    @RequestMapping(value = "/plan/check/column/auth")
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {