#流程相关

LSH

2023-10-10 84e2de710b6afd19266ff09ef4ae584ab9624566

#流程相关

 src/main/java/com/zy/crm/common/model/SettleDto.java

@@ -218,9 +218,9 @@
            switch (i) {
                case 0:
                    dto.setTitle("开始");
                    dto.setMsg(userUp.getUsername() + names.get(i));
                    dto.setUserId(userUp.getId());
                    dto.setUsername(userUp.getUsername());
                    dto.setMsg(user.getUsername() + names.get(i));
                    dto.setUserId(user.getId());
                    dto.setUsername(user.getUsername());
                    dto.setTime(DateUtils.convert(new Date()));
                    dto.setCurr(Boolean.TRUE);
                    list.add(dto);

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

@@ -42,7 +42,7 @@
    @Autowired
    private PriOnline2Service priOnline2Service;
    @Autowired
    private PriSalesService priSalesService;
    private PriQuoteService priQuoteService;

    @RequestMapping(value = "/order/{id}/auth")
    @ManagerAuth
@@ -135,45 +135,86 @@
        try{
            List<Plan> plans = planService.selectList(new EntityWrapper<Plan>().eq("order_id", orderId));
            for (Plan plan:plans){
                if (plan.getSettle$().equals("审批通过")){
                boolean signPlan = false;
                List<PriOnline2> priOnline2s = priOnline2Service.selectList(new EntityWrapper<PriOnline2>().eq("item_id", plan.getId()));
                if (!Cools.isEmpty(priOnline2s)){
                    for (PriOnline2 priOnline2:priOnline2s){
                        boolean signPriOnline2 = false;
                        List<PriQuote> priQuotes = priQuoteService.selectList(new EntityWrapper<PriQuote>().eq("pri_online_id", priOnline2.getId()));
                        if (!Cools.isEmpty(priQuotes)){
                            for (PriQuote priQuote:priQuotes){
                                if (priQuote.getSettle()>=4){
                    continue;
                }
                List<PriOnline2> priOnline2s = priOnline2Service.selectList(new EntityWrapper<PriOnline2>().eq("item_id", plan.getId()));
                for (PriOnline2 priOnline2:priOnline2s){
                    List<PriSales> priSalesList = priSalesService.selectList(new EntityWrapper<PriSales>().eq("pri_online2_id", priOnline2.getId()));
                    for (PriSales priSales:priSalesList){
                        priSales.setUserId(user.getId());
                        priSales.setDeptId(user.getDeptId());
                        priSales.setHostId(user.getHostId());
                        priSalesService.updateById(priSales);
                                signPriOnline2 = true;
                                priQuote.setUserId(user.getId());
                                priQuote.setDeptId(user.getDeptId());
                                priQuote.setHostId(user.getHostId());
                                priQuote.setUpdateUserId(getUserId());
                                priQuote.setUpdateTime(now);

                                List<SettleDto> priQuoteDtos = JSON.parseArray(priQuote.getSettleMsg(), SettleDto.class);
                                List<SettleDto> priQuoteDtoList = new ArrayList<>();
                                for (SettleDto dto : priQuoteDtos) {
                                    switch (dto.getStep()) {
                                        case 1:
                                            dto.setMsg(dto.getMsg()+" ——————————————————————————————————————————————————————————————————————————— "+DateUtils.convert(now)+" 跟踪项目修改负责人为："+priQuote.getUserId$());
                                            dto.setUserId(priQuote.getUserId());
                                            dto.setUsername(priQuote.getUserId$());
                                            break;
                                        case 4:
                                            dto.setUserId(priQuote.getUserId());
                                            dto.setUsername(priQuote.getUserId$());
                                            break;
                                        default:
                                            break;
                    }
                                    priQuoteDtoList.add(dto);
                                }
                                priQuote.setSettleMsg(JSON.toJSONString(priQuoteDtoList));

                                priQuoteService.updateById(priQuote);
                            }
                        }
                        if (!signPriOnline2){
                            continue;
                        }
                        signPlan = true;

                    priOnline2.setUserId(user.getId());
                    priOnline2.setDeptId(user.getDeptId());
                    priOnline2.setHostId(user.getHostId());
                    priOnline2.setUpdateUserId(getUserId());
                    priOnline2.setUpdateTime(now);
//                    List<SettleDto> priOnline2Dtos = JSON.parseArray(plan.getSettleMsg(), SettleDto.class);
//                    List<SettleDto> priOnline2DtoList = new ArrayList<>();
//                    for (SettleDto dto : priOnline2Dtos) {
//                        switch (dto.getStep()) {
//                            case 1:
//                                dto.setMsg(dto.getMsg()+" —————— "+DateUtils.convert(now)+" 跟踪项目修改负责人为："+plan.getUserId$());
//                                dto.setUserId(plan.getUserId());
//                                dto.setUsername(plan.getUserId$());
//                                break;
//                            case 4:
//                                dto.setUserId(plan.getUserId());
//                                dto.setUsername(plan.getUserId$());
//                                break;
//                            default:
//                                break;
//                        }
//                        priOnline2DtoList.add(dto);
//                    }
//                    plan.setSettleMsg(JSON.toJSONString(priOnline2DtoList));
                        List<SettleDto> priOnline2Dtos = JSON.parseArray(priOnline2.getSettleMsg(), SettleDto.class);
                        List<SettleDto> priOnline2DtoList = new ArrayList<>();
                        for (SettleDto dto : priOnline2Dtos) {
                            switch (dto.getStep()) {
                                case 0:
                                    dto.setMsg(dto.getMsg()+" ——————————————————————————————————————————————————————————————————————————— "+DateUtils.convert(now)+" 跟踪项目修改负责人为："+priOnline2.getUser$());
                                    dto.setUserId(priOnline2.getUserId());
                                    dto.setUsername(priOnline2.getUser$());
                                    break;
                                case 3:
                                    dto.setUserId(priOnline2.getUserId());
                                    dto.setUsername(priOnline2.getUser$());
                                    break;
                                default:
                                    break;
                            }
                            priOnline2DtoList.add(dto);
                        }
                        priOnline2.setSettleMsg(JSON.toJSONString(priOnline2DtoList));

                    priOnline2Service.updateById(priOnline2);
                }

                }

                if (!signPlan){
                    continue;
                }

                plan.setUserId(user.getId());
                plan.setDeptId(user.getDeptId());
                plan.setHostId(user.getHostId());

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

@@ -615,7 +615,7 @@
        wrapper.eq("status",1);

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


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

@@ -407,7 +407,7 @@
            map.put("id", priOnline2.getId());
//            map.put("value", priOnline2.getOrderNum() + "/" + priOnline2.getPlanId$() + "/" + priOnline2.getMemberId$());
//            map.put("value", priOnline2.getOrderNum() + "/" + priOnline2.getTemplateName());
            map.put("value", priOnline2.getOrderNum() + "/" + priOnline2.getPlanId$() + "/" + priOnline2.getMemberId$() + "/" + priOnline2.getTemplateName());
            map.put("value", priOnline2.getOrderNum() + "/" + priOnline2.getPlanId$() + "/" + priOnline2.getUser$() + "/" + priOnline2.getTemplateName());

            result.add(map);
        }

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

@@ -172,7 +172,7 @@
        try{
            manager = userService.getDeptManager(getHostId(), userUp.getDeptId());        // 获取部门领导
        }catch (Exception e){
            manager = getUser();
            manager = userUp;
        }
        priQuote.setMemberId(manager.getId());
        ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 2).eq("process", "3-1"));//2：报价流程

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

@@ -74,7 +74,7 @@
        }

        // 步骤条相关
        resultObj.put("step", reimburseOnline.getSettle() == 6 ? 0 : reimburseOnline.getSettle() + 1);
        resultObj.put("step", reimburseOnline.getSettle() == 7 ? 0 : reimburseOnline.getSettle() + 1);

        return R.ok().add(resultObj);
    }