From 16c75a48e9ce1e282ac56ca40a6809451a36fc3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E4=B9=BE=E7=BF=94?= Date: Thu, 23 Apr 2026 13:09:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/basic/controller/BsAssignController.java | 3 +++ .../desk/basic/controller/CraftAbilityController.java | 8 +++++--- .../basic/controller/LocallyPlatedPartController.java | 5 +++++ .../desk/basic/controller/TeamSetController.java | 8 +++++--- .../desk/basic/controller/WorkCenterController.java | 6 ++++++ .../org/springblade/desk/basic/mapper/AssignMapper.xml | 1 + 6 files changed, 25 insertions(+), 6 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BsAssignController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BsAssignController.java index 2ba8a0bb..c7fcc3e1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BsAssignController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BsAssignController.java @@ -123,6 +123,9 @@ public class BsAssignController extends BladeController { @ApiOperationSupport(order = 3) @Operation(summary = "分页", description = "传入bsAssign") public R> page(BsAssignVO bsAssign, Query query) { + query.setDescs(null); + query.setAscs(null); + IPage pages = bsAssignService.selectBsAssignPage(Condition.getPage(query), bsAssign); List list = pages.getRecords(); for(BsAssignVO vo:list){ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java index df40334f..a4da8226 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java @@ -121,8 +121,10 @@ public class CraftAbilityController extends BladeController { @ApiOperationSupport(order = 2) @Operation(summary = "分页", description = "传入CraftAbility") public R> list(@Parameter(hidden = true) @RequestParam Map craftAbility, Query query) { - - + craftAbility.remove("descs"); + craftAbility.remove("ascs"); + query.setDescs(null); + query.setAscs(null); Date startTime = null; Date endTime = null; @@ -143,7 +145,7 @@ public class CraftAbilityController extends BladeController { if(null != startTime && null != endTime){ qw.between("UPDATE_TIME", startTime,endTime); } - qw.orderByAsc("CA_CODE"); + qw.last("ORDER BY UPDATE_TIME DESC "); IPage pages = craftAbilityService.page(Condition.getPage(query), qw); IPage pagesVO = CraftAbilityWrapper.build().pageVO(pages); pagesVO.getRecords() diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/LocallyPlatedPartController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/LocallyPlatedPartController.java index edfe2c75..c31a69aa 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/LocallyPlatedPartController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/LocallyPlatedPartController.java @@ -84,7 +84,12 @@ public class LocallyPlatedPartController extends BladeController { @Operation(summary = "list分页", description = "传入LocallyPlatedPart Obj") public R> list(@Parameter(hidden = true) @RequestParam Map locallyPlatedPart, Query query) { + locallyPlatedPart.remove("descs"); + locallyPlatedPart.remove("ascs"); + query.setDescs(null); + query.setAscs(null); QueryWrapper qw = Condition.getQueryWrapper(locallyPlatedPart, LocallyPlatedPart.class); + qw.last("ORDER BY UPDATE_TIME DESC "); IPage pages = service.page(Condition.getPage(query), qw); IPage pagesVO = LocallyPlatedPartWrapper.build().pageVO(pages); pagesVO.getRecords() diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java index c3bcde56..e3e85705 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java @@ -247,8 +247,10 @@ public class TeamSetController extends BladeController { @Operation(summary = "list分页", description = "传入TeamSet Obj") public R> list(@Parameter(hidden = true) @RequestParam Map map, Query query) { - - + map.remove("descs"); + map.remove("ascs"); + query.setDescs(null); + query.setAscs(null); // List ids = new ArrayList<>(); // if(map.containsKey("dispatcherRealName")){ // List users = iUserClient.userListByName(Func.toStr(map.get("dispatcherRealName"))); @@ -269,7 +271,7 @@ public class TeamSetController extends BladeController { qw.eq(map.containsKey(TeamSet.COL_DISPATCHER), TeamSet.COL_DISPATCHER, (Func.toLong(map.get(TeamSet.COL_DISPATCHER)))); qw.in(map.containsKey("ids"), "ID", Func.toLong(map.get("ids"))); - + qw.last("ORDER BY UPDATE_TIME DESC "); // page IPage pages = service.page(Condition.getPage(query), qw); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java index 9a76ed7d..f52455b5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java @@ -93,6 +93,11 @@ public class WorkCenterController extends BladeController { @Operation(summary = "list分页", description = "传入WorkCenter Obj") public R> list(@Parameter(hidden = true) @RequestParam Map workCenter, Query query) { + query.setDescs(null); + query.setAscs(null); + workCenter.remove("descs"); + workCenter.remove("ascs"); + QueryWrapper qw = Condition.getQueryWrapper(workCenter, WorkCenter.class); qw.like(workCenter.containsKey("wcCode"), WorkCenter.COL_WC_CODE, Func.toStr(workCenter.get("wcCode"))); @@ -103,6 +108,7 @@ public class WorkCenterController extends BladeController { qw.like(workCenter.containsKey("team"), WorkCenter.COL_TEAM, Func.toStr(workCenter.get("team"))); qw.like(workCenter.containsKey("teamId"), WorkCenter.COL_TEAM_ID, Func.toStr(workCenter.get("teamId"))); + qw.last("ORDER BY UPDATE_TIME DESC "); IPage pages = service.page(Condition.getPage(query), qw); IPage pagesVO = WorkCenterWrapper.build().pageVO(pages); List vos = pagesVO.getRecords(); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/AssignMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/AssignMapper.xml index 219c199c..2f369035 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/AssignMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/AssignMapper.xml @@ -57,6 +57,7 @@ AND center_id = #{bsAssign.centerId} + ORDER BY UPDATE_TIME DESC