排序

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillCleanServiceImpl.java

@@ -1220,13 +1220,14 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
         if ("".equals(pageSize) || null == pageSize) {
             pageSize = "10";
         }
-        if ("".equals(startTime) || null == startTime) {
-            startTime = DataUill.getTimesmorning().toString();
-            endTime = LocalDateTime.now() + " 23:59:59";
-        }
         QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
+        if (ObjectUtil.isNotEmpty(startTime)) {
+            startTime = startTime + " 00:00:00";
+            endTime = endTime + " 23:59:59";
+            queryWrapper.between("check_date", startTime, endTime);
+        }
+        queryWrapper.lambda().orderByDesc(BillClean::getId);
         queryWrapper.eq("farm_id", farmId);
-        queryWrapper.between("check_date", startTime, endTime);
         if ("".equals(type) || null == type) {
         } else {
             queryWrapper.eq("vistit_type", type);

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillIsolateServiceImpl.java

@@ -1,5 +1,6 @@
 package com.huimv.receive.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -100,21 +101,20 @@ public class BillIsolateServiceImpl extends ServiceImpl<BillIsolateMapper, BillI
         if ("".equals(pageSize) || null == pageSize) {
             pageSize = "10";
         }
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        Date date = new Date();
-        if ("".equals(startTime) || null == startTime) {
-            startTime = sdf.format(date) + " 00:00:00";
-            endTime = sdf.format(date) + " 23:59:59";
-        }
         QueryWrapper<BillIsolate> queryWrapper = new QueryWrapper<>();
+        if (ObjectUtil.isNotEmpty(startTime)) {
+            startTime = startTime + " 00:00:00";
+            endTime = endTime + " 23:59:59";
+            queryWrapper.between("sub_date", startTime, endTime);
+        }
         queryWrapper.eq("farm_id", farmId);
         if (StringUtils.isNotBlank(word)){
             queryWrapper.and(i -> i.like("phone", word)
                     .or().like( "admission_user_name", word));
         }
+        queryWrapper.lambda().orderByDesc(BillIsolate::getId);
         queryWrapper.eq(StringUtils.isNotBlank(locationId), "isolate_location_id", locationId);
         queryWrapper.eq(StringUtils.isNotBlank(type), "bill_status", type);
-        queryWrapper.between("sub_date", startTime, endTime);
         Page<BillIsolate> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, billIsolateMapper.selectPage(page, queryWrapper));
     }

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillLuggageServiceImpl.java

@@ -112,17 +112,18 @@ public class BillLuggageServiceImpl extends ServiceImpl<BillLuggageMapper, BillL
         if ("".equals(pageSize) || null == pageSize) {
             pageSize = "10";
         }
-        if ("".equals(startTime) || null == startTime) {
-            startTime = DataUill.getTimesmorning().toString();
-            endTime = LocalDateTime.now() + " 23:59:59";
-        }
         QueryWrapper<BillLuggage> queryWrapper = new QueryWrapper<>();
+        if (ObjectUtil.isNotEmpty(startTime)) {
+            startTime = startTime + " 00:00:00";
+            endTime = endTime + " 23:59:59";
+            queryWrapper.between("luggage_date", startTime, endTime);
+        }
+        queryWrapper.lambda().orderByDesc(BillLuggage::getId);
         queryWrapper.eq("farm_id", farmId);
         if (StringUtils.isNotBlank(word)) {
             queryWrapper.and(i -> i.like( "phone", word)
                     .or().like("user_name", word));
         }
-        queryWrapper.between("luggage_date", startTime, endTime);
         Page<BillLuggage> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, billLuggageMapper.selectPage(page, queryWrapper));
     }

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillPcrServiceImpl.java

@@ -196,14 +196,15 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
         if ("".equals(pageSize) || null == pageSize) {
             pageSize = "10";
         }
-        if ("".equals(startTime) || null == startTime) {
-            startTime = DataUill.getTimesmorning().toString();
-            endTime = LocalDateTime.now() + " 23:59:59";
-        }
         QueryWrapper<BillPcr> queryWrapper = new QueryWrapper<>();
+        if (ObjectUtil.isNotEmpty(startTime)) {
+            startTime = startTime + " 00:00:00";
+            endTime = endTime + " 23:59:59";
+            queryWrapper.between("check_date", startTime, endTime);
+        }
         queryWrapper.in("bill_status", 1, 2);
+        queryWrapper.lambda().orderByDesc(BillPcr::getId);
         queryWrapper.eq("farm_id", farmId).eq(StringUtils.isNotBlank(destId), "dest_id", destId).eq(StringUtils.isNotBlank(type), "vistit_type", type);
-        queryWrapper.between("check_date", startTime, endTime);
         Page<BillPcr> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, billPcrMapper.selectPage(page, queryWrapper));
     }

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillPersonnelAdmissionServiceImpl.java

@@ -799,13 +799,14 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         if ("".equals(pageSize) || null == pageSize) {
             pageSize = "10";
         }
-        if ("".equals(startTime) || null == startTime) {
-            startTime = DataUill.getTimesmorning().toString();
-            endTime = LocalDateTime.now() + " 23:59:59";
-        }
         QueryWrapper<BillPersonnelAdmission> queryWrapper = new QueryWrapper<>();
+        if (ObjectUtil.isNotEmpty(startTime)) {
+            startTime = startTime + " 00:00:00";
+            endTime = endTime + " 23:59:59";
+            queryWrapper.between("sub_date", startTime, endTime);
+        }
+        queryWrapper.lambda().orderByDesc(BillPersonnelAdmission::getId);
         queryWrapper.eq("farm_id", farmId).eq(StringUtils.isNotBlank(destId), "dest_id", destId).eq(StringUtils.isNotBlank(type), "vistit_type", type);
-        queryWrapper.between("sub_date", startTime, endTime);
         Page<BillPersonnelAdmission> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, billPersonnelAdmissionMapper.selectPage(page, queryWrapper));
     }