#

LSH

2023-11-28 237f9af69f9bf1a9ef8cd46e60ec368caa549ae7

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

@@ -6,15 +6,12 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.common.*;
import com.core.domain.KeyValueVo;
import com.core.exception.CoolException;
import com.zy.crm.common.entity.PhoneCodeTypeParam;
import com.zy.crm.common.model.SettleDto;
import com.zy.crm.common.service.OssService;
import com.zy.crm.common.utils.FileSaveExampleUtil;
import com.zy.crm.common.web.BaseController;
import com.zy.crm.manager.controller.result.FollowerTableVo;
import com.zy.crm.manager.entity.*;
@@ -59,6 +56,7 @@
    private ProcessPermissionsService processPermissionsService;

    String PZH=" ————————————————— ";
    Integer PBN = 6;


    @GetMapping(value = "/plan/{id}/auth")
@@ -77,7 +75,7 @@
        }
        resultObj.put("formHtml", planType.getHtml());
        // 步骤条相关
        resultObj.put("step", plan.getSettle() == 4 ? 0 : plan.getSettle() + 1);
        resultObj.put("step", plan.getSettle().equals(plan.getSettleSize()) ? 0 : plan.getSettle() + 1);

        return R.ok().add(resultObj);
    }
@@ -115,6 +113,23 @@
        Arrays.asList(Cools.getAllFields(Plan.class)).forEach(item -> {
            fields.add(item.getName());
        });
    }

    @RequestMapping(value = "/plan/assistantPlan/view/auth")
    @ManagerAuth(memo = "查看副规划申请单")
    @Transactional
    public R assistantPlanView(@RequestParam Long hostPlanId) {
        Plan plan = planService.selectById(hostPlanId);
        if (plan.getAssistantHostSign()==1){
            EntityWrapper<Plan> wrapper = new EntityWrapper<>();
            wrapper.eq("id",plan.getHostPlanId());
            Page<Plan> planPage = planService.selectPage(new Page<>(1, 1), wrapper);
            return R.ok(planPage);
        }
        EntityWrapper<Plan> wrapper = new EntityWrapper<>();
        wrapper.eq("id",plan.getAssistantPlanId());
        Page<Plan> planPage = planService.selectPage(new Page<>(1, 1), wrapper);
        return R.ok(planPage);
    }

    @RequestMapping(value = "/plan/add/auth")
@@ -161,17 +176,43 @@

        plan.setForm(JSON.toJSONString(param));     // 自定义表单内容
        plan.setSettle(1);  // 1.开始
        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();
//        }
        PlanType planType = planTypeService.selectById(plan.getPlanType());
        if (planType.getType().equals(2)) {
            plan.setStatus2(0);
        }else {
            plan.setStatus2(10);
        }
        User planLeader = planTypeService.findPlanLeader(planType);
        plan.setSettleMsg(JSON.toJSONString(SettleDto.init(plan, manager, planLeader)));

        plan.setDirector(planLeader.getId());
        // 获取业务员
        List<String> initNames = new ArrayList<>();
        initNames.add("创建了审批");
        if (!planType.getFlag().equals("增补")){
            initNames.add("售前审核");
            initNames.add("规划员审核");
        }
        initNames.add("业务员确认");
        List<User> users = new ArrayList<>();
        users.add(getUser());
        if (!planType.getFlag().equals("增补")){
            users.add(planLeader);
            users.add(new User());
        }
        users.add(getUser());
