From 86b103f926cf92fff3d591c6ba07099ad8db3ad1 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期二, 01 七月 2025 15:53:04 +0800 Subject: [PATCH] 代码提交 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 50 insertions(+), 10 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 583fc84..69c6051 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 @@ -9,6 +9,7 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.enums.PreachFormEnum; import com.ruoyi.common.utils.DtoConversionUtils; import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.poi.ExcelUtil; @@ -83,6 +84,36 @@ // return getDataTable(serviceSubtaskService.patItem(ivrTaskcall)); } + + /** + * 瀵煎嚭鍗曚竴浠诲姟锛堥殢璁垮鏁欙級鍒楄〃 + */ + //@PreAuthorize("@ss.hasPermi('system:taskcall:export')") + @Log(title = "鍗曚竴浠诲姟锛堥殢璁垮鏁欙級", businessType = BusinessType.EXPORT) + @PostMapping("/patItemExport") + public void patItemExport(HttpServletResponse response, ServiceSubtaskVO serviceSubtaskVO) { + List<ServiceSubtask> serviceSubtaskList = null; + if (serviceSubtaskVO != null) { + if (serviceSubtaskVO.getPageNum() != null && serviceSubtaskVO.getPageSize() != null) + PageUtils.startPageByPost(serviceSubtaskVO.getPageNum(), serviceSubtaskVO.getPageSize()); + serviceSubtaskList = serviceSubtaskService.patItem(serviceSubtaskVO); + } + List<ServiceSubtaskExprot> serviceSubtaskExprots = null; + if (!CollectionUtils.isEmpty(serviceSubtaskList)) { + serviceSubtaskExprots = DtoConversionUtils.sourceToTarget(serviceSubtaskList, ServiceSubtaskExprot.class); + for (ServiceSubtaskExprot serviceSubtaskExprot : serviceSubtaskExprots) { + String pf = PreachFormEnum.getDescByCode(serviceSubtaskExprot.getPreachform()); + serviceSubtaskExprot.setPreachform(pf); + } + + } + + + ExcelUtil<ServiceSubtaskExprot> util = new ExcelUtil<ServiceSubtaskExprot>(ServiceSubtaskExprot.class); + util.exportExcel(response, serviceSubtaskExprots, "鎮h�呴殢璁夸俊鎭〃鍗�"); + } + + /** * 鏌ヨ鎮h�呴殢璁夸俊鎭� */ @@ -130,6 +161,20 @@ util.exportExcel(response, list, "鍗曚竴浠诲姟锛堥殢璁匡級鏁版嵁"); } + + /** + * 鍐嶆闅忚鏁版嵁鏌ヨ + */ + //@PreAuthorize("@ss.hasPermi('system:taskcall:export')") + @Log(title = "鍐嶆闅忚鏁版嵁鏌ヨ", businessType = BusinessType.EXPORT) + @PostMapping("/querySubtaskListAgain") + public TableDataInfo querySubtaskListAgain(@RequestBody ServiceSubtaskVO serviceSubtaskVO) { + PageUtils.startPageByPost(serviceSubtaskVO.getPageNum(), serviceSubtaskVO.getPageSize()); + serviceSubtaskService.selectServiceSubtaskListAgain(serviceSubtaskVO); + return getDataTable(serviceSubtaskService.selectServiceSubtaskListAgain(serviceSubtaskVO)); + } + + /** * 鑾峰彇鍗曚竴浠诲姟锛堥殢璁匡級璇︾粏淇℃伅 */ @@ -147,7 +192,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()); @@ -204,7 +249,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); @@ -217,11 +262,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; } @@ -251,10 +294,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