查询条件

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/ParkingWalletFeeSaveParam.java

@@ -53,7 +53,6 @@ public class ParkingWalletFeeSaveParam extends PageReq implements Serializable {
     /**
      * 凭证图片
      */
-    @NotBlank(message = "凭证图片不能为空")
     @Schema(description = "凭证图片")
     private String voucherUrl;
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/ParkingWalletFeeService.java

@@ -10,6 +10,7 @@ import com.sckw.core.exception.BusinessPlatfromException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.enums.ParkingChangeStrategyEnum;
 import com.sckw.core.utils.CollectionUtils;
+import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.result.PageDataResult;
 import com.sckw.system.api.RemoteSystemService;
@@ -280,13 +281,13 @@ public class ParkingWalletFeeService {
         return  Wrappers.<KwtParkingWalletFeeBalance>lambdaQuery()
                 .eq(param.getSupEntId() != null, KwtParkingWalletFeeBalance::getSupEntId, param.getSupEntId())
                 .eq(param.getProEntId() != null, KwtParkingWalletFeeBalance::getProEntId, param.getProEntId())
-                .eq(KwtParkingWalletFeeBalance::getOrderNo, param.getOrderNo())
-                .eq(KwtParkingWalletFeeBalance::getTradeType, param.getTradeType())
-                .ge(KwtParkingWalletFeeBalance::getTradeAmount, param.getMinFee())
-                .le(KwtParkingWalletFeeBalance::getTradeAmount, param.getMaxFee())
-                .ge(KwtParkingWalletFeeBalance::getCreateTime, param.getStartCreateTime())
-                .le(KwtParkingWalletFeeBalance::getCreateTime, param.getEndCreateTime())
-                .orderByDesc(KwtParkingWalletFeeBalance::getServiceFeeBalance);
+                .eq(StringUtils.isNotBlank(param.getOrderNo()), KwtParkingWalletFeeBalance::getOrderNo, param.getOrderNo())
+                .eq(param.getTradeType() != null,KwtParkingWalletFeeBalance::getTradeType, param.getTradeType())
+                .ge(param.getMinFee() != null, KwtParkingWalletFeeBalance::getTradeAmount, param.getMinFee())
+                .le(param.getMaxFee() != null, KwtParkingWalletFeeBalance::getTradeAmount, param.getMaxFee())
+                .ge(param.getStartCreateTime() != null, KwtParkingWalletFeeBalance::getCreateTime, param.getStartCreateTime())
+                .le(param.getEndCreateTime() != null, KwtParkingWalletFeeBalance::getCreateTime, param.getEndCreateTime())
+                .orderByDesc(KwtParkingWalletFeeBalance::getCreateTime);
     }
 
     /**