From 295570a0b0a520606ec60b3ff9f151cd2b8af084 Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期四, 23 二月 2023 17:33:21 +0800 Subject: [PATCH] 队伍建设bug修改 --- ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml | 1 + ycl-platform/src/main/java/com/ycl/controller/cockpit/teamConstruction/TeamConstructionController.java | 7 +++++-- 2 files changed, 6 insertions(+), 2 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 f347a63..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 = "瀵煎嚭") diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml index b1e586b..7eb3d1d 100644 --- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml +++ b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml @@ -169,6 +169,7 @@ and t1.create_time between #{startTime} and #{endTime} </if> </where> + order by t1.alarm_time desc </select> <select id="selectViolationPage" resultType="com.ycl.vo.casePool.QueryForViolationVO" -- Gitblit v1.8.0