#

LSH

2023-10-31 d12182e55e566fe3d9e64a8d9dee7931600dda00

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

@@ -55,6 +55,8 @@
    private OrderService orderService;
    @Autowired
    private SmsCodeService smsCodeService;
    @Autowired
    private ProcessPermissionsService processPermissionsService;

    String PZH=" ————————————————— ";

@@ -598,6 +600,8 @@
        plan.setStep(1);
        plan.setSettle(1);
        plan.setSettleMsg(JSON.toJSONString(planDtoList));
        plan.setUpdateBy(getUserId());
        plan.setUpdateTime(now);
        planService.updateById(plan);
        return R.ok("回退成功");
    }
@@ -675,12 +679,24 @@
        wrapper.like("name", condition);
        wrapper.eq("status",1);

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

        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确认人


        int type =0;
        if (getUserId().equals(manager1.getId())){
            type=1;//(货架)
        }else if (getUserId().equals(manager2.getId())){
            type = 2;//(集成)
        }else {
            return R.error("你不是核价员,无权接任务");
        }

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