#

LSH

2023-11-28 4d70d2fce0e3dd5f0842cb8161181107dca1d55a

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

@@ -168,69 +168,6 @@
            wrapper.or().eq("host_id", 1);
        }
    }
//    @RequestMapping(value = "/priOnline2/HJ/add/auth")
//    @ManagerAuth(memo = "接取集成核价任务")
//    public R addHJ(PriOnline2 priOnline2) {
//        PriOnline2 priOnline21 = priOnline2Service.selectById(priOnline2.getId());
//        if (priOnline21.getSettle()!=1 || !priOnline21.getMemberId().equals(0L)){
//            return R.error("此集成核价单状态已改变，请刷新页面重新选择！");
//        }
//        Date now = new Date();
//        priOnline21.setMemberId(getUserId());
//
//
//        List<SettleDto> planDtos = JSON.parseArray(priOnline21.getSettleMsg(), SettleDto.class);
//        List<SettleDto> planDtoList = new ArrayList<>();
//        for (SettleDto dto : planDtos) {
//            if (dto.getStep().equals(2)) {
//                dto.setUserId(getUserId());
//                dto.setUsername(getUser().getNickname());
//                if (Cools.isEmpty(dto.getMsg())) {
//                    dto.setMsg(getUser().getNickname() + "接取核价");
//                } else {
//                    dto.setMsg(dto.getMsg() + PZH + DateUtils.convert(now) + " " + getUser().getNickname() + "接取核价");
//                }
//                dto.setTime(DateUtils.convert(new Date()));
//            }
//            planDtoList.add(dto);
//        }
//        priOnline21.setSettleMsg(JSON.toJSONString(planDtoList));
//        priOnline21.setUpdateUserId(getUserId());
//        priOnline21.setUpdateTime(now);
//        priOnline2Service.updateById(priOnline21);
//        return R.ok("接取成功");
//    }

//    @RequestMapping(value = "/priOnline2/HJ/search/auth")
//    @ManagerAuth
//    public R priOnline2Search(String condition) {
//        EntityWrapper<PriOnline2> wrapper = new EntityWrapper<>();
//        wrapper.like("template_name", condition);
//        wrapper.eq("member_id",0L);
//
//        List<ProcessPermissions> processPermissionsList = processPermissionsService.selectList(new EntityWrapper<ProcessPermissions>().eq("process_memo", 5));//2：核价流程
//        int type =0;
//        for (ProcessPermissions processPermissions:processPermissionsList){
//            if (getUserId().equals(processPermissions.getUserId())){
//                type=1;
//                break;
//            }
//        }
//        if (type==0){
//            return R.error("你不是核价员,无权接任务");
//        }
//        List<Map<String, Object>> result = new ArrayList<>();
//
//        List<PriOnline2> priOnline2s = priOnline2Service.selectList(wrapper);
//        for (PriOnline2 priOnline2 : priOnline2s){
//            Map<String, Object> map = new HashMap<>();
//            map.put("id", priOnline2.getId());
//            map.put("name", priOnline2.getTemplateName()+" - ID:"+priOnline2.getId());
//            result.add(map);
//        }
//        return R.ok(result);
//    }


    @RequestMapping(value = "/priOnline2/add/auth")
    @ManagerAuth(memo = "添加核价管理")
@@ -271,7 +208,6 @@
        if (plan.getStatus() != 1) {
            return R.error("此规划单状态改变，请刷新页面重新选择！");
        }
        priOnline2.setMemberId(getUserId());

        Cstmr cstmr = cstmrService.selectById(plan.getCstmrId());
        priOnline2.setTemplateName(cstmr.getName());  //客户信息名称
@@ -286,7 +222,7 @@
//        }

//        String node="2-";
        PlanType planType = planTypeService.selectById(plan.getPlanType());
//        PlanType planType = planTypeService.selectById(plan.getPlanType());
//        node = node+planType.getType();
//        ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 5).eq("process", "2-1"));//2：核价流程
//        User manager = userService.selectById(processPermissions.getUserId());       // 获取核价流程节点2确认人
@@ -300,11 +236,16 @@
        List<User> users = new ArrayList<>();
        users.add(getUser());
        users.add(getUser());
//        users.add(new User());
        users.add(userUp);
        priOnline2.setSettleMsg(JSON.toJSONString(SettleDto.InItFlowPath(users, initNames, users.size())));
        priOnline2.setSettleSize(users.size());
        priOnline2.setPlanId(plan.getId());

        if (users.size()>1){
            priOnline2.setMemberId(users.get(1).getId());
        } else {
            priOnline2.setMemberId(getUserId());
        }
        //设置项目流程
        plan.setStep(2);
        plan.setStatus(2);
@@ -623,10 +564,7 @@
        assert priOnline2 != null;
        Date now = new Date();
        Long nextUserId = getUserId();
        User user = new User();
        List<SettleDto> list = new ArrayList<>();

        user = userService.selectById(priOnline2.getMemberId());
        User user = userService.selectById(priOnline2.getMemberId());

        if (Cools.isEmpty(getUser()) || Cools.isEmpty(user)){
            return R.error("抱歉，您无需确认！！！");
@@ -636,7 +574,7 @@
            return R.error("抱歉，您无需确认！！！");
        }
        // 修改 settle 步骤数据
        list = JSON.parseArray(priOnline2.getSettleMsg(), SettleDto.class);
        List<SettleDto> list = JSON.parseArray(priOnline2.getSettleMsg(), SettleDto.class);
        for (SettleDto dto : list) {
            if (dto.getStep().equals(priOnline2.getSettle())) {
                dto.setCurr(Boolean.TRUE);