#核价相关

LSH

2023-10-09 26ebf71529e5ee4f70c4ad3ed52ea5e59c1b46e5

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

@@ -150,7 +150,8 @@
                    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) {
@@ -176,13 +177,15 @@
                plan.setUserId(user.getId());
                plan.setDeptId(user.getDeptId());
                plan.setHostId(user.getHostId());
                plan.setUpdateBy(getUserId());
                plan.setUpdateTime(now);

                List<SettleDto> planDtos = JSON.parseArray(plan.getSettleMsg(), SettleDto.class);
                List<SettleDto> planDtoList = new ArrayList<>();
                for (SettleDto dto : planDtos) {
                    switch (dto.getStep()) {
                        case 1:
                            dto.setMsg(dto.getMsg()+" —————— "+DateUtils.convert(now)+" 跟踪项目修改负责人为："+plan.getUserId$());
                            dto.setMsg(dto.getMsg()+" ——————————————— "+DateUtils.convert(now)+" 跟踪项目修改负责人为："+plan.getUserId$());
                            dto.setUserId(plan.getUserId());
                            dto.setUsername(plan.getUserId$());
                            break;
@@ -218,6 +221,15 @@
        return R.ok();
    }

    @PostMapping(value = "/order/business/list/auth")
    @ManagerAuth
    public R orderBusiness(@RequestParam Long orderId){
        List<KeyValueVo> vos = new ArrayList<>();
        vos.add(new KeyValueVo("出差申请", 1L));
        vos.add(new KeyValueVo("其它出差", 2L));
        return R.ok().add(vos);
    }

    @RequestMapping(value = "/orderQuery/auth")
    @ManagerAuth
    public R query(String condition) {