【fix】过滤空数据，部分数据格式化

src/main/java/com/chint/manage/entity/OrderDownloadRecord.java

@@ -1,6 +1,7 @@
 package com.chint.manage.entity;
 
 import com.chint.manage.entity.query.OrderPageQuery;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -28,8 +29,10 @@ public class OrderDownloadRecord implements Serializable {
     //查询条件
     private OrderPageQuery queryCriteria;
     //执行时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
     //过期时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime expireTime;
     //员工ID
     private String employeeNo;

src/main/java/com/chint/manage/mapper/JdbcOrderDownloadRecordRepository.java

@@ -9,5 +9,5 @@ import java.util.List;
 @Repository
 public interface JdbcOrderDownloadRecordRepository extends CrudRepository<OrderDownloadRecord, Long> {
 
-    List<OrderDownloadRecord> findAllByEmployeeNoOrderByIdDesc(String employeeNo);
+    List<OrderDownloadRecord> findAllByEmployeeNoOrderByCreateTimeDesc(String employeeNo);
 }

src/main/java/com/chint/manage/mapper/impl/JdbcConsumptionDetailRepositoryImpl.java

@@ -108,7 +108,7 @@ public class JdbcConsumptionDetailRepositoryImpl implements JdbcConsumptionDetai
     private Page<TrainOrderDetailExcel> trainPageConsumptionDetail(ConsumptionDetailQuery dto) {
         String query = "LEFT JOIN  order_detail od ON tod.order_id=od.order_id " +
                 "LEFT JOIN route_order_extension_field roef ON roef.route_id=od.route_id " +
-                "WHERE 1=1 ";
+                "WHERE tod.order_status IS NOT NULL ";
 
         Map<String, Object> params = new HashMap<>();
         PageRequest pageRequest = PageRequest
@@ -127,7 +127,7 @@ public class JdbcConsumptionDetailRepositoryImpl implements JdbcConsumptionDetai
     private Page<FlightOrderDetailExcel> flightPageConsumptionDetail(ConsumptionDetailQuery dto) {
         String query = "LEFT JOIN  order_detail od ON tod.order_id=od.order_id " +
                 "LEFT JOIN route_order_extension_field roef ON roef.route_id=od.route_id " +
-                "WHERE 1=1 ";
+                "WHERE tod.order_status IS NOT NULL ";
 
         Map<String, Object> params = new HashMap<>();
         PageRequest pageRequest = PageRequest
@@ -146,7 +146,7 @@ public class JdbcConsumptionDetailRepositoryImpl implements JdbcConsumptionDetai
     private Page<HotelOrderDetailExcel> hotelPageConsumptionDetail(ConsumptionDetailQuery dto) {
         String query = "LEFT JOIN  order_detail od ON tod.order_id=od.order_id " +
                 "LEFT JOIN route_order_extension_field roef ON roef.route_id=od.route_id " +
-                "WHERE 1=1 ";
+                "WHERE tod.order_status IS NOT NULL ";
 
         Map<String, Object> params = new HashMap<>();
         PageRequest pageRequest = PageRequest
@@ -165,7 +165,7 @@ public class JdbcConsumptionDetailRepositoryImpl implements JdbcConsumptionDetai
     private Page<CarOrderDetailExcel> carPageConsumptionDetail(ConsumptionDetailQuery dto) {
         String query = "LEFT JOIN  order_detail od ON tod.order_id=od.order_id " +
                 "LEFT JOIN route_order_extension_field roef ON roef.route_id=od.route_id " +
-                "WHERE 1=1 ";
+                "WHERE tod.order_status IS NOT NULL ";
 
         Map<String, Object> params = new HashMap<>();
         PageRequest pageRequest = PageRequest

src/main/java/com/chint/manage/service/MinioService.java

@@ -11,6 +11,8 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Objects;
 
 @Service
@@ -36,7 +38,8 @@ public class MinioService {
                 minioClient.makeBucket(MakeBucketArgs.builder().bucket(bucketName).build());
             }
             //上传文件到MinIO
-            String fileName = UUID.randomUUID().toString();
+            SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+            String fileName =sdf.format(new Date())+"-"+UUID.randomUUID().toString();
             InputStream inputStream = file.getInputStream();
             ObjectWriteResponse objectWriteResponse = minioClient.putObject(PutObjectArgs.builder()
                     .object(fileName.concat(".").concat(FileUtil.extName(file.getOriginalFilename())))

src/main/java/com/chint/manage/service/impl/ManageServiceImpl.java

@@ -166,7 +166,7 @@ public class ManageServiceImpl implements ManageService {
     @Override
     public List<OrderDownloadRecord> orderDownloadRecordQuery() {
         User user=BaseContext.getCurrentUser();
-        return jdbcOrderDownloadRecordRepository.findAllByEmployeeNoOrderByIdDesc(user.getEmployeeNo());
+        return jdbcOrderDownloadRecordRepository.findAllByEmployeeNoOrderByCreateTimeDesc(user.getEmployeeNo());
     }
 
     @Override