#

LSH

2023-11-03 5f7598b354fdab871ebaf767200078316562e0c9

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

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

    @RequestMapping(value = "/order/{id}/auth")
    @ManagerAuth
@@ -62,10 +64,23 @@
        if (param.get("status") != null) {
            status = Integer.parseInt(param.get("status").toString());
        }

        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(orderService.getPage(new Page<>(curr, limit)
                , getHostId()
                , deptId == null ? null : String.valueOf(deptId)
                , userId == null ? getUserId() : userId
                , userId
                , director
                , condition
                , status)
        );
@@ -110,7 +125,25 @@
        }
        Date now = new Date();

        if (order.getStatus()!=0){
            if (Cools.isEmpty(order.getMemoExperience())){
                return R.error("请输入心得体会");
            }else {
                FollowUp followUp = new FollowUp();
                followUp.setWorkMsg(order.getMemoExperience());
                followUp.setOrderId(order.getId());
                followUp.setUserId(getUserId());
                followUp.setCreateBy(getUserId());
                followUp.setUpdateBy(getUserId());
                followUp.setDirector(getUserId());
                followUp.setDeptId(getDeptId());
                followUp.setCreateTime(now);
                followUp.setUpdateTime(now);
                followUpService.insert(followUp);
            }
        }

        order.setMemoExperience(null);
        order.setUpdateBy(getUserId());
        order.setUpdateTime(now);
        Order orderOld = orderService.selectById(order.getId());
@@ -135,45 +168,88 @@
        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;
                                }
                                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);
                            }
                        }else {
                            signPriOnline2=true;
                        }
                        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(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$());
                                    break;
                                case 2:
                                    dto.setUserId(priOnline2.getUserId());
                                    dto.setUsername(priOnline2.getUser$());
                                    break;
                                default:
                                    break;
                            }
                            priOnline2DtoList.add(dto);
                        }
                        priOnline2.setSettleMsg(JSON.toJSONString(priOnline2DtoList));

                        priOnline2Service.updateById(priOnline2);
                    }

                }else {
                    signPlan=true;
                }

                if (!signPlan){
                    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);
                    }
                    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));

                    priOnline2Service.updateById(priOnline2);
                }
                plan.setUserId(user.getId());
                plan.setDeptId(user.getDeptId());
                plan.setHostId(user.getHostId());
@@ -291,6 +367,7 @@
                , getHostId()
                , role.judgeLeader() ? String.valueOf(user.getDeptId()) : null
                , user.getId()
                , null
                , condition
                , 0);
        List<KeyValueVo> vos = new ArrayList<>();