上若

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/controller/StorageBillPrintController.java

@@ -107,13 +107,15 @@ public class StorageBillPrintController extends JeecgController<StorageBillPrint
     @GetMapping(value = "/list")
     public Result<IPage<StorageBillPrint>> queryPageList(StorageBillPrint storageBillPrint,
                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                         @RequestParam(name = "pageSize", defaultValue = "50") Integer pageSize,
+                                                         @RequestParam(name = "pageSize", defaultValue = "60") Integer pageSize,
                                                          HttpServletRequest req) {
 //        QueryWrapper<StorageBillPrint> queryWrapper = QueryGenerator.initQueryWrapper(storageBillPrint, req.getParameterMap());
         QueryWrapper<StorageBillPrint> queryWrapper = new QueryWrapper<StorageBillPrint>();
         Page<StorageBillPrint> page = new Page<StorageBillPrint>(pageNo, pageSize);
         // 铸机号查询条件
         queryWrapper.eq("ccm_no", storageBillPrint.getCcmNo());
+        // 目的地
+        queryWrapper.eq("destination", storageBillPrint.getDestination());
         // 时间查询
         if(oConvertUtils.isNotEmpty(storageBillPrint.getArrivalTime())){
             // 开始时间
@@ -129,6 +131,8 @@ public class StorageBillPrintController extends JeecgController<StorageBillPrint
         if (storageBillPrint.getClasses() != null && !storageBillPrint.getClasses().isEmpty() && storageBillPrint.getClasses() != null && !storageBillPrint.getClasses().isEmpty()) {
             queryWrapper.like("classes", storageBillPrint.getClasses());
         }
+        // 根据到站时间排序
+        queryWrapper.orderByDesc("arrival_time");
         IPage<StorageBillPrint> pageList = storageBillPrintService.page(page, queryWrapper);
         return Result.OK(pageList);
     }