From ac4341ea6b66ae02427d39d35f41d42d78b2eb2e Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期五, 14 二月 2025 10:08:32 +0800 Subject: [PATCH] # --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskLogController.java | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskLogController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskLogController.java index 69c8e46..323c3df 100644 --- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskLogController.java +++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskLogController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zy.asrs.framework.common.Cools; import com.zy.asrs.framework.common.R; +import com.zy.asrs.wms.common.annotation.CacheData; import com.zy.asrs.wms.common.annotation.OperationLog; import com.zy.asrs.wms.common.domain.BaseParam; import com.zy.asrs.wms.common.domain.KeyValVo; @@ -31,6 +32,7 @@ @PreAuthorize("hasAuthority('asrs:taskLog:list')") @PostMapping("/taskLog/page") + @CacheData(tableName = {"man_task_log"}) public R page(@RequestBody Map<String, Object> map) { BaseParam baseParam = buildParam(map, BaseParam.class); PageParam<TaskLog, BaseParam> pageParam = new PageParam<>(baseParam, TaskLog.class); @@ -39,14 +41,22 @@ @PreAuthorize("hasAuthority('asrs:taskLog:list')") @PostMapping("/taskLog/list") + @CacheData(tableName = {"man_task_log"}) public R list(@RequestBody Map<String, Object> map) { return R.ok().add(taskLogService.list()); } @PreAuthorize("hasAuthority('asrs:taskLog:list')") @GetMapping("/taskLog/{id}") + @CacheData(tableName = {"man_task_log"}) public R get(@PathVariable("id") Long id) { return R.ok().add(taskLogService.getById(id)); + } + + @PreAuthorize("hasAuthority('asrs:taskLog:list')") + @GetMapping("/taskLog/orderDetlId/{orderDetlId}") + public R getByOrderDetlId(@PathVariable("orderDetlId") Long orderDetlId) { + return R.ok().add(taskLogService.getByOrderDetlId(orderDetlId)); } @PreAuthorize("hasAuthority('asrs:taskLog:save')") @@ -96,7 +106,11 @@ @PreAuthorize("hasAuthority('asrs:taskLog:list')") @PostMapping("/taskLog/export") public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception { - ExcelUtil.build(ExcelUtil.create(taskLogService.list(), TaskLog.class), response); + BaseParam baseParam = buildParam(map, BaseParam.class); + PageParam<TaskLog, BaseParam> pageParam = new PageParam<>(baseParam, TaskLog.class); + List<TaskLog> data = taskLogService.list(pageParam.buildWrapper(true)); + + ExcelUtil.build(ExcelUtil.create(data, TaskLog.class), response); } } -- Gitblit v1.9.1