From e4e220916dd2a4aa649a9b0162e5b5ed0dc9d7e5 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期二, 20 五月 2025 10:36:54 +0800 Subject: [PATCH] 代码提交 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 69 ++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 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 6aba903..4a2ef29 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,10 +9,13 @@ 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; import com.smartor.domain.*; +import com.smartor.mapper.PatMedInhospMapper; +import com.smartor.mapper.PatMedOuthospMapper; import com.smartor.service.IServiceSubtaskRecordService; import com.smartor.service.IServiceSubtaskService; import io.swagger.annotations.Api; @@ -81,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�呴殢璁夸俊鎭� */ @@ -128,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)); + } + + /** * 鑾峰彇鍗曚竴浠诲姟锛堥殢璁匡級璇︾粏淇℃伅 */ @@ -149,6 +196,7 @@ LoginUser loginUser = getLoginUser(); SysUser user = loginUser.getUser(); ivrTaskVO.setCreateBy(user.getNickName()); + ivrTaskVO.setUpdateBy(user.getNickName()); ivrTaskVO.setOrgid(user.getOrgid()); return success(serviceSubtaskService.insertOrUpdateTask(ivrTaskVO)); } @@ -156,6 +204,7 @@ @ApiOperation("淇敼瀛愪换鍔�") @PostMapping("/update") public AjaxResult update(@RequestBody ServiceSubtask serviceSubtask) { + serviceSubtask.setUpdateBy(getLoginUser().getUser().getNickName()); return toAjax(serviceSubtaskService.updateServiceSubtask(serviceSubtask)); } @@ -165,6 +214,14 @@ SysUser user = getLoginUser().getUser(); if (ObjectUtils.isNotEmpty(user)) serviceSubtask.setOrgid(user.getOrgid()); return toAjax(serviceSubtaskService.insertServiceSubtask(serviceSubtask)); + } + + @ApiOperation("鎮h�呭啀娆¢殢璁�") + @PostMapping("/addSubTaskAgain") + public AjaxResult addSubTaskAgain(@RequestBody ServiceSubtask serviceSubtask) { + SysUser user = getLoginUser().getUser(); + if (ObjectUtils.isNotEmpty(user)) serviceSubtask.setOrgid(user.getOrgid()); + return success(serviceSubtaskService.addSubTaskAgain(serviceSubtask)); } /** @@ -268,4 +325,16 @@ return success(serviceSubtaskService.getSfStatistics(serviceSubtaskCountReq)); } + /** + * 闅忚缁熻瀵煎嚭 + */ + //@PreAuthorize("@ss.hasPermi('system:taskcall:export')") + @Log(title = "闅忚缁熻瀵煎嚭锛�", businessType = BusinessType.EXPORT) + @PostMapping("/getSfStatisticsExport") + public void export(HttpServletResponse response, ServiceSubtaskCountReq serviceSubtaskCountReq) { + List<ServiceSubtaskStatistic> sfStatistics = serviceSubtaskService.getSfStatistics(serviceSubtaskCountReq); + ExcelUtil<ServiceSubtaskStatistic> util = new ExcelUtil<ServiceSubtaskStatistic>(ServiceSubtaskStatistic.class); + util.exportExcel(response, sfStatistics, "闅忚缁熻瀵煎嚭"); + } + } -- Gitblit v1.9.3