槽液管理排序

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankController.java

@@ -115,6 +115,7 @@ public class LiquidTankController extends BladeController {
                                        Query query) {
         QueryUtils.convertSortField(query);
         QueryWrapper<LiquidTank> qw = Condition.getQueryWrapper(liquidTank, LiquidTank.class);
+        qw.orderByAsc("WORK_TANK_ID", "WORK_CENTER_ID");
         IPage<LiquidTank> pages = service.page(Condition.getPage(query), qw);
         IPage<LiquidTankVO> pagesVO = LiquidTankWrapper.build().pageVO(pages);
 

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskController.java

@@ -145,6 +145,7 @@ public class LiquidTankTaskController extends BladeController {
                                                 Query query) {
         QueryWrapper<LiquidTankTask> qw = Condition.getQueryWrapper(liquidTankTask, LiquidTankTask.class);
         qw.eq(BaseCol.STATUS, LiquidTankTaskConst.S_NOT_READY);
+        qw.orderByAsc("TRUNC(CREATE_TIME)",  "WORK_TANK_ID", "WORK_CENTER_ID");
         IPage<LiquidTankTask> pages = service.page(Condition.getPage(query), qw);
         IPage<LiquidTankTaskVO> pagesVO = LiquidTankTaskWrapper.build().pageVO(pages);
         pagesVO.getRecords()

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.xml

@@ -172,6 +172,7 @@ TS_NAME
         <if test = "task.createTimeEnd != null">
             AND task.CREATE_TIME &lt;= #{task.createTimeEnd}
         </if>
+        ORDER BY TRUNC(task.CREATE_TIME) ASC, task.WORK_TANK_ID ASC, task.WORK_CENTER_ID ASC
     </select>
 
     <select id="exportLiquidTankTask"