#

LSH

2023-11-07 3740a5aca02714f0786b88e09de92340e6bf617d

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

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

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


    @GetMapping(value = "/plan/{id}/auth")
@@ -87,10 +90,22 @@
                  @RequestParam(required = false) String condition,
                  @RequestParam(required = false, value = "dept_id") Long deptId,
                  @RequestParam(required = false, value = "user_id") Long userId) {
        Long director = null;
        if (deptId==null && userId == null){
            if (getRole().getId()==3){
                userId = getUserId();
            }else if (getRole().getId()==2){
                deptId = getDeptId();
                userId = null;
            }
            director = getUserId();
        }

        return R.ok(planService.getPage(new Page<>(curr, limit)
                , getHostId()
                , deptId == null ? null : String.valueOf(deptId)
                , userId == null ? getUserId() : userId
                , userId
                , director
                , condition)
        );
    }
@@ -247,8 +262,7 @@
            InputStream inputStream = file.getInputStream();
            // 获取文件的内容类型
            String contentType = file.getContentType();
            String suffix = getFileSuffix(file.getOriginalFilename());
            String url = ossService.upload(inputStream, suffix,contentType);
            String url = ossService.upload(inputStream, file.getOriginalFilename(), contentType);
//            String url = "http://tjdt.oss-cn-hangzhou.aliyuncs.com/"+file.getOriginalFilename();
            String[] names = url.split("com/");
            String name= names[1];
@@ -598,6 +612,8 @@
        plan.setStep(1);
        plan.setSettle(1);
        plan.setSettleMsg(JSON.toJSONString(planDtoList));
        plan.setUpdateBy(getUserId());
        plan.setUpdateTime(now);
        planService.updateById(plan);
        return R.ok("回退成功");
    }
@@ -624,6 +640,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);
    }

@@ -675,13 +696,23 @@
        wrapper.like("name", condition);
        wrapper.eq("status",1);

        int type =1;
        if (getUser().getNickname().equals("李世豪2级")){
            type=2;
        List<ProcessPermissions> processPermissionsList = processPermissionsService.selectList(new EntityWrapper<ProcessPermissions>().eq("process_memo", 4).or().eq("process_memo", 5));//2：核价流程
        int type =0;
        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<PlanType> planTypes = planTypeService.selectList(new EntityWrapper<PlanType>().eq("type", type));
        if (Cools.isEmpty(planTypes) || planTypes.size()==0){
            return R.ok();
        }
        for (PlanType planType : planTypes){
            typeList.add(planType.getId());
        }