Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorDetailsVo.java

@@ -70,6 +70,8 @@ public class BaseDistributorDetailsVo implements Vo {
     private String pDistributorName;
     @ApiModelProperty("是否担保 0是/1否")
     private String isGuarantee;
+    @ApiModelProperty("是否担保 0是/1否")
+    private String isGuaranteeKey;
     @ApiModelProperty("开始合作日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date startCoopDate;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorDto.java

@@ -78,6 +78,8 @@ public class BaseDistributorDto implements Dto {
     private String pDistributorName;
     @ApiModelProperty("是否担保 0是/1否")
     private String isGuarantee;
+    @ApiModelProperty("是否担保 0是/1否")
+    private String isGuaranteeKey;
     @ApiModelProperty("开始合作日期")
     private String startCoopDate;
     @ApiModelProperty("创建组织")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorVo.java

@@ -76,6 +76,8 @@ public class BaseDistributorVo implements Vo {
     private String pDistributorName;
     @ApiModelProperty("是否担保 0是/1否")
     private String isGuarantee;
+    @ApiModelProperty("是否担保 0是/1否")
+    private String isGuaranteeKey;
     @ApiModelProperty("开始合作日期")
     private String startCoopDate;
     @ApiModelProperty("创建组织")

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -7407,8 +7407,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 }
             }
         }
-        BusSalesOrderBorrower busSalesOrderBorrower = busSalesOrderBorrowerService.selectOrderSid(saleOrderSid);
-        if (busSalesOrderBorrower == null) {
+        BusSalesOrderBorrower busSalesOrderBorrower1 = busSalesOrderBorrowerService.selectOrderSid(saleOrderSid);
+        if (busSalesOrderBorrower1 == null) {
             salesLenderVo.setShowOwn(true);
         }
         salesLenderVo.setConfirmCarNum(confirmNum);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java

@@ -169,7 +169,7 @@ public class LoanFinOtherPolicyService extends MybatisBaseService<LoanFinOtherPo
             qw.eq("vehCategoryKey", query.getVehCategoryKey());
         }
         if (StringUtils.isNotBlank(query.getVehTypeKey())) {
-            qw.eq("vehTypeKey", query.getVehTypeKey());
+            qw.like("vehTypeKey", query.getVehTypeKey());
         }
         if (StringUtils.isNotBlank(query.getOtherPolicyName())) {
             qw.like("otherPolicyName", query.getOtherPolicyName());

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java

@@ -510,7 +510,7 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
         }
         //车辆功能
         if (StringUtils.isNotBlank(query.getVehTypeKey())) {
-            qw.eq("lfp.vehTypeKey", query.getVehTypeKey());
+            qw.like("lfp.vehTypeKey", query.getVehTypeKey());
         }
         //适用销售部门
         if (StringUtils.isNotBlank(query.getUseDeptNames())) {
@@ -529,6 +529,10 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
         if (StringUtils.isNotBlank(query.getPeriod())) {
             qw.like("lfp.period", query.getPeriod());
         }
+        //服务费类型
+        if (StringUtils.isNotBlank(query.getServiceAmountTypeKey())) {
+            qw.eq("lfp.serviceAmountTypeKey", query.getServiceAmountTypeKey());
+        }
         //最低首付比例  至
         if (StringUtils.isNotBlank(query.getDownPayRatioLeastStart()) && StringUtils.isNotBlank(query.getDownPayRatioLeastEnd())) {
             qw.between("lfp.downPayRatioLeast", query.getDownPayRatioLeastStart(), query.getDownPayRatioLeastEnd());