车牌更变：操作记录查询修改

src/main/java/com/qtzl/alterSales/manager/handler/AflPlateChangeQueryHandler.java

@@ -75,11 +75,11 @@ public class AflPlateChangeQueryHandler extends AbstractAfterSalesManager<AflPla
             if (request.getPlateColor() != null) {
                 list.add(cb.equal(root.<Integer>get("plateColor"), request.getPlateColor()));
             }
-            if (request.getAgencyId() != null) {
+            if (!StringUtils.isEmpty(request.getAgencyId())) {
                 list.add(cb.equal(root.<Integer>get("agentId"), request.getAgencyId()));
             }
 
-            if (request.getAfterPlateNum() != null) {
+            if (!StringUtils.isEmpty(request.getAfterPlateNum())) {
                 list.add(cb.equal(root.<Integer>get("afterPlateNum"), request.getAfterPlateNum()));
             }
             if (request.getAfterPlateColor() != null) {

src/main/java/com/qtzl/alterSales/manager/handler/AflPlateChangeRecordQueryHandler.java

@@ -40,36 +40,17 @@ public class AflPlateChangeRecordQueryHandler extends AbstractAfterSalesManager<
     @Override
     public String handleInternal(String filename, AflPlateChangeRecordQueryRequest request) throws Exception {
         try {
-            Page<AflPlateChangeRecord> page = select(request);
-            return toResponse(page, request).toJson();
+            final AflPlateChangeRecordQueryResponse response = new AflPlateChangeRecordQueryResponse();
+            response.setData(select(request));
+            return response.toJson();
         } catch (Exception e) {
-            if (e instanceof ServiceHandleException) {
-                throw e;
-            }
             logger.error("选装-车辆变更信息查询失败：{}", e.getMessage());
             throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("车辆变更信息查询失败");
         }
     }
 
-    private AflPlateChangeRecordQueryResponse toResponse(Page<AflPlateChangeRecord> page, AflPlateChangeRecordQueryRequest request) {
-        final AflPlateChangeRecordQueryResponse response = new AflPlateChangeRecordQueryResponse();
-        response.setCurrentPage(request.getPageNo());
-        response.setPageSize(request.getPageSize());
-        response.setPageCount(page.getTotalPages());
-        response.setTotalCount(page.getTotalElements());
-        if (isEmpty(page.getContent())) {
-            response.setData(Lists.newArrayList());
-            return response;
-        }
-        List<AflPlateChangeRecord> formVoList = new ArrayList<>(page.getContent());
-        response.setData(formVoList);
-        return response;
-    }
+    private List<AflPlateChangeRecord> select(AflPlateChangeRecordQueryRequest request) {
 
-    private Page<AflPlateChangeRecord> select(AflPlateChangeRecordQueryRequest request) throws ServiceHandleException {
-        if (request.getPageSize() > 100) {
-            throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("请求每页数量过大  " + request.getPageSize());
-        }
         return aflPlateChangeRecordRepo.findAll(((root, query, cb) -> {
             List<Predicate> list = Lists.newArrayList();
             if (!StringUtils.isEmpty(request.getAflPlateChangeId())) {
@@ -77,7 +58,6 @@ public class AflPlateChangeRecordQueryHandler extends AbstractAfterSalesManager<
             }
             Predicate[] p = new Predicate[list.size()];
             return cb.and(list.toArray(p));
-        }), PageRequest.of(request.getPageNo() - 1, request.getPageSize(),
-                Sort.by(Sort.Direction.DESC, "insertTime")));
+        }), Sort.by(Sort.Direction.DESC, "insertTime"));
     }
 }