优化

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

@@ -4,6 +4,8 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @Author dimengzhe
  * @Date 2023/3/22 11:40
@@ -162,6 +164,9 @@ public class SolutionsDetailsVo implements Vo {
     @ApiModelProperty("上装成交价")
     private String szPrice;
 
+    @ApiModelProperty("实际首付比例")
+    private String downPayAmountsRatio;
+
 
 
 }

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

@@ -159,4 +159,7 @@ public class SolutionsDto implements Dto {
     @ApiModelProperty("名义留购价")
     private String nominalPrice;
 
+    @ApiModelProperty("实际首付比例")
+    private String downPayAmountsRatio;
+
 }

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

@@ -79,5 +79,8 @@ public class LoanSolutionsOtherpolicy extends BaseEntity {
     @ApiModelProperty("其它融年利率")
     private String otherPolicyYearRatio;
 
+    @ApiModelProperty("实际首付比例")
+    private String downPayAmountsRatio;
+
 
 }

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

@@ -438,6 +438,12 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 } else {
                     monthlyRepay = monthlyRepay1.toString() + "/-";
                 }
+                //实际首付比例
+                String downPayAmountsRatio = "";
+                BigDecimal downPayAmountsRatio1 = loanDownPay.divide(loanTotal, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")).setScale(2, BigDecimal.ROUND_HALF_UP);
+                downPayAmountsRatio = downPayAmountsRatio1.toString() + "%";
+                loanSolutionsOtherpolicy.setDownPayAmountsRatio(downPayAmountsRatio);
+
 
                 //预计首期还款日
                 String returnTime = dto.getReturnTime();
@@ -458,6 +464,11 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 BigDecimal loanAmountTotal = new BigDecimal(BigInteger.ZERO);
                 loanAmountTotal = loanAmountTotal.add(loanAmount).add(otherPolicyAmount1);
                 loanSolutionsOtherpolicy.setLoanAmountTotal(loanAmountTotal);
+                //实际首付比例
+                String downPayAmountsRatio = "";
+                BigDecimal downPayAmountsRatio1 = loanDownPay.divide(loanTotal, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")).setScale(2, BigDecimal.ROUND_HALF_UP);
+                downPayAmountsRatio = downPayAmountsRatio1.toString() + "%";
+                loanSolutionsOtherpolicy.setDownPayAmountsRatio(downPayAmountsRatio);
                 //期数 = 其它融期数拼接剩余期数（6/18）
                 int i = Integer.valueOf(loanPeriod) - ii;
                 String period = ii + "/" + i;

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java

@@ -45,6 +45,7 @@ public class AppService {
         ResultBean<FlowRecordVo> resultBean = flowTaskFeign.businessFlowRecord(procInsId);
         List<AppFlowableRecordVo> voList = Optional.ofNullable(resultBean.getData().getFlowList()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppFlowableRecordVo.class)).collect(Collectors.toList());
         voList.removeAll(Collections.singleton(null));
+        if (!voList.isEmpty()) {
             for (int i = 0; i < voList.size(); i++) {
                 AppFlowableRecordVo vo = voList.get(i);
                 if (vo.getFinishTime() != null) {
@@ -59,19 +60,32 @@ public class AppService {
                     if (StringUtils.isNotBlank(stateValue)) {
                         String processEndTime = vo.getProcessEndTime();
                         vo.setStateValue(stateValue);
-                    if (StringUtils.isNotBlank(processEndTime) && i == 0 && !"6".equals(type)) {
+                   /* if (StringUtils.isNotBlank(processEndTime) && i == 0 && !"6".equals(type)) {
                         vo.setStateValue("已办结");//流程已办结
+                    }*/
+                        if (StringUtils.isNotBlank(processEndTime) && i == voList.size() - 1 && !"6".equals(type)) {
+                            voList.get(i - 1).setStateValue("已办结");//流程已办结
                         }
                     }
-                if (StringUtils.isNotBlank(type)) {
+               /* if (StringUtils.isNotBlank(type)) {
                     String processEndTime = vo.getProcessEndTime();
                     vo.setStateKey(type);
                     if (StringUtils.isNotBlank(processEndTime) && i == 0 && !"6".equals(type)) {
                         vo.setStateKey("8");//流程已办结
                     }
+                }*/
+                    if (StringUtils.isNotBlank(type)) {
+                        String processEndTime = vo.getProcessEndTime();
+                        vo.setStateKey(type);
+                        if (StringUtils.isNotBlank(processEndTime) && i == voList.size() - 1 && !"6".equals(type)) {
+                            voList.get(i - 1).setStateKey("8");//流程已办结
                         }
                     }
+
+                }
             }
+        }
+
         return rb.success().setData(voList);
     }