Merge remote-tracking branch 'origin/master'

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

@@ -72,4 +72,6 @@ public class ExiCarQuery implements Query {
 
     @ApiModelProperty(value = "锁定状态")
     private String lockedState;
+
+    private String orgPath;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -1028,10 +1028,16 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     private QueryWrapper<BaseVehicleListVo> exiCarBuildQueryWrapper(ExiCarQuery params) {
         QueryWrapper<BaseVehicleListVo> qw = new QueryWrapper<>();
         //本分公司
-        if (StringUtils.isNotBlank(params.getUserSid())) {
-            String orgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData();
+        if(StringUtils.isNotBlank(params.getOrgPath())){
+            String orgSid = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData();
             qw.eq("bv.createOrgSid", orgSid);
+        }else{
+            if (StringUtils.isNotBlank(params.getUserSid())) {
+                String orgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData();
+                qw.eq("bv.createOrgSid", orgSid);
+            }
         }
+
         if (params.getVinNoList().size() > 0) {
             qw.notIn("bv.vinNo", params.getVinNoList());
         }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDetailsVo.java

@@ -88,6 +88,8 @@ public class SolutionsDetailsVo implements Vo {
     private String otherPolicyMonthlyRepay;
     @ApiModelProperty("其它融利息总额")
     private String otherPolicyInterest;
+    @ApiModelProperty("其它融年利率")
+    private String otherPolicyYearRatio;
 
     @ApiModelProperty("'融资首付")
     private BigDecimal loanDownPay;

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDto.java

@@ -85,6 +85,8 @@ public class SolutionsDto implements Dto {
     private String otherPolicyMonthlyRepay;
     @ApiModelProperty("其它融利息总额")
     private String otherPolicyInterest;
+    @ApiModelProperty("其它融年利率")
+    private String otherPolicyYearRatio;
 
     @ApiModelProperty("'融资首付")
     private String loanDownPay;
@@ -99,6 +101,7 @@ public class SolutionsDto implements Dto {
     @ApiModelProperty("预计首期还款日")
     private String returnTime;
 
+
     //金融方案费用明细
 
     @ApiModelProperty("融资首付")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicy.java

@@ -76,6 +76,8 @@ public class LoanSolutionsOtherpolicy extends BaseEntity {
     private BigDecimal interest;
     @ApiModelProperty("预计首期还款日")
     private String returnTime;
+    @ApiModelProperty("其它融年利率")
+    private String otherPolicyYearRatio;
 
 
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

@@ -191,7 +191,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 downPayAmount = downPayAmount.add(new BigDecimal(dto.getDownPayAmount()));
                 //首付款比例
                 String downPayRatio = "";
-                BigDecimal downPayRatio1 = downPayAmount.divide(loanTotal).multiply(new BigDecimal("100"));
+                BigDecimal downPayRatio1 = downPayAmount.divide(loanTotal).multiply(new BigDecimal("100")).setScale(2,BigDecimal.ROUND_HALF_UP);
                 downPayRatio = downPayRatio1.toString() + "%";
                 //产品贷款金额 = 融资项目总额-首付金额
                 loanAmount = loanTotal.subtract(downPayAmount);
@@ -213,7 +213,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 BigDecimal bondAmount = new BigDecimal(dto.getBondAmount());
                 //贷款保证金比例
                 String bondRatio = "";
-                BigDecimal bondRatio1 = bondAmount.divide(loanAmount).multiply(new BigDecimal("100"));
+                BigDecimal bondRatio1 = bondAmount.divide(loanAmount).multiply(new BigDecimal("100")).setScale(2,BigDecimal.ROUND_HALF_UP);
                 bondRatio = bondRatio1.toString() + "%";
                 loanSolutions.setBondAmount(bondAmount);
                 loanSolutions.setBondRatio(bondRatio);
@@ -295,6 +295,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 //利息总额
                 loanSolutionsOtherpolicy.setInterest(interest);
                 loanSolutions.setOtherPolicyState(1);
+                loanSolutionsOtherpolicy.setOtherPolicyYearRatio(dto.getOtherPolicyYearRatio());
             } else {
                 //方案汇总
                 //融资首付 = 首付金额-其它融贷款金额

doc/databases/risk_center.sql

@@ -972,6 +972,7 @@ CREATE TABLE `loan_solutions_otherPolicy`
     `monthlyRepay`            decimal(10, 2)       DEFAULT NULL COMMENT '月还金额',
     `interest`                decimal(10, 2)       DEFAULT NULL COMMENT '利息总额',
     `returnTime`              varchar(64)          DEFAULT NULL COMMENT '预计首期还款日',
+    `otherPolicyYearRatio`    varchar(64)          DEFAULT NULL COMMENT '年利率',
     PRIMARY KEY (`id`),
     KEY `id` (`id`)
 ) ENGINE = INNODB