update

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

@@ -86,8 +86,8 @@ public class FssPaccountPayRejectQueryHandler extends AbstractAfterSalesManager<
             if (null != request.getEndAccountDate()) {
                 list.add(cb.lessThanOrEqualTo(root.<LocalDate>get("accountDate"), request.getEndAccountDate()));
             }
-            if (!StringUtils.isEmpty(request.getVehicleId())) {
-                list.add(cb.equal(root.<String>get("vehicleId"), request.getVehicleId()));
+            if (!StringUtils.isEmpty(request.getPlateNum()) && !StringUtils.isEmpty(request.getPlateColor())) {
+                list.add(cb.equal(root.<String>get("vehicleId"), request.getPlateNum() + "_" + request.getPlateColor()));
             }
             if (!StringUtils.isEmpty(request.getPayId())) {
                 list.add(cb.equal(root.<String>get("payId"), request.getPayId()));

src/main/java/com/qtzl/alterSales/manager/model/protocol/sales/PayRejectQueryRequest.java

@@ -21,8 +21,10 @@ public class PayRejectQueryRequest extends AbstractAfterSalesPageRequest<PayReje
     private LocalDate startAccountDate;
     /*** 记账日期（结束）*/
     private LocalDate endAccountDate;
-    /*** 车牌号+车牌颜色*/
-    private String vehicleId;
+    /*** 车牌号*/
+    private String plateNum;
+    /*** 车牌颜色*/
+    private String plateColor;
     /*** 路网交易编号*/
     private String payId;
     /*** 创建时间开始时间*/
@@ -46,12 +48,20 @@ public class PayRejectQueryRequest extends AbstractAfterSalesPageRequest<PayReje
         this.endAccountDate = endAccountDate;
     }
 
-    public String getVehicleId() {
-        return vehicleId;
+    public String getPlateNum() {
+        return plateNum;
     }
 
-    public void setVehicleId(String vehicleId) {
-        this.vehicleId = vehicleId;
+    public void setPlateNum(String plateNum) {
+        this.plateNum = plateNum;
+    }
+
+    public String getPlateColor() {
+        return plateColor;
+    }
+
+    public void setPlateColor(String plateColor) {
+        this.plateColor = plateColor;
     }
 
     public String getPayId() {

src/main/java/com/qtzl/alterSales/manager/service/FssPaccountPayRejectServiceImpl.java

@@ -52,8 +52,11 @@ public class FssPaccountPayRejectServiceImpl implements FssPaccountPayRejectServ
             if (null != request.getEndAccountDate()) {
                 list.add(cb.lessThanOrEqualTo(root.<LocalDate>get("accountDate"), request.getEndAccountDate()));
             }
-            if (!StringUtils.isEmpty(request.getVehicleId())) {
-                list.add(cb.equal(root.<String>get("vehicleId"), request.getVehicleId()));
+            if (!StringUtils.isEmpty(request.getPlateNum()) && !StringUtils.isEmpty(request.getPlateColor())) {
+                list.add(cb.equal(root.<String>get("vehicleId"), request.getPlateNum() + "_" + request.getPlateColor()));
+            }
+            if (!StringUtils.isEmpty(request.getPayId())) {
+                list.add(cb.equal(root.<String>get("payId"), request.getPayId()));
             }
             if (null != request.getStartTime()) {
                 list.add(cb.greaterThanOrEqualTo(root.<LocalDateTime>get("insertTime"), request.getStartTime()));
@@ -76,14 +79,14 @@ public class FssPaccountPayRejectServiceImpl implements FssPaccountPayRejectServ
         }
     }
 
-    private PayRejectExportVo toVo(FssPaccountPayReject payReject){
+    private PayRejectExportVo toVo(FssPaccountPayReject payReject) {
         PayRejectExportVo rejectVo = new PayRejectExportVo();
         BeanUtil.copyProperties(payReject, rejectVo);
         String[] split = payReject.getVehicleId().split("_");
         rejectVo.setPlateNum(split[0]);
         rejectVo.setPlateColor(split[1]);
         rejectVo.setReceiptAmt(BigDecimal.valueOf(payReject.getReceiptAmt()).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP));
-        if (payReject.getSceneTp() == 2){
+        if (payReject.getSceneTp() == 2) {
             rejectVo.setExStationName(null);
             rejectVo.setEnStationName(null);
             rejectVo.setParkingName(payReject.getEnStationName());