//        plan.setSettleMsg(JSON.toJSONString(SettleDto.init(plan, manager, planLeader)));
        plan.setSettleMsg(JSON.toJSONString(SettleDto.InItFlowPathTwo(users, initNames, users.size())));
        plan.setSettleSize(users.size());
        if (users.size()>1){
            plan.setDirector(users.get(1).getId());
        }else {
            plan.setDirector(getUserId());
        }

        if (!planService.insert(plan)) {
            throw new CoolException("保持失败，请重试");
@@ -184,8 +225,121 @@
        if (!planFollService.insert(planFoll)) {
            throw new CoolException("保持失败，请重试");
        }

        if (users.size()>1 && !users.get(1).getId().equals(getUserId())){
            if (!smsCodeService.sendSmsCodeText(users.get(1).getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E,getUserId())) {
                return R.ok("创建成功但短信发送失败!");
            }
        }
        return R.ok();
    }

    @RequestMapping(value = "/plan/assistantPlan/add/auth")
    @ManagerAuth(memo = "添加副规划申请单")
    @Transactional
    public R assistantPlanAdd(@RequestParam Long hostPlanId) {
        Plan hostPlan = planService.selectById(hostPlanId);
        if (!getUserId().equals(hostPlan.getUserId())){
            return R.error("请联系业务员操作");
        }
        if (hostPlan.getAssistantHostSign()!=0){
            return R.error("此规划单不需要创建副流程");
        }
        PlanType planType2 = planTypeService.selectById(hostPlan.getPlanType());
        if (planType2.getType()!=2){
            return R.error("此规划单不需要创建副流程");
        }
        if (!Cools.isEmpty(hostPlan.getAssistantPlanId()) && hostPlan.getAssistantPlanId()!=0){
            return R.error("此规划单已存在副规划单，id为"+hostPlan.getAssistantPlanId());
        }
        // pre
        Plan plan = new Plan(hostPlan);
        // begin
        Long hostId = getHostId();
        if (planService.selectByUuid(hostId, plan.getUuid()) != null) {
            throw new CoolException("规划单已存在");
        }

        Order order = orderService.selectById(plan.getOrderId());
        if (Cools.isEmpty(order)) {
            throw new CoolException("跟踪项目不存在");
        }

        if (!order.getDirector().equals(getUserId())){
            throw new CoolException("只允许跟踪项目负责人添加所选项目规划申请单");
        }

        Date now = new Date();
        plan.setHostId(hostId);
        plan.setUuid(planService.getUuid(hostId));  // 规划单代号
        plan.setDeptId(getDeptId());               // 所属部门
        plan.setUserId(getUserId());               // 所属人员

        plan.setAppleTime(now);
        plan.setCreateBy(getUserId());
        plan.setCreateTime(now);
        plan.setUpdateBy(getUserId());
        plan.setUpdateTime(now);
        plan.setStatus(0);
        plan.setStatus2(0);
        plan.setStep(1);
        plan.setSettle(1);  // 1.开始
        plan.setAssistantHostSign(1);//副规划单

        User manager = new User();
        try{
            manager = userService.getDeptManager(getHostId(), getUser().getDeptId());        // 获取部门领导
        }catch (Exception e){
            manager = getUser();
        }
        PlanType planType = new PlanType(hostPlan.getHostId(),1);//1:货架
        User planLeader = planTypeService.findPlanLeader(planType);
        // 获取业务员
        List<String> initNames = new ArrayList<>();
        initNames.add("创建了审批");
        initNames.add("售前审核");
        initNames.add("规划员审核");
        initNames.add("业务员确认");
        List<User> users = new ArrayList<>();
        users.add(getUser());
        users.add(planLeader);
        users.add(new User());
        users.add(getUser());
//        plan.setSettleMsg(JSON.toJSONString(SettleDto.init(plan, manager, planLeader)));
        plan.setSettleMsg(JSON.toJSONString(SettleDto.InItFlowPathTwo(users, initNames, users.size())));
        plan.setSettleSize(users.size());
        if (users.size()>1){
            plan.setDirector(users.get(1).getId());
        }else {
            plan.setDirector(getUserId());
        }

        plan.setDirector(planLeader.getId());

        if (!planService.insert(plan)) {
            throw new CoolException("保存失败，请重试");
        }
        plan.setAssistantPlanId(plan.getId());
        plan.setHostPlanId(hostPlanId);
        if (!planService.updateById(plan)) {
            throw new CoolException("更新失败，请重试");
        }
        // 自动添加跟进人
        PlanFoll planFoll = new PlanFoll();
        planFoll.setPlanId(plan.getId());
        planFoll.setUserId(planLeader.getId());
        if (!planFollService.insert(planFoll)) {
            throw new CoolException("保存失败，请重试");
        }

        hostPlan.setAssistantPlanId(plan.getId());
        hostPlan.setHostPlanId(hostPlanId);
        if (!planService.updateById(hostPlan)) {
            throw new CoolException("更新失败，请重试");
        }
        if (!smsCodeService.sendSmsCodeText(planLeader.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E,getUserId())) {
            return R.ok("创建成功但短信发送失败!");
        }
        return R.ok("保存成功");
    }

   @RequestMapping(value = "/plan/update/auth")
