排序

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<IPage<BsAssignVO>> page(BsAssignVO bsAssign, Query query) {
+		query.setDescs(null);
+		query.setAscs(null);
+
 		IPage<BsAssignVO> pages = bsAssignService.selectBsAssignPage(Condition.getPage(query), bsAssign);
 		List<BsAssignVO> list = pages.getRecords();
 		for(BsAssignVO vo:list){

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<IPage<CraftAbilityVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> 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<CraftAbilityEntity> pages = craftAbilityService.page(Condition.getPage(query), qw);
 		IPage<CraftAbilityVO> pagesVO = CraftAbilityWrapper.build().pageVO(pages);
 		pagesVO.getRecords()

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<IPage<LocallyPlatedPartVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> locallyPlatedPart,
 	                                        Query query) {
+		locallyPlatedPart.remove("descs");
+		locallyPlatedPart.remove("ascs");
+		query.setDescs(null);
+		query.setAscs(null);
         QueryWrapper<LocallyPlatedPart> qw = Condition.getQueryWrapper(locallyPlatedPart, LocallyPlatedPart.class);
+		qw.last("ORDER BY UPDATE_TIME DESC ");
 		IPage<LocallyPlatedPart> pages = service.page(Condition.getPage(query), qw);
 		IPage<LocallyPlatedPartVO> pagesVO = LocallyPlatedPartWrapper.build().pageVO(pages);
 		pagesVO.getRecords()

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<IPage<TeamSetVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> map,
                                     Query query) {
-
-
+        map.remove("descs");
+        map.remove("ascs");
+        query.setDescs(null);
+        query.setAscs(null);
 //        List<Long> ids = new ArrayList<>();
 //        if(map.containsKey("dispatcherRealName")){
 //            List<User> 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<TeamSet> pages = service.page(Condition.getPage(query), qw);
 

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<IPage<WorkCenterVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> workCenter,
                                        Query query) {
+        query.setDescs(null);
+        query.setAscs(null);
+        workCenter.remove("descs");
+        workCenter.remove("ascs");
+
         QueryWrapper<WorkCenter> 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<WorkCenter> pages = service.page(Condition.getPage(query), qw);
         IPage<WorkCenterVO> pagesVO = WorkCenterWrapper.build().pageVO(pages);
         List<WorkCenterVO> vos = pagesVO.getRecords();

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/AssignMapper.xml

@@ -57,6 +57,7 @@
             AND center_id = #{bsAssign.centerId}
         </if>
 
+        ORDER BY UPDATE_TIME DESC
     </select>