From 704e7207d74b6477c5f472c5aba92d484ab17f98 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 29 十一月 2023 17:07:11 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/controller/cockpit/teamConstruction/TeamConstructionController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 cba4e8d..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
@@ -60,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,13 +88,15 @@
teamConstruction.setId(id);
return CommonResult.success(iTeamConstructionService.updateById(teamConstruction));
}
+
@ApiOperation(value = "鎵归噺鍒犻櫎杩濊绫诲瀷")
@DeleteMapping("/batch_delete")
- @LogSave(operationType = "杩愯惀鍩虹璁剧疆",contain = "鎵归噺鍒犻櫎杩濊浜嬮」")
+ @LogSave(operationType = "杩愯惀鍩虹璁剧疆", contain = "鎵归噺鍒犻櫎杩濊浜嬮」")
public CommonResult removeViolations(@RequestParam Long[] ids) {
return CommonResult.success(iTeamConstructionService.removeBatchByIds(Arrays.asList(ids)));
}
+
@PostMapping("/export")
@ApiOperation("瀵煎嚭")
@LogSave(operationType = "闃熶紞寤鸿绠＄悊", contain = "瀵煎嚭")
@@ -121,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