From e5bf0d08d05f5c58224fe28cdf743a1bae88e3f0 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 30 十一月 2023 16:48:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/controller/cockpit/teamConstruction/TeamConstructionController.java | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/cockpit/teamConstruction/TeamConstructionController.java b/ycl-platform/src/main/java/com/ycl/controller/cockpit/teamConstruction/TeamConstructionController.java
index 855ea64..9bd7c85 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/cockpit/teamConstruction/TeamConstructionController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/cockpit/teamConstruction/TeamConstructionController.java
@@ -25,6 +25,7 @@
import javax.servlet.http.HttpServletResponse;
import java.time.LocalDateTime;
+import java.util.Arrays;
/**
* <p>
@@ -59,7 +60,8 @@
.page(new Page<TeamConstruction>().setSize(size).setCurrent(current), new LambdaQueryWrapper<TeamConstruction>()
.like(StringUtils.isNotBlank(departName), TeamConstruction::getName, departName)
.eq(status != null, TeamConstruction::getStatus, status)
- .eq(TeamConstruction::getIsDelete, isDelete)));
+ .eq(TeamConstruction::getIsDelete, isDelete)
+ .orderByDesc(TeamConstruction::getId)));
}
@PostMapping("/addition")
@@ -87,30 +89,34 @@
return CommonResult.success(iTeamConstructionService.updateById(teamConstruction));
}
+ @ApiOperation(value = "鎵归噺鍒犻櫎杩濊绫诲瀷")
+ @DeleteMapping("/batch_delete")
+ @LogSave(operationType = "杩愯惀鍩虹璁剧疆", contain = "鎵归噺鍒犻櫎杩濊浜嬮」")
+ public CommonResult removeViolations(@RequestParam Long[] ids) {
+
+ return CommonResult.success(iTeamConstructionService.removeBatchByIds(Arrays.asList(ids)));
+ }
+
@PostMapping("/export")
@ApiOperation("瀵煎嚭")
@LogSave(operationType = "闃熶紞寤鸿绠＄悊", contain = "瀵煎嚭")
@ApiImplicitParams(
{
- @ApiImplicitParam(name = "size", required = true, value = "椤甸潰鏁伴噺"),
- @ApiImplicitParam(name = "current", required = true, value = "椤电爜"),
@ApiImplicitParam(name = "departName", value = "閮ㄩ棬鍚嶇О"),
@ApiImplicitParam(name = "status", value = "鐘舵��")}
)
@SneakyThrows
- public void export(@RequestParam() Integer size,
- @RequestParam() Integer current,
- @RequestParam(name = "departName", required = false) String departName,
- @RequestParam(name = "status", required = false) Integer status,
- HttpServletResponse response) {
+ public void export(
+ @RequestParam(name = "departName", required = false) String departName,
+ @RequestParam(name = "status", required = false) Integer status,
+ HttpServletResponse response) {
Integer isDelete = 0;
String sheetName = "鏁版嵁";
EasyExcelUtils.export(response, sheetName, TeamConstruction.class, iTeamConstructionService
- .page(new Page<TeamConstruction>().setSize(size).setCurrent(current), new LambdaQueryWrapper<TeamConstruction>()
+ .list(new LambdaQueryWrapper<TeamConstruction>()
.like(StringUtils.isNotBlank(departName), TeamConstruction::getName, departName)
.eq(status != null, TeamConstruction::getStatus, status)
- .eq(TeamConstruction::getIsDelete, isDelete))
- .getRecords());
+ .eq(TeamConstruction::getIsDelete, isDelete)));
}
@@ -118,7 +124,7 @@
@ApiOperation("瀵煎叆")
@SneakyThrows
@LogSave(operationType = "闃熶紞寤鸿绠＄悊", contain = "瀵煎叆")
- public CommonResult export(MultipartFile multipartFile) {
+ public CommonResult export(@RequestParam("file") MultipartFile multipartFile) {
EasyExcel.read(multipartFile.getInputStream(), TeamConstruction.class, new ReadListener() {
@Override
public void invoke(Object o, AnalysisContext analysisContext) {
--
Gitblit v1.8.0