From def325eb00744bae8f3494ddb253fe202ad76520 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期日, 07 四月 2024 18:08:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/controller/CheckRuleController.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/CheckRuleController.java b/ycl-server/src/main/java/com/ycl/platform/controller/CheckRuleController.java
index bac5c34..d90e241 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/CheckRuleController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/CheckRuleController.java
@@ -2,6 +2,8 @@
import annotation.Log;
import com.ycl.platform.domain.entity.CheckRule;
+import com.ycl.platform.domain.query.CheckRuleQuery;
+import com.ycl.platform.domain.vo.CheckRuleVO;
import com.ycl.platform.service.ICheckRuleService;
import com.ycl.system.AjaxResult;
import com.ycl.system.controller.BaseController;
@@ -33,11 +35,11 @@
* 鏌ヨ鑰冩牳瑙勫垯鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('system:rule:list')")
- @GetMapping("/list")
- public TableDataInfo list(CheckRule checkRule)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody CheckRuleQuery checkRuleQuery)
{
startPage();
- List<CheckRule> list = checkRuleService.selectCheckRuleList(checkRule);
+ List<CheckRuleVO> list = checkRuleService.selectCheckRuleList(checkRuleQuery);
return getDataTable(list);
}
@@ -47,10 +49,10 @@
@PreAuthorize("@ss.hasPermi('system:rule:export')")
@Log(title = "鑰冩牳瑙勫垯", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, CheckRule checkRule)
+ public void export(HttpServletResponse response, CheckRuleQuery checkRuleQuery)
{
- List<CheckRule> list = checkRuleService.selectCheckRuleList(checkRule);
- ExcelUtil<CheckRule> util = new ExcelUtil<CheckRule>(CheckRule.class);
+ List<CheckRuleVO> list = checkRuleService.selectCheckRuleList(checkRuleQuery);
+ ExcelUtil<CheckRuleVO> util = new ExcelUtil<CheckRuleVO>(CheckRuleVO.class);
util.exportExcel(response, list, "鑰冩牳瑙勫垯鏁版嵁");
}
--
Gitblit v1.8.0