diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleVo.java index 3ad1e34f72..707c3324db 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleVo.java @@ -52,6 +52,8 @@ public class PayBaseVehicleVo implements Vo { private String saleTypeValue; @ApiModelProperty("买断状态") private String settlementStatusValue; + @ApiModelProperty("交清状态") + private String finState; @ApiModelProperty(value = "品牌") private String brandName; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 384812e425..9705ebf140 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -3546,11 +3546,6 @@ public class BaseVehicleService extends MybatisBaseService pagging = baseMapper.selectPayVehicleList(page, qw); + Iterator iterator = pagging.getRecords().iterator(); + if (query.getIsSettle().equals("0")) { + while (iterator.hasNext()) { + PayBaseVehicleVo next = iterator.next(); + if ("1".equals(next.getFinState())) { + pagging.getRecords().remove(next); + } + } + } else if (query.getIsSettle().equals("1")) { + while (iterator.hasNext()) { + PayBaseVehicleVo next = iterator.next(); + if (StringUtils.isBlank(next.getFinState()) || "0".equals(next.getFinState())) { + pagging.getRecords().remove(next); + } + } + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } @@ -4443,7 +4454,7 @@ public class BaseVehicleService extends MybatisBaseService