#

LSH

2023-11-04 aa0161bf05195ccb00bc1d8da4b1b8218f93f4d3

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

@@ -43,6 +43,8 @@
    private PriOnline2Service priOnline2Service;
    @Autowired
    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());
@@ -158,7 +191,7 @@
                                for (SettleDto dto : priQuoteDtos) {
                                    switch (dto.getStep()) {
                                        case 1:
                                            dto.setMsg(dto.getMsg()+" ——————————————————————————————————————————————————————————————————————————— "+DateUtils.convert(now)+" 跟踪项目修改负责人为："+priQuote.getUserId$());
                                            dto.setMsg(dto.getMsg()+" ———————————————————————————————————————————————————————————————————————————————— "+DateUtils.convert(now)+" 跟踪项目修改负责人为："+priQuote.getUserId$());
                                            dto.setUserId(priQuote.getUserId());
                                            dto.setUsername(priQuote.getUserId$());
                                            break;
@@ -175,6 +208,8 @@

                                priQuoteService.updateById(priQuote);
                            }
                        }else {
                            signPriOnline2=true;
                        }
                        if (!signPriOnline2){
                            continue;
@@ -191,11 +226,9 @@
                        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$());
                                    dto.setMsg(dto.getMsg()+" ———————————————————————————————————————————————————————————————————————————————— "+DateUtils.convert(now)+" 跟踪项目修改负责人为："+priOnline2.getUser$());
                                    break;
                                case 3:
                                case 2:
                                    dto.setUserId(priOnline2.getUserId());
                                    dto.setUsername(priOnline2.getUser$());
                                    break;
@@ -209,6 +242,8 @@
                        priOnline2Service.updateById(priOnline2);
                    }

                }else {
                    signPlan=true;
                }

                if (!signPlan){
@@ -332,6 +367,7 @@
                , getHostId()
                , role.judgeLeader() ? String.valueOf(user.getDeptId()) : null
                , user.getId()
                , null
                , condition
                , 0);
        List<KeyValueVo> vos = new ArrayList<>();