From 1e1814178edf84090b28492bbad340ab13e5c169 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期二, 22 七月 2025 18:16:34 +0800 Subject: [PATCH] 代码提交 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java index 4a2ef29..850c856 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java @@ -55,14 +55,18 @@ //@PreAuthorize("@ss.hasPermi('system:taskcall:list')") @PostMapping("/patItem") public TableDataInfo patItem(@RequestBody ServiceSubtaskVO serviceSubtaskVO) { + PageUtils.startPageByPost(serviceSubtaskVO.getPageNum(), serviceSubtaskVO.getPageSize()); List<ServiceSubtask> serviceSubtaskList = null; + LoginUser loginUser = getLoginUser(); + SysUser user = loginUser.getUser(); + serviceSubtaskVO.setOrgid(user.getOrgid()); if (serviceSubtaskVO != null) { - PageUtils.startPageByPost(serviceSubtaskVO.getPageNum(), serviceSubtaskVO.getPageSize()); serviceSubtaskList = serviceSubtaskService.patItem(serviceSubtaskVO); } for (ServiceSubtask serviceSubtask : serviceSubtaskList) { ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord(); serviceSubtaskRecord.setSubtaskId(serviceSubtask.getId()); + serviceSubtaskRecord.setOrgid(serviceSubtask.getOrgid()); if (ObjectUtils.isNotEmpty((serviceSubtask.getTaskid()))) serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString()); serviceSubtask.setServiceSubtaskRecordList(serviceSubtaskRecordService.selectServiceSubtaskRecordList(serviceSubtaskRecord)); @@ -192,7 +196,7 @@ @Log(title = "鍗曚竴浠诲姟锛堥殢璁匡級", businessType = BusinessType.INSERT) @PostMapping("/insertOrUpdateTask") public AjaxResult insertOrUpdateHeTask(@RequestBody ServiceTaskVO ivrTaskVO) { - log.error("insertOrUpdateHeTask鐨勫叆鍙備负锛歿}", ivrTaskVO); + log.info("insertOrUpdateHeTask鐨勫叆鍙備负锛歿}", ivrTaskVO); LoginUser loginUser = getLoginUser(); SysUser user = loginUser.getUser(); ivrTaskVO.setCreateBy(user.getNickName()); @@ -249,7 +253,7 @@ @ApiOperation("鐢佃瘽ASR閫氳瘽鍥炶皟(闆ㄧ划)") @PostMapping("/phoneCallBackYQ") public PhoneCallBackYQVO phoneCallBackYQ(@RequestBody PhoneCallReqYQVO phoneCallReqYQVO) { - log.error("鐢佃瘽ASR閫氳瘽鍥炶皟(闆ㄧ划) 锛焮}", phoneCallReqYQVO); + log.info("鐢佃瘽ASR閫氳瘽鍥炶皟(闆ㄧ划) 锛焮}", phoneCallReqYQVO); // SysUser user = getLoginUser().getUser(); // phoneCallReqYQVO.setOrgid(user.getOrgid()); PhoneCallBackYQVO phoneCallBackYQVO = serviceSubtaskService.phoneCallBackYQ(phoneCallReqYQVO); @@ -262,11 +266,9 @@ @ApiOperation("鐢佃瘽浠诲姟鎷夊彇(闆ㄧ划)") @PostMapping("/taskPull") public List<PullTaskVO> taskPull() { - log.error("鐢佃瘽浠诲姟鎷夊彇(闆ㄧ划)"); + log.info("鐢佃瘽浠诲姟鎷夊彇(闆ㄧ划)"); List<PullTaskVO> pullTaskVOList = serviceSubtaskService.taskPull(); -// List<PullTaskVO> pullTaskVOList = new ArrayList<>(); - - log.error("鐢佃瘽浠诲姟鎷夊彇(闆ㄧ划):{}", pullTaskVOList); + log.info("鐢佃瘽浠诲姟鎷夊彇鏁版嵁(闆ㄧ划):{}", pullTaskVOList); return pullTaskVOList; } @@ -296,10 +298,7 @@ @ApiOperation("閫氳瘽璁板綍鍥炶皟(闆ㄧ划)") @PostMapping("/recordAccept") public AjaxResult recordAccept(@RequestBody PhoneCallRecordVO phoneCallRecordVO) { - log.error("閫氳瘽璁板綍鍥炶皟(闆ㄧ划):{}", phoneCallRecordVO); -// return toAjax(serviceSubtaskService.saveQuestionAnswerPhone(serviceSubTaskDetailReq)); -// SysUser user = getLoginUser().getUser(); -// phoneCallRecordVO.setOrgid(user.getOrgid()); + log.info("閫氳瘽璁板綍鍥炶皟(闆ㄧ划):{}", phoneCallRecordVO); serviceSubtaskService.recordAccept(phoneCallRecordVO); return success(); } -- Gitblit v1.9.3