Merge remote-tracking branch 'origin/zycrm' into zycrm

Junjie

2023-11-10 cbc9250b33a955bc919a6afc5d4101ef65bbfafa

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

@@ -165,6 +165,12 @@
    }

    public void updateDirector(Long orderId, User user , Date now){
        User manager = new User();
        try{
            manager = userService.getDeptManager(getHostId(), user.getDeptId());        // 获取部门领导
        }catch (Exception e){
            manager = user;
        }
        try{
            List<Plan> plans = planService.selectList(new EntityWrapper<Plan>().eq("order_id", orderId));
            for (Plan plan:plans){
@@ -195,6 +201,11 @@
                                            dto.setUserId(priQuote.getUserId());
                                            dto.setUsername(priQuote.getUserId$());
                                            break;
                                        case 2:
                                            dto.setMsg(dto.getMsg()+" ———————————————————————————————————————————————————————————————————————————————— "+DateUtils.convert(now)+" 跟踪项目修改负责人时同步修改负责人经理为："+manager.getNickname());
                                            dto.setUserId(manager.getId());
                                            dto.setUsername(manager.getNickname());
                                            break;
                                        case 4:
                                            dto.setUserId(priQuote.getUserId());
                                            dto.setUsername(priQuote.getUserId$());
@@ -224,16 +235,11 @@
                        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;
                            if (dto.getStep() == 0) {
                                dto.setMsg(dto.getMsg() + " ———————————————————————————————————————————————————————————————————————————————— " + DateUtils.convert(now) + " 跟踪项目修改负责人为：" + priOnline2.getUser$());
                            } else if (dto.getStep().equals(priOnline2.getSettleSize())) {
                                dto.setUserId(priOnline2.getUserId());
                                dto.setUsername(priOnline2.getUser$());
                            }
                            priOnline2DtoList.add(dto);
                        }