@@ -249,41 +403,24 @@
             if (priOnline2!=0){
                 return R.error("存在关联的核价单，禁止删除！！！");
             }
             Plan planA = planService.selectById(id);
             if (planA.getAssistantHostSign()==1){
                 Plan planB = planService.selectById(planA.getHostPlanId());
                 planB.setAssistantPlanId(0L);
                 planB.setHostPlanId(0L);
                 planB.setStatus2(0);
                 planService.updateById(planB);
             }else {
                 if (!Cools.isEmpty(planA.getAssistantPlanId()) && planA.getAssistantPlanId()!=0){
                     Plan planB = planService.selectById(planA.getAssistantPlanId());
                     if (!Cools.isEmpty(planB)){
                         return R.error("存在关联的副规划单，禁止删除！！！ 副规划单ID："+planB.getId());
                     }
                 }
             }
             planService.deleteById(id);
        }
        return R.ok();
    }

    @RequestMapping(value = "/plan/insert/file/auth")
//    @ManagerAuth
    public R insertFile(@RequestParam("planId") String planId,@RequestParam MultipartFile file){
        try{
            InputStream inputStream = file.getInputStream();
            // 获取文件的内容类型
            String contentType = file.getContentType();
            String suffix = getFileSuffix(file.getOriginalFilename());
            String url = ossService.upload(inputStream, suffix,contentType);
//            String url = "http://tjdt.oss-cn-hangzhou.aliyuncs.com/"+file.getOriginalFilename();
            String[] names = url.split("com/");
            String name= names[1];
            String[] split = planId.split("-");
            int id = Integer.parseInt(split[1]);
            planService.increasePlanUrl(id,url,name,file.getSize());

            /*String[] split = planId.split("-");
            int id = Integer.parseInt(split[1]);
            System.out.println("---开始---");
            String savePath = "D:/crm/plan/file/"+id+"/"; // 指定保存文件的路径
            try{
                FileSaveExampleUtil.saveFile(file, savePath);
            }catch (Exception e){
                return R.error();
            }*/
            return R.ok();
        }catch (Exception e){
            System.out.println(e);
            return R.error();
        }
    }

    private String getFileSuffix(String filename) {
@@ -309,28 +446,6 @@
//        }
//        return R.ok();
//    }

    @RequestMapping(value = "/plan/view/file/auth")
//    @ManagerAuth
    public R viewFile(@RequestParam("planId") String planId){
        int id = Integer.parseInt(planId);
//        String savePath = "D:/crm/plan/file/"+id+"/"; // 指定保存文件的路径
        try{
            List<Integer> ids = planService.selectPlanUrlId(id);
            List<FileSaveExampleUtil.FileDTO> fileDTOS = new ArrayList<>();
            for (int id2 : ids){
                String url = planService.selectPlanUrlPlanIdUrl(id2);
                String name = planService.selectPlanUrlPlanIdName(id2);
                Long size = planService.selectPlanUrlPlanIdSize(id2);
                FileSaveExampleUtil.FileDTO dto = new FileSaveExampleUtil.FileDTO(name,size,url);
                fileDTOS.add(dto);
            }
//            List<FileSaveExampleUtil.FileDTO> fileDTOS = FileSaveExampleUtil.viewFileList(savePath);
            return R.ok(fileDTOS);
        }catch (Exception e){
            return R.error();
        }
    }

    @RequestMapping(value = "/plan/download/file/auth")
//    @ManagerAuth
@@ -358,221 +473,88 @@
                      @RequestParam(required = false) Long plannerId){
        Plan plan = planService.selectById(planId);
        assert plan != null;
        User plannerUser = new User();
        Long nextUserId = getUserId();
        User director = userService.selectById(plan.getDirector());

        switch (plan.getSettle()) {
//            case 1:
//                // 本组组长审核
//                User user = userService.selectById(plan.getUserId());
//                User manager = new User();
//                try{
//                    manager = userService.getDeptManager(getHostId(), getUser().getDeptId());        // 获取部门领导
//                }catch (Exception e){
//                    manager = user;
//                }
//                if (manager.getId().equals(getUserId())) {
//
//                    // 查找规划组长
//                    PlanType planType = planTypeService.selectById(plan.getPlanType());
//                    User planLeader = planTypeService.findPlanLeader(planType);
//                    if (Cools.isEmpty(planLeader)) {
//                        throw new CoolException("未查找到规划组长，请联系管理员");
//                    }
//
//                    // 修改 settle 步骤数据
//                    List<SettleDto> list = JSON.parseArray(plan.getSettleMsg(), SettleDto.class);
//                    for (SettleDto dto : list) {
//                        switch (dto.getStep()) {
//                            case 1:
//                                dto.setCurr(Boolean.FALSE);
//                                break;
//                            case 2:
//                                dto.setCurr(Boolean.TRUE);
//                                dto.setMsg("本组组长" + manager.getNickname() + "审批通过");
//                                dto.setTime(DateUtils.convert(new Date()));
//                                break;
//                            case 3:
//                                dto.setUserId(planLeader.getId());
//                                dto.setUsername(planLeader.getNickname());
//                                break;
//                            default:
//                                break;
//                        }
//                    }
//                    plan.setSettleMsg(JSON.toJSONString(list));
//
//                    // 修改规划单状态
//                    plan.setSettle(2);  // 规划组长待审
//                    plan.setUpdateBy(getUserId());
//                    plan.setUpdateTime(new Date());
//
//                    if (!planService.updateById(plan)) {
//                        throw new CoolException("审核失败，请联系管理员");
//                    }
//
//                    // 添加规划组长跟进人
//                    PlanFoll planFoll = new PlanFoll();
//                    planFoll.setPlanId(plan.getId());
//                    planFoll.setUserId(planLeader.getId());
//                    if (!planFollService.insert(planFoll)) {
//                        throw new CoolException("审核失败，请联系管理员");
//                    }
//
//                } else {
//                    return R.error("抱歉，您没有审核的权限");
//                }
//                break;
            case 1:
                // 查找规划组长
                PlanType planType = planTypeService.selectById(plan.getPlanType());
                User planLeader = planTypeService.findPlanLeader(planType);
                if (Cools.isEmpty(planLeader)) {
                    throw new CoolException("未查找到规划组长，请联系管理员");
                }
                if (Cools.isEmpty(planLeader)) {
                    throw new CoolException("未查找到规划组长，请联系管理员");
                }
                if (!getUserId().equals(planLeader.getId())) {
                    return R.error("抱歉，您没有审核的权限");
                }
                if (Cools.isEmpty(plannerId)) {
                    return R.error("指定规划员不能为空");
                }
                plan.setDirector(plannerId);
                User planner = userService.selectById(plannerId);
                // 修改 settle 步骤数据
                List<SettleDto> list = JSON.parseArray(plan.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("售前组长" + planLeader.getNickname() + "审批通过");
                            }else {
                                dto.setMsg(dto.getMsg()+PZH+DateUtils.convert(new Date())+" "+"售前组长" + planLeader.getNickname() + "审批通过");
                            }
                            dto.setTime(DateUtils.convert(new Date()));
                            break;
                        case 3:
                            dto.setUserId(planner.getId());
                            dto.setUsername(planner.getNickname());
                            break;
                        default:
                            break;
                    }
                }
                plan.setSettleMsg(JSON.toJSONString(list));
                // 修改规划单状态
                plan.setSettle(2);  // 规划员待审
                plan.setPlanner(planner.getId());
                plan.setUpdateBy(getUserId());
                plan.setUpdateTime(new Date());

                boolean sendSmsCode = smsCodeService.sendSmsCodeText(planner.getMobile());
                if (!sendSmsCode) {
                    System.out.println("短信发送失败！");
                }

                if (!planService.updateById(plan)) {
                    throw new CoolException("审核失败，请联系管理员");
                }

                // 添加规划员跟进人
                PlanFoll planFoll = new PlanFoll();
                planFoll.setPlanId(plan.getId());
                planFoll.setUserId(planner.getId());
                if (!planFollService.insert(planFoll)) {
                    throw new CoolException("审核失败，请联系管理员");
                }
                break;
            case 2:
                User plannerUser = userService.selectById(plan.getPlanner());
                if (Cools.isEmpty(plannerUser)) {
                    return R.error("未找到规划员");
                }
                if (!getUserId().equals(plannerUser.getId())) {
                    return R.error("抱歉，您没有审核的权限");
                }
                // 业务员
                User salesman = userService.selectById(plan.getUserId());
                plan.setDirector(salesman.getId());

                // 修改 settle 步骤数据
                List<SettleDto> list0 = JSON.parseArray(plan.getSettleMsg(), SettleDto.class);
                for (SettleDto dto : list0) {
                    switch (dto.getStep()) {
                        case 2:
                            dto.setCurr(Boolean.FALSE);
                            break;
                        case 3:
                            dto.setCurr(Boolean.TRUE);
                            if (Cools.isEmpty(dto.getMsg())){
                                dto.setMsg("规划员" + plannerUser.getNickname() + "审批通过");
                            }else {
                                dto.setMsg(dto.getMsg()+PZH+DateUtils.convert(new Date())+" "+"规划员" + plannerUser.getNickname() + "审批通过");
                            }
                            dto.setTime(DateUtils.convert(new Date()));
                            break;
                        case 4:
                            dto.setUserId(salesman.getId());
                            dto.setUsername(salesman.getNickname());
                            break;
                        default:
                            break;
                    }
                }
                plan.setSettleMsg(JSON.toJSONString(list0));
                // 修改规划单状态
                plan.setSettle(3);  // 审批通过
                plan.setUpdateBy(getUserId());
                plan.setUpdateTime(new Date());

                if (!planService.updateById(plan)) {
                    throw new CoolException("审核失败，请联系管理员");
                }
                break;
            case 3:
                // 业务员
                User salesman0 = userService.selectById(plan.getUserId());
                if (!getUserId().equals(salesman0.getId())) {
                    return R.error("抱歉，您没有审核的权限");
                }
                // 修改 settle 步骤数据
                List<SettleDto> list1 = JSON.parseArray(plan.getSettleMsg(), SettleDto.class);
                for (SettleDto dto : list1) {
                    switch (dto.getStep()) {
                        case 3:
                            dto.setCurr(Boolean.TRUE);
                            break;
                        case 4:
                            dto.setCurr(Boolean.TRUE);
                            if (Cools.isEmpty(dto.getMsg())){
                                dto.setMsg("业务员" + salesman0.getNickname() + "审批通过");
                            }else {
                                dto.setMsg(dto.getMsg()+PZH+DateUtils.convert(new Date())+" "+"业务员" + salesman0.getNickname() + "审批通过");
                            }
                            dto.setTime(DateUtils.convert(new Date()));
                            break;
                        default:
                            break;
                    }
                }
                plan.setSettleMsg(JSON.toJSONString(list1));
                // 修改规划单状态
                plan.setSettle(4);  // 审批通过
                plan.setStatus(1);  // 审批通过
                plan.setUpdateBy(getUserId());
                plan.setUpdateTime(new Date());

                if (!planService.updateById(plan)) {
                    throw new CoolException("审核失败，请联系管理员");
                }
                break;
            default:
                return R.error();
        if (Cools.isEmpty(getUser()) || Cools.isEmpty(director)){
            return R.error("抱歉，您无需确认！！！");
        }

        if (!getUserId().equals(director.getId())) {
            return R.error("抱歉，您无需确认！！！");
        }

        // 修改 settle 步骤数据
        List<SettleDto> list = JSON.parseArray(plan.getSettleMsg(), SettleDto.class);
        // 修改 settle 步骤数据
        for (SettleDto dto : list) {
            if (dto.getStep().equals(plan.getSettle())) {
                dto.setCurr(Boolean.TRUE);
            } else if (dto.getStep().equals(plan.getSettle()+1)) {
                dto.setCurr(Boolean.TRUE);
                if (Cools.isEmpty(dto.getMsg())) {
                    dto.setMsg(director.getNickname() + "审批通过");
                } else {
                    dto.setMsg(dto.getMsg() + PZH + DateUtils.convert(new Date()) + " " + director.getNickname() + "审批通过");
                }
                dto.setTime(DateUtils.convert(new Date()));
            } else if (dto.getStep().equals(plan.getSettle() + 2)) {
                if (Cools.isEmpty(dto.getUserId())){
                    if (Cools.isEmpty(plannerId)) {
                        return R.error("指定规划员不能为空");
                    }
                    plannerUser = userService.selectById(plannerId);
                    if (Cools.isEmpty(plannerUser)){
                        return R.error("未查到指定规划员账号");
                    }
                    nextUserId= plannerId;
                    plan.setPlanner(plannerId);
                    dto.setUserId(plannerId);
                    dto.setUsername(plannerUser.getNickname());
                    // 添加规划员跟进人
                    PlanFoll planFoll = new PlanFoll();
                    planFoll.setPlanId(plan.getId());
                    planFoll.setUserId(nextUserId);
                    if (!planFollService.insert(planFoll)) {
                        throw new CoolException("审核失败，请联系管理员");
                    }
                }else {
                    nextUserId=dto.getUserId();
                }
            }
        }
        plan.setSettleMsg(JSON.toJSONString(list));
        // 修改规划单状态
        plan.setSettle(plan.getSettle()+1);  // 审批通过
        if (plan.getSettle().equals(plan.getSettleSize())){
            plan.setStatus(1);
            if (plan.getAssistantHostSign()==1){
                Plan planHost = planService.selectById(plan.getHostPlanId());
                planHost.setStatus2(1);
                planService.updateById(planHost);
            }
        }
        plan.setUpdateBy(getUserId());
        plan.setUpdateTime(new Date());
        plan.setDirector(nextUserId);

        if (!planService.updateById(plan)) {
            throw new CoolException("审核失败，请联系管理员");
        }
        if (!plan.getSettle().equals(plan.getSettleSize())){
            if (!Cools.isEmpty(plannerId) && nextUserId.equals(plannerId)){
                if (!smsCodeService.sendSmsCodeText(plannerUser.getMobile(), PhoneCodeTypeParam.ALIYUN_M6F3C81FE3,getUserId())) {
                    return R.ok("审核成功但短信发送失败!");
                }
            }else {
                User phoneUser = userService.selectById(nextUserId);
                if (!smsCodeService.sendSmsCodeText(phoneUser.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E,getUserId())) {
                    return R.ok("审核成功但短信发送失败!");
                }
            }
        }

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

