From 32d0e1a3400f801263dd721337bcf288f6c456db Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期四, 23 二月 2023 14:40:42 +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, 8 insertions(+), 1 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 9867d6a..f347a63 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> @@ -86,7 +87,13 @@ teamConstruction.setId(id); 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 = "瀵煎嚭") @@ -114,7 +121,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