From 042936ba89e122bece0e4ce595c68f859b9e9bed Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期三, 17 四月 2024 17:53:43 +0800
Subject: [PATCH] 工单下发：新增互斥锁、下发记录
---
ycl-server/src/main/java/com/ycl/platform/controller/CheckRuleController.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 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..81ae394 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;
@@ -32,12 +34,12 @@
/**
* 鏌ヨ鑰冩牳瑙勫垯鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:rule:list')")
- @GetMapping("/list")
- public TableDataInfo list(CheckRule checkRule)
+// @PreAuthorize("@ss.hasPermi('system:rule:list')")
+ @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,17 +49,17 @@
@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, "鑰冩牳瑙勫垯鏁版嵁");
}
/**
* 鑾峰彇鑰冩牳瑙勫垯璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('system:rule:query')")
+// @PreAuthorize("@ss.hasPermi('system:rule:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
--
Gitblit v1.8.0