From a73593d70d59af01bc6afcd55ba817e319d228df Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 09 一月 2023 17:26:18 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/controller/writ/WritController.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/writ/WritController.java b/ycl-platform/src/main/java/com/ycl/controller/writ/WritController.java
index fb73f6f..27b618f 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/writ/WritController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/writ/WritController.java
@@ -1,11 +1,10 @@
package com.ycl.controller.writ;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
-import com.ycl.base.BaseController;
+import com.ycl.controller.BaseController;
import com.ycl.entity.caseHandler.Writ;
import com.ycl.service.caseHandler.IWritService;
import io.swagger.annotations.Api;
@@ -25,7 +24,7 @@
*/
@RestController
@RequestMapping("/writ")
-@Api(value = "鏂囦功绠＄悊")
+@Api(tags = "鏂囦功绠＄悊")
public class WritController extends BaseController {
@Autowired
@@ -34,11 +33,10 @@
@GetMapping("/query")
@ApiOperation(value = "鏌ヨlist")
@LogSave(operationType = "鏂囦功绠＄悊", contain = "鏌ヨ鏂囦功")
- public CommonResult search(@RequestParam Integer size,
- @RequestParam Integer current,
- @RequestParam(required = false) Integer writType) {
- return CommonResult.success(iWritService.page(new Page<>(size, current), new LambdaQueryWrapper<Writ>()
- .eq(writType != null, Writ::getWritType, writType)));
+ public CommonResult search(@RequestParam Integer pageSize,
+ @RequestParam Integer currentPage,
+ @RequestParam(required = false) String keyword) {
+ return CommonResult.success(iWritService.selectWritPage(new Page<>(currentPage, pageSize), keyword));
}
@GetMapping("/query_one")
@@ -55,6 +53,15 @@
return CommonResult.success(iWritService.updateById(writ));
}
+ @DeleteMapping("/delete/{id}")
+ @ApiOperation(value = "鎵归噺")
+ @LogSave(operationType = "鏂囦功绠＄悊", contain = "鍒犻櫎鏂囦功")
+ public CommonResult delete(@PathVariable Long id) {
+ Writ writ = iWritService.getById(id);
+ writ.setValue("");
+ return CommonResult.success(iWritService.updateById(writ));
+ }
+
@PutMapping("/deletion_batch")
@ApiOperation(value = "鎵归噺鍒犻櫎")
@LogSave(operationType = "鏂囦功绠＄悊", contain = "鍒犻櫎鏂囦功")
--
Gitblit v1.8.0