修改

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;

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<BaseVehicleMapper, Ba
             } else if ("0".equals(query.getIsSales())) {
                 qw.isNull("bv.salesDate");
             }
-            if ("1".equals(query.getIsSettle())) {
-                qw.eq("vs.finState", 1);
-            } else if ("0".equals(query.getIsSettle())) {
-                qw.eq("vs.finState", 0);
-            }
             if (StringUtils.isNotBlank(query.getVinNo())) {
                 qw.like("bv.vinNo", query.getVinNo());
             }
@@ -3608,6 +3603,22 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         qw.groupBy("bv.sid");
         qw.orderByDesc("bv.createTime");
         IPage<PayBaseVehicleVo> pagging = baseMapper.selectPayVehicleList(page, qw);
+        Iterator<PayBaseVehicleVo> 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<PayBaseVehicleVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
@@ -4443,7 +4454,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     }
 
     public ResultBean updateSettlePrice(String sid, String settlePrice) {
-    ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
         if (StringUtils.isBlank(settlePrice)) {
             return rb.setMsg("厂家结算价不能为空！");
         }