From 32a6f0bcae6563f0c785b668dd5a4a907292e48c Mon Sep 17 00:00:00 2001 From: sinake <sinake1@qq.com> Date: 星期四, 25 九月 2025 18:14:20 +0800 Subject: [PATCH] 新增满意度统计明细 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 48 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..3bf67f6 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(); } @@ -326,6 +325,18 @@ } /** + * 鑾峰彇闅忚缁熻姣斾緥 + */ + @ApiOperation("鑾峰彇闅忚婊℃剰搴︾粺璁�") + @PostMapping("/getSfStatisticsJoy") + public AjaxResult getSfStatisticsJoy(@RequestBody ServiceSubtaskCountReq serviceSubtaskCountReq) { + if (CollectionUtils.isEmpty(serviceSubtaskCountReq.getServiceType())) { + return error("鏈嶅姟绫诲瀷涓嶈兘涓虹┖"); + } + return success(serviceSubtaskService.getSfStatisticsJoy(serviceSubtaskCountReq)); + } + + /** * 闅忚缁熻瀵煎嚭 */ //@PreAuthorize("@ss.hasPermi('system:taskcall:export')") @@ -337,4 +348,30 @@ util.exportExcel(response, sfStatistics, "闅忚缁熻瀵煎嚭"); } + /** + * 闅忚缁熻瀵煎嚭 + */ + @ApiOperation("鏈嶅姟缁熻鏌ヨ-鎸夋椂闂寸淮搴︾粺璁″嚭闄�/闂ㄨ瘖闅忚鏁版嵁") + @PostMapping("/getServiceStatistics") + public AjaxResult getServiceStatistics(@RequestBody ServiceStatisticsRequest serviceStatisticsRequest) { + SysUser user = getLoginUser().getUser(); + serviceStatisticsRequest.setOrgid(user.getOrgid()); + List<ServiceStatisticsResponse> serviceStatistics = serviceSubtaskService.getServiceStatistics(serviceStatisticsRequest); + return success(serviceStatistics); + } + + + /** + * 鑾峰彇闅忚缁熻姣斾緥 + */ + @ApiOperation("鑾峰彇闅忚婊℃剰搴︽槑缁�") + @PostMapping("/getSfStatisticsJoydetails") + public AjaxResult getSfStatisticsJoydetails(@RequestBody ServiceSubtaskCountReq serviceSubtaskCountReq) { + if (serviceSubtaskCountReq.getLeavehospitaldistrictcodes().size()==0&& + serviceSubtaskCountReq.getDeptcodes().size()==0) { + return error("绉戝鎴栫梾鍖轰笉鑳戒负绌�"); + } + return success(serviceSubtaskService.getSfStatisticsJoydetails(serviceSubtaskCountReq)); + } + } -- Gitblit v1.9.3