导出排序修正

src/main/java/com/chuanghai/h3c_reporting/service/impl/InformationReportingServiceImpl.java

@@ -26,6 +26,8 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
+import static java.util.Comparator.comparing;
+
 /**
  * @author 27951
  * @version 1.0
@@ -66,21 +68,24 @@ public class InformationReportingServiceImpl extends ServiceImpl<InformationRepo
 //            pageParam.setCurrPage(1);
 //            pageParam.setPageSize(this.queryNumber());
 //            List list = this.queryPage(request).getList();
-            QueryWrapper<InformationReporting> queryWrapper = new QueryWrapper<>();
-            queryWrapper
-                    .like(!StringUtils.isEmpty(request.getName()), "name", request.getName())
-                    .like(StringUtils.hasText(request.getPhone()), "phone", request.getPhone())
-                    .like(StringUtils.hasText(request.getCompany()), "company", request.getCompany())
-                    .like(StringUtils.hasText(request.getReportingTime()), "reporting_time", request.getReportingTime())
-                    .eq("status", 1);
-            List<InformationReporting> list = this.list(queryWrapper);
-//            System.out.println(request);
+            List<InformationReporting> list;
             if (request.getIds() != null && request.getIds().length > 0){
                 list = this.getBaseMapper().selectBatchIds(Arrays.asList(request.getIds()));
+                // 升序排列
+//                list.sort(comparing(InformationReporting::getReportingTime));
+                // 降序排列
+                list.sort(comparing(InformationReporting::getReportingTime).reversed());
+            }else {
+                QueryWrapper<InformationReporting> queryWrapper = new QueryWrapper<>();
+                queryWrapper
+                        .like(StringUtils.hasText(request.getName()), "name", request.getName())
+                        .like(StringUtils.hasText(request.getPhone()), "phone", request.getPhone())
+                        .like(StringUtils.hasText(request.getCompany()), "company", request.getCompany())
+                        .like(StringUtils.hasText(request.getReportingTime()), "reporting_time", request.getReportingTime())
+                        .eq("status", 1);
+                queryWrapper.orderByDesc("reporting_time");
+                list = this.list(queryWrapper);
             }
-//            if (request.getIds() != null){
-//                list = this.getBaseMapper().selectBatchIds(Arrays.asList(request.getIds()));
-//            }
 
             WriteCellStyle headWriteCellStyle = new WriteCellStyle();
             WriteCellStyle contentWriteCellStyle = new WriteCellStyle();

src/main/java/com/chuanghai/h3c_reporting/vo/AddUserVO.java

@@ -35,7 +35,6 @@ public class AddUserVO {
     /**
      * 密码
      */
-    @NotNull(message = "管理员姓名不能为空")
     private String password;
 
 }