@@ -629,6 +611,9 @@
        }
        // 查找规划组长
        PlanType planType = planTypeService.selectById(plan.getPlanType());
        if (plan.getAssistantHostSign()==1){
            planType.setType(1);
        }
        User planLeader = planTypeService.findPlanLeader(planType);
        if (Cools.isEmpty(planLeader)) {
            throw new CoolException("未查找到规划组长，请联系管理员");
@@ -640,6 +625,11 @@
        List<User> users = userService.selectList(new EntityWrapper<User>().eq("dept_id", planLeader.getDeptId()));
        List<KeyValueVo> vos = new ArrayList<>();
        users.forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getNickname()), item.getId())));
        if (planType.getType().equals(2)){
            ProcessPermissions processPermissions= processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 101).eq("process", "1-1"));//2：核价流程
            User manager = userService.selectById(processPermissions.getUserId());       // 获取核价流程节点1确认人
            vos.add(new KeyValueVo(String.valueOf(manager.getNickname()), manager.getId()));
        }
        return R.ok().add(vos);
    }

@@ -690,28 +680,24 @@
        EntityWrapper<Plan> wrapper = new EntityWrapper<>();
        wrapper.like("name", condition);
        wrapper.eq("status",1);
        wrapper.eq("assistant_host_sign",0);


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

        ProcessPermissions processPermissions2 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 5).eq("process", "1-2"));//2：核价流程
        User manager2 = userService.selectById(processPermissions2.getUserId());       // 获取核价流程节点1确认人


        List<ProcessPermissions> processPermissionsList = processPermissionsService.selectList(new EntityWrapper<ProcessPermissions>().eq("process_memo", 4).or().eq("process_memo", 5));//2：核价流程
        int type =0;
        if (getUserId().equals(manager1.getId())){
            type=1;//(货架)
        }else if (getUserId().equals(manager2.getId())){
            type = 2;//(集成)
        }else {
        for (ProcessPermissions processPermissions:processPermissionsList){
            if (getUserId().equals(processPermissions.getUserId())){
                type=PBN-processPermissions.getProcessMemo();
                break;
            }
        }
        if (type==0){
            return R.error("你不是核价员,无权接任务");
        }

            List<Long> typeList = new ArrayList<>();
        List<Long> typeList = new ArrayList<>();
        List<PlanType> planTypes = planTypeService.selectList(new EntityWrapper<PlanType>().eq("type", type));
        if (type==1){
            planTypes = planTypeService.selectList(new EntityWrapper<PlanType>());
        if (Cools.isEmpty(planTypes) || planTypes.size()==0){
            return R.ok();
        }
        for (PlanType planType : planTypes){
            typeList.add(planType.getId());
@@ -723,11 +709,27 @@
        List<Map<String, Object>> result = new ArrayList<>();
//        for (Plan plan : page.getRecords()){
        for (Plan plan : plans){
            User user = userService.selectById(plan.getUserId());
            Map<String, Object> map = new HashMap<>();
            map.put("id", plan.getId());
//            map.put("value", plan.getName()+"---"+plan.getId());
            map.put("value", plan.getName());
            map.put("value", plan.getName()+"---"+user.getNickname());
            result.add(map);
        }
        if (type==1){
            EntityWrapper<Plan> wrapper2 = new EntityWrapper<>();
            wrapper2.like("name", condition);
            wrapper2.eq("status",1);
            wrapper2.eq("assistant_host_sign",1);
            List<Plan> plan2s = planService.selectList(wrapper2);
            for (Plan plan : plan2s){
                User user = userService.selectById(plan.getUserId());
                Map<String, Object> map = new HashMap<>();
                map.put("id", plan.getId());
//            map.put("value", plan.getName()+"---"+plan.getId());
                map.put("value", plan.getName()+"---"+user.getNickname());
                result.add(map);
            }
        }
        return R.ok(result);
    }
@@ -757,7 +759,7 @@
     * excel导入
     */
    @PostMapping(value = "/plan/excel/import/auth")
    @ManagerAuth(memo = "甲方单位Excel导入")
    @ManagerAuth(memo = "客户信息Excel导入")
//    @Transactional
    public R planExcelImport(MultipartFile file) throws IOException {
        InputStream inStream = file.getInputStream();