From 8b1e34d8001f54ad3bceb55e9f323ca19f594276 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 02 四月 2024 16:47:53 +0800
Subject: [PATCH] !507 update 优化多余的bean转换 Merge pull request !507 from 秋辞未寒/dev_beancp
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java
index 31e31e6..ebe0882 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java
@@ -10,6 +10,7 @@
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.workflow.domain.bo.ModelBo;
@@ -22,6 +23,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
+import java.util.List;
/**
* 妯″瀷绠＄悊 鎺у埗灞�
@@ -45,8 +47,8 @@
* @param modelBo 妯″瀷鍙傛暟
*/
@GetMapping("/list")
- public TableDataInfo<Model> page(ModelBo modelBo) {
- return actModelService.page(modelBo);
+ public TableDataInfo<Model> page(ModelBo modelBo, PageQuery pageQuery) {
+ return actModelService.page(modelBo, pageQuery);
}
/**
@@ -124,12 +126,12 @@
/**
* 瀵煎嚭妯″瀷zip鍘嬬缉鍖�
*
- * @param modelId 妯″瀷id
+ * @param modelIds 妯″瀷id
* @param response 鐩稿簲
*/
- @GetMapping("/export/zip/{modelId}")
- public void exportZip(@NotEmpty(message = "妯″瀷id涓嶈兘涓虹┖") @PathVariable String modelId,
+ @GetMapping("/export/zip/{modelIds}")
+ public void exportZip(@NotEmpty(message = "妯″瀷id涓嶈兘涓虹┖") @PathVariable List<String> modelIds,
HttpServletResponse response) {
- actModelService.exportZip(modelId, response);
+ actModelService.exportZip(modelIds, response);
}
}
--
Gitblit v1.9.3