Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleVo.java

@@ -52,8 +52,6 @@ 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,6 +3546,11 @@ 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.and(wrapper -> wrapper.isNull("vs.finState").or().eq("vs.finState", 0));
+            }
             if (StringUtils.isNotBlank(query.getVinNo())) {
                 qw.like("bv.vinNo", query.getVinNo());
             }
@@ -3603,22 +3608,6 @@ 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;
     }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyDetailsVo.java

@@ -25,29 +25,13 @@
  *********************************************************/
 package com.yxt.anrui.riskcenter.api.loanrestorereportapply;
 
-
 import com.yxt.common.core.vo.Vo;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Project: anrui-riskcenter(车辆交回事前报备申请) <br/>
- * File: LoanRestoreReportApplyVo.java <br/>
- * Class: com.yxt.anrui.riskcenter.api.loanrestorereportapply.LoanRestoreReportApplyVo <br/>
- * Description: 车辆交回事前报备申请 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-01-08 11:43:57 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "车辆交回事前报备申请 视图数据详情", description = "车辆交回事前报备申请 视图数据详情")
 public class LoanRestoreReportApplyDetailsVo implements Vo {

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyDto.java

@@ -25,29 +25,13 @@
  *********************************************************/
 package com.yxt.anrui.riskcenter.api.loanrestorereportapply;
 
-
 import com.yxt.common.core.dto.Dto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Project: anrui-riskcenter(车辆交回事前报备申请) <br/>
- * File: LoanRestoreReportApplyDto.java <br/>
- * Class: com.yxt.anrui.riskcenter.api.loanrestorereportapply.LoanRestoreReportApplyDto <br/>
- * Description: 车辆交回事前报备申请 数据传输对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-01-08 11:43:57 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "车辆交回事前报备申请 数据传输对象", description = "车辆交回事前报备申请 数据传输对象")
 public class LoanRestoreReportApplyDto implements Dto {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordRest.java

@@ -36,21 +36,8 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-/**
- * Project: anrui-riskcenter(逾期催收记录) <br/>
- * File: LoanBeCollectionRecordFeignFallback.java <br/>
- * Class: com.yxt.anrui.riskcenter.biz.loanbecollectionrecord.LoanBeCollectionRecordRest <br/>
- * Description: 逾期催收记录. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-12-11 13:45:40 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "逾期催收记录")
-@RestController("com.yxt.anrui.riskcenter.biz.loanbecollectionrecord.LoanBeCollectionRecordRest")
+@RestController
 @RequestMapping("v1/loanbecollectionrecord")
 public class LoanBeCollectionRecordRest implements LoanBeCollectionRecordFeign {
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.java

@@ -39,25 +39,9 @@ import com.yxt.anrui.riskcenter.api.loanrestorereportapply.LoanRestoreReportAppl
 import java.util.List;
 import java.util.Map;
 
-/**
- * Project: anrui-riskcenter(车辆交回事前报备申请) <br/>
- * File: LoanRestoreReportApplyMapper.java <br/>
- * Class: com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyMapper <br/>
- * Description: 车辆交回事前报备申请. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-01-08 11:43:57 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Mapper
 public interface LoanRestoreReportApplyMapper extends BaseMapper<LoanRestoreReportApply> {
 
-	//@Update("update loan_restore_report_apply set name=#{msg} where id=#{id}")
-	//IPage<LoanRestoreReportApplyVo> voPage(IPage<LoanRestoreReportApply> page, @Param(Constants.WRAPPER) QueryWrapper<LoanRestoreReportApply> qw);
-	
     IPage<LoanRestoreReportApplyVo> selectPageVo(IPage<LoanRestoreReportApply> page, @Param(Constants.WRAPPER) Wrapper<LoanRestoreReportApply> qw);
 
     List<LoanRestoreReportApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<LoanRestoreReportApply> qw);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyRest.java

@@ -40,21 +40,8 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-/**
- * Project: anrui-riskcenter(车辆交回事前报备申请) <br/>
- * File: LoanRestoreReportApplyFeignFallback.java <br/>
- * Class: com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyRest <br/>
- * Description: 车辆交回事前报备申请. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-01-08 11:43:57 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "车辆交回事前报备申请")
-@RestController("com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyRest")
+@RestController
 @RequestMapping("v1/loanrestorereportapply")
 public class LoanRestoreReportApplyRest implements LoanRestoreReportApplyFeign {