Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleState.java

@@ -38,6 +38,8 @@ public class BaseVehicleState extends BaseEntity {
     private String contractState;
     private String saleTypeKey;
     private String finSourceKey;
+    @ApiModelProperty("销售订单sid")
+    private String saleOrderSid;
 
 
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateDto.java

@@ -25,4 +25,6 @@ public class BaseVehicleStateDto implements Dto {
     private String saleTypeKey;
     @ApiModelProperty("款项来源：1自有资金、2三方金融、3担保、4非担保")
     private String finSourceKey;
+    @ApiModelProperty("销售订单sid")
+    private String saleOrderSid;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java

@@ -82,7 +82,8 @@ public class BaseVehicleStateEnum {
         TC("14", "退车"),
         JCZBTIJ("15", "交车准备提交"),
         JCTJ("16", "交车提交"),
-
+        QKKPTJ("17","欠款开票提交"),
+        QKKPZZ("18","欠款开票终止"),
         ;
 
         private String typeKey;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java

@@ -30,4 +30,7 @@ public interface BaseVehicleStateFeign {
     @ResponseBody
     ResultBean<BaseVehicleState> selectOneByBusSid(@RequestParam("busSid") String busSid);
 
+    @PostMapping("selectOneQKKPByBusSid")
+    @ResponseBody
+    ResultBean<BaseVehicleState> selectOneQKKPByBusSid(@RequestParam("busSid") String sid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java

@@ -19,4 +19,6 @@ public interface BaseVehicleStateMapper extends BaseMapper<BaseVehicleState> {
     BusSalesOrder selevtByBusSid(String busSid);
 
     BaseVehicleState selectOneByBusSid(String busSid);
+
+    BaseVehicleState selectOneQKKPByBusSid(String sid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml

@@ -12,7 +12,7 @@
     <select id="selevtByBusSid" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder">
         select bo.*
         from anrui_buscenter.bus_sales_order bo
-                 left join anrui_buscenter.bus_sales_order_vehicle bv on bv.salesOrderSid = bo.sid
+                     left join anrui_buscenter.bus_sales_order_vehicle bv on bv.salesOrderSid = bo.sid
         where bv.sid = #{busSid}
     </select>
     <select id="selectOneByBusSid" resultType="com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState">
@@ -23,4 +23,13 @@
           AND busSid = #{busSid}
     </select>
 
+    <select id="selectOneQKKPByBusSid" resultType="com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState">
+        SELECT *
+        FROM base_vehicle_state
+        WHERE busSid = #{sid}
+          AND finState = '0'
+          AND carryVehicleState = '0'
+          AND carryInvoiceState = '0'
+          AND busState = '401'
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateRest.java

@@ -35,5 +35,10 @@ public class BaseVehicleStateRest implements BaseVehicleStateFeign {
         return baseVehicleStateService.selectOneByBusSid(busSid);
     }
 
+    @Override
+    public ResultBean<BaseVehicleState> selectOneQKKPByBusSid(String sid) {
+        return baseVehicleStateService.selectOneQKKPByBusSid(sid);
+    }
+
 
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java

@@ -95,6 +95,10 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
                     baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.CKKP_STATE_3.getStateKey());
                 }else if(BaseVehicleStateEnum.OperateTypeEnum.CKKP_DELETE.getTypeKey().equals(operateType)){
                     baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.CKKP_STATE_1.getStateKey());
+                }else if(BaseVehicleStateEnum.OperateTypeEnum.QKKPTJ.getTypeKey().equals(operateType)){
+                    baseVehicleState.setCarryVehicleState("1");
+                }else if(BaseVehicleStateEnum.OperateTypeEnum.QKKPZZ.getTypeKey().equals(operateType)){
+                    baseVehicleState.setCarryVehicleState("0");
                 }
                 baseMapper.updateById(baseVehicleState);
             }else{
@@ -167,4 +171,10 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
         BaseVehicleState baseVehicleState = baseMapper.selectOneByBusSid(busSid);
         return rb.success().setData(baseVehicleState);
     }
+
+    public ResultBean<BaseVehicleState> selectOneQKKPByBusSid(String sid) {
+        ResultBean<BaseVehicleState> rb = ResultBean.fireFail();
+        BaseVehicleState baseVehicleState = baseMapper.selectOneQKKPByBusSid(sid);
+        return rb.success().setData(baseVehicleState);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -37,16 +37,13 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderdiscount.app.AppBusSalesOrderDiscountListVo;
-import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
-import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.*;
 import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformation;
 import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformationFeign;
 import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandover;
 import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandoverFeign;
 import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandoverQuery;
 import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandoverVo;
-import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusVehicleQKKPQuery;
-import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusVehicleQKKPVo;
 import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign;
 import com.yxt.anrui.crm.api.crmcustomerfile.CrmCustomerFileFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerFileDDto;
@@ -2771,13 +2768,9 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             List<ContractPageVo> recordsNew = new ArrayList<>();
             if (records != null) {
                 for (ContractPageVo record : records) {
-                    BusVehicleQKKPQuery busVehicleQKKPQuery = new BusVehicleQKKPQuery();
-                    busVehicleQKKPQuery.setContractNo(record.getContractId());
-                    List<BusVehicleQKKPVo> busVehicleQKKPVos = busSalesOrderVehicleFeign.appVehicleQKKPList(busVehicleQKKPQuery).getData();
-                    if (busVehicleQKKPVos != null) {
-                        if (busVehicleQKKPVos.size() != 0) {
-                            recordsNew.add(record);
-                        }
+                    Boolean aBoolean = busSalesOrderVehicleFeign.appVehicleQKKPList2(record.getContractId()).getData();
+                    if (aBoolean){
+                        recordsNew.add(record);
                     }
                 }
             }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.buscenter.api.bussalesorder;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -10,8 +11,8 @@ import lombok.Data;
  */
 @Data
 public class SolutionsDetailsssVo {
-
-
+    @JsonProperty("isShowMore")
+    private boolean isShowMore;
     @ApiModelProperty("销售订单sid")
     private String salesOrderSid;
 
@@ -74,11 +75,13 @@ public class SolutionsDetailsssVo {
     private boolean vehDamageFloatCb;
     @ApiModelProperty("是否勾选其它融")
     private boolean otherPolicyState;
+    private String discountCar;
 
     //其他融
 
     @ApiModelProperty("其它融名称")
     private String otherPolicyName;
+    private String otherPolicySid;
     @ApiModelProperty("其它融金额")
     private String otherPolicyAmount;
     @ApiModelProperty("其它融期数")
@@ -132,6 +135,8 @@ public class SolutionsDetailsssVo {
     private String dealWay;
     @ApiModelProperty("办理方式选择key")
     private String dealWayKey;
+    @ApiModelProperty("代收合计")
+    private String proxyTotal;
     @ApiModelProperty("代收首年保险费")
     private String proxyPremium;
     @ApiModelProperty("代收购置费")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java

@@ -117,5 +117,7 @@ public interface BusSalesOrderVehicleFeign {
     @ResponseBody
     ResultBean<List<String>> selectListByvinNo(@RequestParam("vinNo") String vinNo);
 
-
+    @ApiOperation("移动端-欠款开票选择车辆列表2")
+    @PostMapping("/appVehicleQKKPList2")
+    ResultBean<Boolean> appVehicleQKKPList2(@RequestParam("contractNo") String contractNo);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java

@@ -108,4 +108,9 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe
         return null;
     }
 
+    @Override
+    public ResultBean<Boolean> appVehicleQKKPList2(String contractNo) {
+        return null;
+    }
+
 }

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

@@ -512,9 +512,11 @@
         select distinct bo.sid
         from bus_sales_order bo
         left join bus_sales_order_vehicle bv on bv.salesOrderSid = bo.sid
+        left join anrui_riskcenter.loan_solutions lo on lo.salesOrderSid = bo.sid
         <where>
             ${ew.sqlSegment} and bo.createBySid = #{userSid} and bo.useOrgSid = #{useOrgSid} and bo.nodeState = '已办结'
-            and bo.financePlan = '2'
+           <!-- and bo.financePlan = '2'-->
+            and (lo.typeKey = '01' or lo.typeKey = '02')
             and length(bv.linkSid)>0
         </where>
     </select>

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

@@ -3055,7 +3055,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             }
         }
 
-        if ("2".equals(busSalesOrder.getFinancePlan()) || "2".equals(busSalesOrder.getPayTypeKey())) {
+       /* if ("2".equals(busSalesOrder.getFinancePlan()) || "2".equals(busSalesOrder.getPayTypeKey())) {
             //根据销售订单sid查询金融方案
             ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailsss(sid);
             SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
@@ -3075,6 +3075,30 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             } else {
                 return rb.setMsg("此销售类型下金融方案不能为空");
             }
+        }*/
+        if ("2".equals(busSalesOrder.getFinancePlan()) || "2".equals(busSalesOrder.getPayTypeKey())) {
+            //根据销售订单sid查询金融方案
+            ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailsss(sid);
+            SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
+            if (solutionsDetailsVo != null) {
+                if ("2".equals(busSalesOrder.getPayTypeKey())) {//贷款
+                    //判断实收和单台订金
+                    if (new BigDecimal(solutionsDetailsVo.getRealTotal()).compareTo(busSalesOrderDeposit.getDeposit()) < 0) {
+                        return rb.setMsg("金融方案中实收金额小于单台订金");
+                    }
+                }else{
+                    if (StringUtils.isNotBlank(solutionsDetailsVo.getTypeKey())) {
+                        if (!"02".equals(solutionsDetailsVo.getTypeKey())) {
+                            //判断实收和单台订金
+                            if (new BigDecimal(solutionsDetailsVo.getRealTotal()).compareTo(busSalesOrderDeposit.getDeposit()) < 0) {
+                                return rb.setMsg("金融方案中实收金额小于单台订金");
+                            }
+                        }
+                    }
+                }
+            }else{
+                return rb.setMsg("此销售类型下金融方案不能为空");
+            }
         }
         return rb.success();
     }
@@ -4311,7 +4335,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         ResultBean<SolutionssVo> resultBean = loanSolutionsFeign.selectDetails2(sid);
         if (resultBean.getData() != null) {
             List<SolutionListVo> financeForms = resultBean.getData().getFinanceForms();
-            if(!financeForms.isEmpty()){
+            if (!financeForms.isEmpty()) {
                 List<OrderSolutionVo> voList = Optional.ofNullable(financeForms).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), OrderSolutionVo.class)).collect(Collectors.toList());
                 appOrderDetailsVo.setFinanceForms(voList);
             }
@@ -4436,10 +4460,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 }
                 //首付比例
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getDownPayRatio())) {
-                    loanSolutions = loanSolutions.append("、").append("首付比例：").append(solutionsDetailsVo.getDownPayRatio());
+                    loanSolutions = loanSolutions.append("、").append("首付比例（%）：").append(solutionsDetailsVo.getDownPayRatio());
 
                 } else {
-                    loanSolutions = loanSolutions.append("、").append("首付比例：").append("-");
+                    loanSolutions = loanSolutions.append("、").append("首付比例（%）：").append("-");
                 }
                 //首付金额
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getDownPayAmount())) {
@@ -4464,10 +4488,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 }
                 //贷款保证金比例
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getBondRatio())) {
-                    loanSolutions = loanSolutions.append("、").append("贷款保证金比例：").append(solutionsDetailsVo.getBondRatio());
+                    loanSolutions = loanSolutions.append("、").append("贷款保证金比例（%）：").append(solutionsDetailsVo.getBondRatio());
 
                 } else {
-                    loanSolutions = loanSolutions.append("、").append("贷款保证金比例：").append("-");
+                    loanSolutions = loanSolutions.append("、").append("贷款保证金比例（%）：").append("-");
                 }
                 //贷款保证金
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getBondAmount())) {
@@ -4485,10 +4509,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 }
                 //年利率
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getPolicyYearRatio())) {
-                    loanSolutions = loanSolutions.append("、").append("年利率：").append(solutionsDetailsVo.getPolicyYearRatio());
+                    loanSolutions = loanSolutions.append("、").append("年利率（%）：").append(solutionsDetailsVo.getPolicyYearRatio());
 
                 } else {
-                    loanSolutions = loanSolutions.append("、").append("年利率：").append("-");
+                    loanSolutions = loanSolutions.append("、").append("年利率（%）：").append("-");
                 }
                 //月还金额
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getLoanPayMoney())) {
@@ -4549,9 +4573,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     }
                     //年利率
                     if (StringUtils.isNotBlank(solutionsDetailsVo.getOtherPolicyYearRatio())) {
-                        otherLoanSolutions = otherLoanSolutions.append("、").append("年利率：").append(solutionsDetailsVo.getOtherPolicyYearRatio());
+                        otherLoanSolutions = otherLoanSolutions.append("、").append("年利率（%）：").append(solutionsDetailsVo.getOtherPolicyYearRatio());
                     } else {
-                        otherLoanSolutions = otherLoanSolutions.append("、").append("年利率：").append("-");
+                        otherLoanSolutions = otherLoanSolutions.append("、").append("年利率（%）：").append("-");
                     }
                 }
 
@@ -4855,6 +4879,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                                 baseVehicleStateDto.setVinSid(v.getLinkSid());
                                 baseVehicleStateDto.setVinNo(v.getLinkNo());
                             }
+                            baseVehicleStateDto.setSaleOrderSid(finalBusSalesOrderOne.getSid());
                             baseVehicleStateDto.setSaleTypeKey(finalBusSalesOrderOne.getPayTypeKey());
                             baseVehicleStateDto.setFinSourceKey(finalBusSalesOrderOne.getFinancePlan());
                             baseVehicleStateDto.setBusSid(v.getSid());
@@ -5221,7 +5246,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 }
                 busSalesOrder = fetchBySid(bv.getBusinessSid());
                 //为三方金融和担保贷款
-                if ("2".equals(busSalesOrder.getFinancePlan()) || "2".equals(busSalesOrder.getPayTypeKey())) {
+               /* if ("2".equals(busSalesOrder.getFinancePlan()) || "2".equals(busSalesOrder.getPayTypeKey())) {
                     //根据销售订单sid查询金融方案
                     ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailsss(bv.getBusinessSid());
                     SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
@@ -5245,6 +5270,37 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 } else {
                     //推送车款
                     createCarFin(vo, busSalesOrder);
+                }*/
+                if ("2".equals(busSalesOrder.getPayTypeKey())) {//贷款
+                    ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailsss(bv.getBusinessSid());
+                    SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
+                    if (solutionsDetailsVo != null) {
+                        createFinTwo(vo, busSalesOrder, solutionsDetailsVo);
+                    }
+                } else {
+                    if ("2".equals(busSalesOrder.getFinancePlan())) {
+                        ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailsss(bv.getBusinessSid());
+                        SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
+                        if (solutionsDetailsVo != null) {
+                            if (StringUtils.isNotBlank(solutionsDetailsVo.getTypeKey())) {
+                                //推送车款
+                                if ("02".equals(solutionsDetailsVo.getTypeKey())) {
+                                    //外部金融
+                                    createFin(vo, busSalesOrder, solutionsDetailsVo);
+                                } else {
+                                    //自营非担保
+                                    createFinTwo(vo, busSalesOrder, solutionsDetailsVo);
+                                }
+                            } else {
+                                //外部金融
+                                createFin(vo, busSalesOrder, solutionsDetailsVo);
+                            }
+                        }
+                    } else {
+                        //推送车款
+                        createCarFin(vo, busSalesOrder);
+                    }
+
                 }
                 //==============================修改车辆的持久状态组装数据
                 try {
@@ -5265,6 +5321,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                                     baseVehicleStateDto.setVinSid(v.getLinkSid());
                                     baseVehicleStateDto.setVinNo(v.getLinkNo());
                                 }
+                                baseVehicleStateDto.setSaleOrderSid(v.getSalesOrderSid());
                                 baseVehicleStateDto.setBusSid(v.getSid());
                                 dtoList.add(baseVehicleStateDto);
                             });

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java

@@ -122,4 +122,9 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
     public ResultBean<List<String>> selectListByvinNo(String vinNo) {
         return busSalesOrderVehicleService.selectListByvinNo(vinNo);
     }
+
+    @Override
+    public ResultBean<Boolean> appVehicleQKKPList2(String contractNo) {
+        return busSalesOrderVehicleService.appVehicleQKKPList2(contractNo);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -39,12 +39,16 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicleQKKPVo;
 import com.yxt.anrui.base.api.basevehicleappendix.BaseVehicleAppendixFeign;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
+import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState;
+import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign;
 import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstate;
 import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
+import com.yxt.anrui.base.api.commoncontract.ContractPageVo;
 import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.AdCarListVo;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApply;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.GCarListVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppNowCarListVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListsVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.*;
@@ -90,6 +94,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
     @Autowired
     private BusSalesOrderService busSalesOrderService;
     @Autowired
+    private BusSalesOrderVehicleService busSalesOrderVehicleService;
+    @Autowired
     private BaseTrailerFeign baseTrailerFeign;
     @Autowired
     private FinSelectedReceivablesDetailedFeign finSelectedReceivablesDetailedFeign;
@@ -105,6 +111,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
     private BaseVehicleAppendixFeign baseVehicleAppendixFeign;
     @Autowired
     private BusArrearsCarryVehicleApplyService busArrearsCarryVehicleApplyService;
+    @Autowired
+    private BaseVehicleStateFeign baseVehicleStateFeign;
 
     public void saveVehicle(List<BusSalesOrderVehicleDto> list, String sid) {
         if (list.size() > 0) {
@@ -303,49 +311,48 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         }
         List<BusVehicleQKKPVo> busVehicleQKKPVos = baseMapper.appVehicleQKKPList(qw);
         List<BusVehicleQKKPTrailerVo> busVehicleQKKPTrailerVos = new ArrayList<>();
-        List<BusVehicleQKKPVo> busVehicleQKKPVosNew1 = new ArrayList<>();
-        List<BusVehicleQKKPVo> busVehicleQKKPVosNew = new ArrayList<>();
-        if (busVehicleQKKPVos != null) {
+        if (busVehicleQKKPVos != null && busVehicleQKKPVos.size() > 0) {
             for (BusVehicleQKKPVo record : busVehicleQKKPVos) {
                 //判断相同车辆是否存在已提交的申请
                 FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleFeign.fetchByVehSid(record.getVehSid()).getData();
-                if (finBillVehicleDetailsVo == null) {
-                    busVehicleQKKPVosNew1.add(record);
-                }
-            }
-        }
-        for (BusVehicleQKKPVo busVehicleQKKPVo : busVehicleQKKPVosNew1) {
-            String vehSid = busVehicleQKKPVo.getVehSid();
-            BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = busArrearsCarryVehicleApplyService.selSubmitLc(vehSid).getData();
-            if (busArrearsCarryVehicleApply == null){
-                busVehicleQKKPVosNew.add(busVehicleQKKPVo);
-            }
-        }
-        for (BusVehicleQKKPVo busVehicleQKKPVo : busVehicleQKKPVosNew) {
-            if (StringUtils.isNotBlank(busVehicleQKKPVo.getVehSid())) {
-                BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(busVehicleQKKPVo.getVehSid()).getData();
-                if (baseVehicleCertificateVo != null) {
-                    busVehicleQKKPVo.setCertificateState(baseVehicleCertificateVo.getCertificateState());
-                    busVehicleQKKPVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue());
-                    List<String> stringList = baseVehicleAppendixFeign.selectBySid(baseVehicleCertificateVo.getSid()).getData();
-                    busVehicleQKKPVo.setZcHgzImages(stringList);
+                if (finBillVehicleDetailsVo != null) {
+                    busVehicleQKKPVos.remove(record);
+                    if (busVehicleQKKPVos.size() == 0){
+                        break;
+                    }
                 }
-                TraliveredVo traliveredVo = baseTrailerFeign.trailerList(busVehicleQKKPVo.getVehSid(), query.getContractNo()).getData();
-                List<TrailerVo> trailerVos = traliveredVo.getList();
-                if (trailerVos != null && trailerVos.size() > 0) {
-                    for (TrailerVo trailerVo : trailerVos) {
-                        BusVehicleQKKPTrailerVo busVehicleQKKPTrailerVo = new BusVehicleQKKPTrailerVo();
-                        busVehicleQKKPTrailerVo.setVinNo(traliveredVo.getVinNo());
-                        busVehicleQKKPTrailerVo.setGcVinNo(trailerVo.getTrailerVinNo());
-                        BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(trailerVo.getTrailerVinNo()).getData();
-                        busVehicleQKKPTrailerVo.setOneBillMoney(baseTrailerDetailsVo.getDealPrice());
-                        busVehicleQKKPTrailerVos.add(busVehicleQKKPTrailerVo);
-                        busVehicleQKKPVo.setTrailers(busVehicleQKKPTrailerVos);
+                String vehSid = record.getVehSid();
+                if (StringUtils.isNotBlank(vehSid)){
+                    BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = busArrearsCarryVehicleApplyService.selSubmitLc(vehSid).getData();
+                    if (busArrearsCarryVehicleApply != null){
+                        busVehicleQKKPVos.remove(record);
+                        if (busVehicleQKKPVos.size() == 0){
+                            break;
+                        }
+                    }
+                    BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(vehSid).getData();
+                    if (baseVehicleCertificateVo != null) {
+                        record.setCertificateState(baseVehicleCertificateVo.getCertificateState());
+                        record.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue());
+                        List<String> stringList = baseVehicleAppendixFeign.selectBySid(baseVehicleCertificateVo.getSid()).getData();
+                        record.setZcHgzImages(stringList);
+                    }
+                    TraliveredVo traliveredVo = baseTrailerFeign.trailerList(vehSid, query.getContractNo()).getData();
+                    List<TrailerVo> trailerVos = traliveredVo.getList();
+                    if (trailerVos != null && trailerVos.size() > 0) {
+                        for (TrailerVo trailerVo : trailerVos) {
+                            BusVehicleQKKPTrailerVo busVehicleQKKPTrailerVo = new BusVehicleQKKPTrailerVo();
+                            busVehicleQKKPTrailerVo.setVinNo(traliveredVo.getVinNo());
+                            busVehicleQKKPTrailerVo.setGcVinNo(trailerVo.getTrailerVinNo());
+                            busVehicleQKKPTrailerVo.setOneBillMoney(trailerVo.getDealPrice());
+                            busVehicleQKKPTrailerVos.add(busVehicleQKKPTrailerVo);
+                            record.setTrailers(busVehicleQKKPTrailerVos);
+                        }
                     }
                 }
             }
         }
-        return rb.success().setData(busVehicleQKKPVosNew);
+        return rb.success().setData(busVehicleQKKPVos);
     }
 
     public ResultBean<List<QCarVo>> getCanUseCars(QCarQuery query) {
@@ -510,4 +517,20 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
 
         return baseMapper.selectOneByVehSidAndOrderSid(vehSid,orderSid);
     }
+
+    public ResultBean<Boolean> appVehicleQKKPList2(String contractNo) {
+        ResultBean rb = ResultBean.fireFail();
+        Boolean i = false;
+        BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(contractNo);
+        List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleService.selectByOrderSid(busSalesOrder.getSid());
+        for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
+            String sid = busSalesOrderVehicle.getSid();
+            BaseVehicleState baseVehicleState = baseVehicleStateFeign.selectOneQKKPByBusSid(sid).getData();
+            if (baseVehicleState != null){
+                i = true;
+                break;
+            }
+        }
+        return rb.success().setData(i);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -41,6 +41,9 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicleappendix.BaseVehicleAppendixFeign;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
+import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto;
+import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum;
+import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
 import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
@@ -52,6 +55,7 @@ import com.yxt.anrui.base.common.utils.domain.BillNo;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyFeign;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
@@ -198,6 +202,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
     private BusArrearsCarryVehicleApplyFeign busArrearsCarryVehicleApplyFeign;
     @Autowired
     private FlowFeign flowFeign;
+    @Autowired
+    private BaseVehicleStateFeign baseVehicleStateFeign;
 
     private QueryWrapper<FinBillApplication> createQueryWrapper(FinBillApplicationQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -2082,8 +2088,18 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             }
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
-            //极光推送
+            List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchByMainSid(businessSid);
+            List<BaseVehicleStateDto> baseVehicleStateDtos = new ArrayList<>();
+            for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
+                BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finBillApplication.getContractNo(), finBillVehicleVo.getVehSid()).getData();
+                baseVehicleStateDto.setBusSid(busSalesOrderVehicle.getSid());
+                baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.QKKPTJ.getTypeKey());
+                baseVehicleStateDtos.add(baseVehicleStateDto);
+            }
+            baseVehicleStateFeign.saveOrUpdate(baseVehicleStateDtos);
             finBillApplication = fetchBySid(businessSid);
+            //极光推送
             try {
                 ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
                         .setNameFormat("demo-pool-%d").build();
@@ -2597,6 +2613,16 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                 updateFlowFiled(map);
                 finBillVehicleService.updateByMainSid(finBillApplication.getSid());
+                List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchByMainSid(query.getBusinessSid());
+                List<BaseVehicleStateDto> baseVehicleStateDtos = new ArrayList<>();
+                for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
+                    BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                    BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finBillApplication.getContractNo(), finBillVehicleVo.getVehSid()).getData();
+                    baseVehicleStateDto.setBusSid(busSalesOrderVehicle.getSid());
+                    baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.QKKPTJ.getTypeKey());
+                    baseVehicleStateDtos.add(baseVehicleStateDto);
+                }
+                baseVehicleStateFeign.saveOrUpdate(baseVehicleStateDtos);
                 return rb.success().setData(resultBean.getData());
             }else{
                 if (businessTaskId.equals(query.getTaskId())) {
@@ -2609,6 +2635,16 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                     updateFlowFiled(map);
                     finBillVehicleService.updateByMainSid(finBillApplication.getSid());
+                    List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchByMainSid(query.getBusinessSid());
+                    List<BaseVehicleStateDto> baseVehicleStateDtos = new ArrayList<>();
+                    for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
+                        BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                        BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finBillApplication.getContractNo(), finBillVehicleVo.getVehSid()).getData();
+                        baseVehicleStateDto.setBusSid(busSalesOrderVehicle.getSid());
+                        baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.QKKPTJ.getTypeKey());
+                        baseVehicleStateDtos.add(baseVehicleStateDto);
+                    }
+                    baseVehicleStateFeign.saveOrUpdate(baseVehicleStateDtos);
                     return rb.success().setData(resultBean.getData());
                 }
             }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -368,7 +368,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 FinSelectedReceivablesDetailedDto finSelectedReceivablesDetailedDto = dingList.get(i);
                 BigDecimal currentReceivableMoney = new BigDecimal(finSelectedReceivablesDetailedDto.getCurrentReceivableMoney());
                 BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedDto.getSubscriptionMoney());
-                if(finSelectedReceivablesDetailedDto.getSubscribedOf() == 0){
+                if (finSelectedReceivablesDetailedDto.getSubscribedOf() == 0) {
                     if (subscriptionMoney.compareTo(currentReceivableMoney) > 0) {
                         return rb.setMsg("应收未收中的订金不允许多收，请检查");
                     }
@@ -430,21 +430,21 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 String orgPath = dto.getOrgPath();
                 finCollectionConfirmation.setOrgSidPath(orgPath);
                 ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(useOrgSid);
-                if(sysOrganizationVoResultBean.getData() != null){
+                if (sysOrganizationVoResultBean.getData() != null) {
                     finCollectionConfirmation.setUseOrgName(sysOrganizationVoResultBean.getData().getName());
                 }
 
-            }else{
+            } else {
                 //代收款
                 String orgPath = dto.getOrgPath();
                 finCollectionConfirmation.setOrgSidPath(orgPath);
                 ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(useOrgSid);
-                if(sysOrganizationVoResultBean.getData() != null){
+                if (sysOrganizationVoResultBean.getData() != null) {
                     finCollectionConfirmation.setUseOrgName(sysOrganizationVoResultBean.getData().getName());
                 }
                 List<String> orgList = Arrays.asList(orgPath.split("/"));
-                orgList.set(orgList.size()-1,dto.getStaffDeptSid());
-                finCollectionConfirmation.setOrgSidPath(String.join("/",orgList));
+                orgList.set(orgList.size() - 1, dto.getStaffDeptSid());
+                finCollectionConfirmation.setOrgSidPath(String.join("/", orgList));
 
             }
             sid = finCollectionConfirmation.getSid();
@@ -814,7 +814,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         String orgPath = dto.getOrgPath();
         finCollectionConfirmation.setOrgSidPath(orgPath);
         ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(finCollectionConfirmation.getUseOrgSid());
-        if(sysOrganizationVoResultBean.getData() != null){
+        if (sysOrganizationVoResultBean.getData() != null) {
             finCollectionConfirmation.setUseOrgName(sysOrganizationVoResultBean.getData().getName());
         }
         if ("03".equals(dto.getCollectionTypeKey()) || "05".equals(dto.getCollectionTypeKey())) {
@@ -1253,13 +1253,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         if (confirmation == null) {
             return rb.setMsg("该申请不存在");
         }
-        if("2".equals(confirmation.getAuditState())){
+        if ("2".equals(confirmation.getAuditState())) {
             return rb.setMsg("该申请已驳回，不允许重复操作");
         }
-        if("3".equals(confirmation.getAuditState())){
+        if ("3".equals(confirmation.getAuditState())) {
             return rb.setMsg("该申请已审核通过，不允许驳回");
         }
-        if("4".equals(confirmation.getAuditState())){
+        if ("4".equals(confirmation.getAuditState())) {
             return rb.setMsg("该申请已撤回，不允许驳回");
         }
         if (confirmation.getFirst() == 1) {
@@ -1667,13 +1667,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         if (confirmation == null) {
             return rb.setMsg("该申请不存在");
         }
-        if("3".equals(confirmation.getAuditState())){
+        if ("3".equals(confirmation.getAuditState())) {
             return rb.setMsg("该申请已审核通过，不允许重复操作");
         }
-        if("2".equals(confirmation.getAuditState())){
+        if ("2".equals(confirmation.getAuditState())) {
             return rb.setMsg("该申请已驳回，不允许确认");
         }
-        if("4".equals(confirmation.getAuditState())){
+        if ("4".equals(confirmation.getAuditState())) {
             return rb.setMsg("该申请已撤回，不允许确认");
         }
         confirmation.setAuditState(3);
@@ -1928,7 +1928,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                     ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailss(commonContract.getBusSid());
                                     SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
                                     if (solutionsDetailsVo != null) {
-                                        if (StringUtils.isNotBlank(solutionsDetailsVo.getTypeKey())) {
+                                        /*if (StringUtils.isNotBlank(solutionsDetailsVo.getTypeKey())) {
                                             if ("02".equals(solutionsDetailsVo.getTypeKey())) {
                                                 //外部金融：成交价 = 订金+车款+厂家贴息-服务费
                                                 leftAll = leftAll.add(singleFinalPrice);
@@ -1951,6 +1951,44 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                                 leftAll = leftAll.add(new BigDecimal(solutionsDetailsVo.getRealTotal()));
                                             }
                                             rightAll = rightAll.add(bigDecimalVinAll);
+                                        }*/
+                                        if ("2".equals(vo.getPayTypeKey())) {//贷款
+                                            if (StringUtils.isNotBlank(solutionsDetailsVo.getRealTotal())) {
+                                                leftAll = leftAll.add(new BigDecimal(solutionsDetailsVo.getRealTotal()));
+                                            }
+                                            rightAll = rightAll.add(bigDecimalVinAll);
+                                        } else {
+                                            if(StringUtils.isNotBlank(solutionsDetailsVo.getTypeKey())){
+                                                //外部金融：成交价 = 订金+车款+厂家贴息-服务费
+                                                leftAll = leftAll.add(singleFinalPrice);
+                                                if (StringUtils.isNotBlank(solutionsDetailsVo.getDiscountCar())) {
+                                                    leftAll = leftAll.subtract(new BigDecimal(solutionsDetailsVo.getDiscountCar()));
+                                                }else{
+                                                    leftAll = leftAll.subtract(new BigDecimal(solutionsDetailsVo.getFactoryDiscount()));
+                                                }
+                                                if (StringUtils.isNotBlank(solutionsDetailsVo.getServiceAmount())) {
+                                                    leftAll = leftAll.add(new BigDecimal(solutionsDetailsVo.getServiceAmount()));
+                                                }
+                                                rightAll = rightAll.add(bigDecimalVinAll);
+                                            }else{
+                                                if ("02".equals(solutionsDetailsVo.getTypeKey())) {
+                                                    //外部金融：成交价 = 订金+车款+厂家贴息-服务费
+                                                    leftAll = leftAll.add(singleFinalPrice);
+                                                    if (StringUtils.isNotBlank(solutionsDetailsVo.getFactoryDiscount())) {
+                                                        leftAll = leftAll.subtract(new BigDecimal(solutionsDetailsVo.getFactoryDiscount()));
+                                                    }
+                                                    if (StringUtils.isNotBlank(solutionsDetailsVo.getServiceAmount())) {
+                                                        leftAll = leftAll.add(new BigDecimal(solutionsDetailsVo.getServiceAmount()));
+                                                    }
+                                                    rightAll = rightAll.add(bigDecimalVinAll);
+                                                } else {
+                                                    //自营非担保：  实收订金 = 首付款及费用+订金
+                                                    if (StringUtils.isNotBlank(solutionsDetailsVo.getRealTotal())) {
+                                                        leftAll = leftAll.add(new BigDecimal(solutionsDetailsVo.getRealTotal()));
+                                                    }
+                                                    rightAll = rightAll.add(bigDecimalVinAll);
+                                                }
+                                            }
                                         }
                                     } else {
                                         //  成交价 = 车款+订金
@@ -2758,13 +2796,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         if (confirmation == null) {
             return rb.setMsg("该申请不存在");
         }
-        if("3".equals(confirmation.getAuditState())){
+        if ("3".equals(confirmation.getAuditState())) {
             return rb.setMsg("该申请已审核通过，不允许撤回");
         }
-        if("4".equals(confirmation.getAuditState())){
+        if ("4".equals(confirmation.getAuditState())) {
             return rb.setMsg("该申请已撤回，不允许重复撤回");
         }
-        if("2".equals(confirmation.getAuditState())){
+        if ("2".equals(confirmation.getAuditState())) {
             return rb.setMsg("该申请已驳回，不允许撤回");
         }
         if (!userSid.equals(confirmation.getCreateBySid())) {
@@ -2845,7 +2883,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             }
         }
         qw.eq("fsrd.auditState", 3);
-        qw.eq("fsrd.kxState","01");
+        qw.eq("fsrd.kxState", "01");
         if (StringUtils.isNotBlank(query.getStaffDeptName())) {
             qw.like("fcc.staffDeptName", query.getStaffDeptName());
         }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java

@@ -790,7 +790,9 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             zr.setConNo(yxysFinFundsCarriedForwardYXYSKXVo.getContractId());
             zr.setName(yxysFinFundsCarriedForwardYXYSKXVo.getName());
             zr.setVinNo(yxysFinFundsCarriedForwardYXYSKXVo.getVin());
-            zr.setDrje(Integer.parseInt(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney()));
+            String confirmMoney = yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney();
+            int index = confirmMoney.indexOf(".");
+            zr.setDrje(Integer.parseInt(confirmMoney.substring(0, index)));
             zrList.add(zr);
         }
         //2.设置listi和listo中财务系统客户编码值
@@ -1449,7 +1451,9 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             tzDto.setConNo(yxysFinFundsCarriedForwardYXYSKXVo.getContractId());
             tzDto.setName(yxysFinFundsCarriedForwardYXYSKXVo.getName());
             tzDto.setVinNo(yxysFinFundsCarriedForwardYXYSKXVo.getVin());
-            tzDto.setDrje(Integer.parseInt(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney()));
+            String confirmMoney = yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney();
+            int index = confirmMoney.indexOf(".");
+            tzDto.setDrje(Integer.parseInt(confirmMoney.substring(0, index)));
             tzList.add(tzDto);
         }
         dataMap.put("saleDate", DateUtil.formatDate(new Date()));
@@ -1627,7 +1631,9 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             tzDto.setConNo(yxysFinFundsCarriedForwardYXYSKXVo.getContractId());
             tzDto.setName(yxysFinFundsCarriedForwardYXYSKXVo.getName());
             tzDto.setVinNo(yxysFinFundsCarriedForwardYXYSKXVo.getVin());
-            tzDto.setDrje(Integer.parseInt(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney()));
+            String confirmMoney = yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney();
+            int index = confirmMoney.indexOf(".");
+            tzDto.setDrje(Integer.parseInt(confirmMoney.substring(0, index)));
             tzList.add(tzDto);
         }
         dataMap.put("saleDate", DateUtil.formatDate(new Date()));

anrui-riskcenter-ui/src/api/financialpolicyreporting/financialpolicyreporting.js

@@ -88,7 +88,7 @@ export default {
   // 流程审批（撤回）
   revokeProcess: function(params) {
     return request({
-      url: '/buscenter/v1/loanfinpolicyrecordapply/revokeProcess',
+      url: '/riskcenter/v1/loanfinpolicyrecordapply/revokeProcess',
       method: 'post',
       data: params,
       headers: { 'Content-Type': 'application/json' }

anrui-riskcenter-ui/src/views/capital/capitalAdd.vue

@@ -123,7 +123,11 @@ export default {
             if (res.success) {
               this.$message({ showClose: true, type: 'success', message: '保存成功' })
               this.handleReturn('true')
+            } else {
+              this.submitdisabled = false
             }
+          }).catch(() => {
+            this.submitdisabled = false
           })
         }
       })

anrui-riskcenter-ui/src/views/workFlow/jinrongzhengceFlow/financialpolicyreportingByDivisionOperateInfo.vue

@@ -227,7 +227,7 @@ export default {
       params: {
         // 告诉父级页面，子页面的弹框高度。
         code: 2,
-        data: 350 + 'px'
+        data: 450 + 'px'
       }
     }, '*')
   },

anrui-riskcenter-ui/src/views/workFlow/jinrongzhengceFlow/financialpolicyreportingDaiBanInfo.vue

@@ -227,7 +227,7 @@ export default {
       params: {
         // 告诉父级页面，子页面的弹框高度。
         code: 2,
-        data: 350 + 'px'
+        data: 450 + 'px'
       }
     }, '*')
   },

anrui-riskcenter-ui/src/views/workFlow/jinrongzhengceFlow/financialpolicyreportingEdit.vue

@@ -180,7 +180,7 @@ export default {
       params: {
         // 告诉父级页面，子页面的弹框高度。
         code: 2,
-        data: 350 + 'px'
+        data: 450 + 'px'
       }
     }, '*')
   },

anrui-riskcenter-ui/src/views/workFlow/jinrongzhengceFlow/financialpolicyreportingYiBanInfo.vue

@@ -185,7 +185,7 @@ export default {
       params: {
         // 告诉父级页面，子页面的弹框高度。
         code: 2,
-        data: 350 + 'px'
+        data: 450 + 'px'
       }
     }, '*')
   },

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java

@@ -25,14 +25,16 @@
  *********************************************************/
 package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate;
 
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomeVisitInvestigateInitCustomerVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomeVisitInvestigateSaveCustomerDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.*;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperDto;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateSaveOperDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperVo;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderDto;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateSaveOrderDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderVo;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateInitPropDto;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateSavePropDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateInitPropVo;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranDto;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateSaveTranDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -123,7 +125,7 @@ public interface LoanHomevisitInvestigateFeign {
     @ApiOperation("保存家访考察订单信息")
     @PostMapping("/saveHomeVisitOrderInfo")
     @ResponseBody
-    public ResultBean saveHomeVisitOrderInfo(@Valid @RequestBody LoanHomeVisitInvestigateInitOrderDto dto);
+    public ResultBean saveHomeVisitOrderInfo(@Valid @RequestBody LoanHomeVisitInvestigateSaveOrderDto dto);
 
     @ApiOperation("初始化家访考察运营经历")
     @GetMapping("/getHomeVisitOperationInfo")
@@ -133,7 +135,7 @@ public interface LoanHomevisitInvestigateFeign {
     @ApiOperation("保存家访考察运营经历")
     @PostMapping("/saveHomeVisitOperationInfo")
     @ResponseBody
-    public ResultBean saveHomeVisitOperationInfo(@Valid @RequestBody LoanHomeVisitInvestigateInitOperDto dto);
+    public ResultBean saveHomeVisitOperationInfo(@Valid @RequestBody LoanHomeVisitInvestigateSaveOperDto dto);
 
     @ApiOperation("初始化家访考察运输信息")
     @GetMapping("/getHomeVisitTransportInfo")
@@ -143,7 +145,7 @@ public interface LoanHomevisitInvestigateFeign {
     @ApiOperation("保存家访考察运输信息")
     @PostMapping("/saveHomeVisitTransportInfo")
     @ResponseBody
-    public ResultBean saveHomeVisitTransportInfo(@Valid @RequestBody LoanHomeVisitInvestigateInitTranDto dto);
+    public ResultBean saveHomeVisitTransportInfo(@Valid @RequestBody LoanHomeVisitInvestigateSaveTranDto dto);
 
     @ApiOperation("初始化家访考察资产情况")
     @GetMapping("/getHomeVisitAssetsInfo")
@@ -153,7 +155,7 @@ public interface LoanHomevisitInvestigateFeign {
     @ApiOperation("保存家访考察资产情况")
     @PostMapping("/saveHomeVisitAssetsInfo")
     @ResponseBody
-    public ResultBean saveHomeVisitAssetsInfo(@Valid @RequestBody LoanHomeVisitInvestigateInitPropDto dto);
+    public ResultBean saveHomeVisitAssetsInfo(@Valid @RequestBody LoanHomeVisitInvestigateSavePropDto dto);
 
     @ApiOperation("初始化家访考察家访见证")
     @GetMapping("/getHomeVisitWitnessInfo")
@@ -163,7 +165,7 @@ public interface LoanHomevisitInvestigateFeign {
     @ApiOperation("保存家访考察家访见证")
     @PostMapping("/saveHomeVisitWitnessInfo")
     @ResponseBody
-    public ResultBean saveHomeVisitWitnessInfo(@Valid @RequestBody LoanHomeVisitInvestigateInitJFJZDto dto);
+    public ResultBean saveHomeVisitWitnessInfo(@Valid @RequestBody LoanHomeVisitInvestigateSaveJFJZDto dto);
 
     @ApiOperation("初始化家访考察证明文件")
     @GetMapping("/getHomeVisitProveFileInfo")
@@ -173,7 +175,7 @@ public interface LoanHomevisitInvestigateFeign {
     @ApiOperation("保存家访考察证明文件")
     @PostMapping("/saveHomeVisitProveFileInfo")
     @ResponseBody
-    public ResultBean saveHomeVisitProveFileInfo(@Valid @RequestBody LoanHomeVisitInvestigateInitZMWJDto dto);
+    public ResultBean saveHomeVisitProveFileInfo(@Valid @RequestBody LoanHomeVisitInvestigateSaveZMWJDto dto);
 
     @ApiOperation("初始化家访考察资产类")
     @GetMapping("/getAssetCertificateInfo")
@@ -183,5 +185,13 @@ public interface LoanHomevisitInvestigateFeign {
     @ApiOperation("保存家访考察资产类")
     @PostMapping("/saveAssetCertificateInfo")
     @ResponseBody
-    public ResultBean saveAssetCertificateInfo(@Valid @RequestBody LoanHomeVisitInvestigateInitZCLDto dto);
+    public ResultBean saveAssetCertificateInfo(@Valid @RequestBody LoanHomeVisitInvestigateSaveZCLDto dto);
+
+    /******************************************************家访进度*******************************************************/
+
+    @ApiOperation("家访进度分页列表")
+    @PostMapping("/jfjdListPage")
+    @ResponseBody
+    public ResultBean<PagerVo<LoanHomevisitInvestigateVo>> jfjdListPage(@RequestBody PagerQuery<LoanHomevisitInvestigateQuery> pq);
+
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java

@@ -25,22 +25,22 @@
  *********************************************************/
 package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate;
 
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomeVisitInvestigateInitCustomerVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomeVisitInvestigateSaveCustomerDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.*;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperDto;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateSaveOperDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperVo;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderDto;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateSaveOrderDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderVo;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateInitPropDto;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateSavePropDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateInitPropVo;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranDto;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateSaveTranDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * Project: anrui-riskcenter(家访考察) <br/>
  * File: LoanHomevisitInvestigateFeignFallback.java <br/>
@@ -115,7 +115,7 @@ public class LoanHomevisitInvestigateFeignFallback implements LoanHomevisitInves
 	}
 
 	@Override
-	public ResultBean saveHomeVisitOrderInfo(LoanHomeVisitInvestigateInitOrderDto dto) {
+	public ResultBean saveHomeVisitOrderInfo(LoanHomeVisitInvestigateSaveOrderDto dto) {
 		return null;
 	}
 
@@ -125,7 +125,7 @@ public class LoanHomevisitInvestigateFeignFallback implements LoanHomevisitInves
 	}
 
 	@Override
-	public ResultBean saveHomeVisitOperationInfo(LoanHomeVisitInvestigateInitOperDto dto) {
+	public ResultBean saveHomeVisitOperationInfo(LoanHomeVisitInvestigateSaveOperDto dto) {
 		return null;
 	}
 
@@ -135,7 +135,7 @@ public class LoanHomevisitInvestigateFeignFallback implements LoanHomevisitInves
 	}
 
 	@Override
-	public ResultBean saveHomeVisitTransportInfo(LoanHomeVisitInvestigateInitTranDto dto) {
+	public ResultBean saveHomeVisitTransportInfo(LoanHomeVisitInvestigateSaveTranDto dto) {
 		return null;
 	}
 
@@ -145,7 +145,7 @@ public class LoanHomevisitInvestigateFeignFallback implements LoanHomevisitInves
 	}
 
 	@Override
-	public ResultBean saveHomeVisitAssetsInfo(LoanHomeVisitInvestigateInitPropDto dto) {
+	public ResultBean saveHomeVisitAssetsInfo(LoanHomeVisitInvestigateSavePropDto dto) {
 		return null;
 	}
 
@@ -155,7 +155,7 @@ public class LoanHomevisitInvestigateFeignFallback implements LoanHomevisitInves
 	}
 
 	@Override
-	public ResultBean saveHomeVisitWitnessInfo(LoanHomeVisitInvestigateInitJFJZDto dto) {
+	public ResultBean saveHomeVisitWitnessInfo(LoanHomeVisitInvestigateSaveJFJZDto dto) {
 		return null;
 	}
 
@@ -165,7 +165,7 @@ public class LoanHomevisitInvestigateFeignFallback implements LoanHomevisitInves
 	}
 
 	@Override
-	public ResultBean saveHomeVisitProveFileInfo(LoanHomeVisitInvestigateInitZMWJDto dto) {
+	public ResultBean saveHomeVisitProveFileInfo(LoanHomeVisitInvestigateSaveZMWJDto dto) {
 		return null;
 	}
 
@@ -175,7 +175,12 @@ public class LoanHomevisitInvestigateFeignFallback implements LoanHomevisitInves
 	}
 
 	@Override
-	public ResultBean saveAssetCertificateInfo(LoanHomeVisitInvestigateInitZCLDto dto) {
+	public ResultBean saveAssetCertificateInfo(LoanHomeVisitInvestigateSaveZCLDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<PagerVo<LoanHomevisitInvestigateVo>> jfjdListPage(PagerQuery<LoanHomevisitInvestigateQuery> pq) {
 		return null;
 	}
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateQuery.java

@@ -69,10 +69,14 @@ public class LoanHomevisitInvestigateQuery implements Query {
     private String contractNo;
     @ApiModelProperty("贷款人名称")
     private String loanPeoName;
+    @ApiModelProperty("资方名称")
+    private String bankName;
     @ApiModelProperty("金融产品名称")
     private String policyName;
     @ApiModelProperty("家访专员姓名")
     private String homeVisStaffName;
+    @ApiModelProperty("考察结果value")
+    private String investigateValue;
     @ApiModelProperty("组织全路径")
     private String orgSidPath;
     private String menuSid;

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateInitCustomerVo.java → anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomeVisitInvestigateInitCustomerVo.java

@@ -1,4 +1,4 @@
-package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate;
+package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer;
 
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomeVisitInvestigateInitOtherPeoVo;
 import com.yxt.common.core.vo.Vo;

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateSaveCustomerDto.java → anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomeVisitInvestigateSaveCustomerDto.java

@@ -1,6 +1,6 @@
-package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate;
+package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer;
 
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomeVisitInvestigateInitOtherPeoDto;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomeVisitInvestigateSaveOtherPeoDto;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -53,7 +53,7 @@ public class LoanHomeVisitInvestigateSaveCustomerDto implements Dto {
     @ApiModelProperty("配偶职业")
     private String spouseJob;
     @ApiModelProperty("其他人员")
-    private List<LoanHomeVisitInvestigateInitOtherPeoDto> otherPersonnel = new ArrayList<>();
+    private List<LoanHomeVisitInvestigateSaveOtherPeoDto> otherPersonnel = new ArrayList<>();
     @ApiModelProperty("紧急联系人姓名")
     private String emergencyContactName;
     @ApiModelProperty("紧急联系人电话")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZCLVo.java

@@ -10,6 +10,8 @@ import java.util.List;
 public class LoanHomeVisitInvestigateInitZCLVo implements Vo {
 
     private String sid;
+    @ApiModelProperty("银行卡")
+    private List<String> yhkImages;
     @ApiModelProperty("房产")
     private List<String> houseProperty;
     @ApiModelProperty("车辆")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitJFJZDto.java → anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateSaveJFJZDto.java

@@ -4,22 +4,23 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
-public class LoanHomeVisitInvestigateInitJFJZDto implements Vo {
+public class LoanHomeVisitInvestigateSaveJFJZDto implements Vo {
 
     private String sid;
     @ApiModelProperty("定位信息")
-    private List<String> location;
+    private List<String> location = new ArrayList<>();
     @ApiModelProperty("房屋照片")
-    private List<String> house;
+    private List<String> house = new ArrayList<>();;
     @ApiModelProperty("门口照片")
-    private List<String> doorway;
+    private List<String> doorway = new ArrayList<>();;
     @ApiModelProperty("客厅卧室")
-    private List<String> indoor;
+    private List<String> indoor = new ArrayList<>();;
     @ApiModelProperty("合影照等")
-    private List<String> groupPhoto;
+    private List<String> groupPhoto = new ArrayList<>();;
     @ApiModelProperty("家访考察表sid")
     private String mainSid;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZCLDto.java → anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateSaveZCLDto.java

@@ -7,9 +7,11 @@ import lombok.Data;
 import java.util.List;
 
 @Data
-public class LoanHomeVisitInvestigateInitZCLDto implements Vo {
+public class LoanHomeVisitInvestigateSaveZCLDto implements Vo {
 
     private String sid;
+    @ApiModelProperty("银行卡")
+    private List<String> yhkImages;
     @ApiModelProperty("房产")
     private List<String> houseProperty;
     @ApiModelProperty("车辆")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZMWJDto.java → anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateSaveZMWJDto.java

@@ -7,7 +7,7 @@ import lombok.Data;
 import java.util.List;
 
 @Data
-public class LoanHomeVisitInvestigateInitZMWJDto implements Vo {
+public class LoanHomeVisitInvestigateSaveZMWJDto implements Vo {
 
     private String sid;
     @ApiModelProperty("贷款人身份证")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateoperations/LoanHomeVisitInvestigateInitOperDto.java → anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateoperations/LoanHomeVisitInvestigateSaveOperDto.java

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-public class LoanHomeVisitInvestigateInitOperDto implements Vo {
+public class LoanHomeVisitInvestigateSaveOperDto implements Vo {
 
     private String sid;
     @ApiModelProperty("运营年限")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomeVisitInvestigateInitOrderDto.java → anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomeVisitInvestigateSaveOrderDto.java

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-public class LoanHomeVisitInvestigateInitOrderDto implements Vo {
+public class LoanHomeVisitInvestigateSaveOrderDto implements Vo {
 
     private String sid;
     @ApiModelProperty("销售订单sid")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomeVisitInvestigateInitOtherPeoDto.java → anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomeVisitInvestigateSaveOtherPeoDto.java

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-public class LoanHomeVisitInvestigateInitOtherPeoDto implements Vo {
+public class LoanHomeVisitInvestigateSaveOtherPeoDto implements Vo {
 
     private String sid;
     @ApiModelProperty("姓名")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomeVisitInvestigateInitPropDto.java → anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomeVisitInvestigateSavePropDto.java

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-public class LoanHomeVisitInvestigateInitPropDto implements Vo {
+public class LoanHomeVisitInvestigateSavePropDto implements Vo {
 
     private String sid;
     @ApiModelProperty("房产状态")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomeVisitInvestigateInitTranDto.java → anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomeVisitInvestigateSaveTranDto.java

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-public class LoanHomeVisitInvestigateInitTranDto implements Vo {
+public class LoanHomeVisitInvestigateSaveTranDto implements Vo {
 
     private String sid;
     @ApiModelProperty("运输路线")

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

@@ -1,5 +1,6 @@
 package com.yxt.anrui.riskcenter.api.loansolutions;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,7 +15,8 @@ import javax.validation.constraints.NotBlank;
 @Data
 public class SolutionDetailsDto implements Dto {
     private static final long serialVersionUID = 3094344495849727373L;
-
+    @JsonProperty("isShowMore")
+    private boolean isShowMore;
     /**************************金融方案主表****************************/
     @ApiModelProperty("关联sid")
     private String busSid;

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

@@ -1,5 +1,6 @@
 package com.yxt.anrui.riskcenter.api.loansolutions.app;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,7 +15,9 @@ import java.math.BigDecimal;
 @Data
 public class SolutionsDetailsVo implements Vo {
     private static final long serialVersionUID = 2678358838559733044L;
-
+    @ApiModelProperty("是否展示更多")
+    @JsonProperty("isShowMore")
+    private boolean isShowMore;
     @ApiModelProperty("是否是三方金融")
     private boolean finPlanState;
 
@@ -80,10 +83,13 @@ public class SolutionsDetailsVo implements Vo {
     @ApiModelProperty("是否勾选其它融")
     private boolean otherPolicyState;
 
+    private String discountCar;
+
     //其他融
 
     @ApiModelProperty("其它融名称")
     private String otherPolicyName;
+    private String otherPolicySid;
     @ApiModelProperty("其它融金额")
     private String otherPolicyAmount;
     @ApiModelProperty("其它融期数")
@@ -137,6 +143,8 @@ public class SolutionsDetailsVo implements Vo {
     private String dealWay;
     @ApiModelProperty("办理方式选择key")
     private String dealWayKey;
+    @ApiModelProperty("代收合计")
+    private String proxyTotal;
     @ApiModelProperty("代收首年保险费")
     private String proxyPremium;
     @ApiModelProperty("代收购置费")
@@ -168,5 +176,4 @@ public class SolutionsDetailsVo implements Vo {
     private String downPayAmountsRatio;
 
 
-
 }

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

@@ -1,5 +1,6 @@
 package com.yxt.anrui.riskcenter.api.loansolutions.app;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,9 +15,10 @@ import javax.validation.constraints.NotBlank;
 @Data
 public class SolutionssDto implements Dto {
     private static final long serialVersionUID = -4329637976311165379L;
-
+    @JsonProperty("isShowMore")
+    private boolean isShowMore;
     @ApiModelProperty("关联sid")
-    private String busSid;
+    private String saleOrderSid;
     @ApiModelProperty("是否打包：1是0否")
     private String isPack;
     @ApiModelProperty("产品政策名称")

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

@@ -76,7 +76,7 @@ public class SolutionssVo implements Vo {
     @ApiModelProperty("是否勾选其它融")
     private boolean otherPolicyState;
     /**************************其他融*********************************/
-
+    private boolean otherPolicyIsMain;
     @ApiModelProperty("其它融名称")
     private String otherPolicyName;
     @ApiModelProperty("其他融sid")
@@ -165,5 +165,4 @@ public class SolutionssVo implements Vo {
 
     @ApiModelProperty("拼接的List")
     private List<SolutionListVo> financeForms = new ArrayList<>();
-
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/calculate/CalculateQuery.java

@@ -45,8 +45,8 @@ public class CalculateQuery {
     private String loanAmount;
     @ApiModelProperty("贷款期数")
     private String loanPeriod;
-    @ApiModelProperty("贷款保证金比例")
-    private String bondRatio;
+/*    @ApiModelProperty("贷款保证金比例")
+    private String bondRatio;*/
     @ApiModelProperty("贷款保证金金额")
     private String bondAmount;
     @ApiModelProperty("厂家贴息")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/TemplateApplyVo.java

@@ -1,5 +1,7 @@
 package com.yxt.anrui.riskcenter.api.loantemplate;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionListVo;
 import com.yxt.anrui.riskcenter.api.loantemplateinstall.LoanTemplateInstallVo;
 import com.yxt.anrui.riskcenter.api.loantemplatetrailer.LoanTemplateTrailerVo;
 import com.yxt.common.core.vo.Vo;
@@ -18,7 +20,11 @@ import java.util.List;
 @Data
 public class TemplateApplyVo implements Vo {
     private static final long serialVersionUID = 6376454518435397557L;
+    @ApiModelProperty(value = "实例id")
+    private String procInstId;
 
+    @ApiModelProperty(value = "taskId")
+    private String taskId;
     private String sid;
     @ApiModelProperty("用户sid")
     private String userSid;
@@ -54,9 +60,6 @@ public class TemplateApplyVo implements Vo {
     private LoanTemplateInstallVo loanTemplateInstall;
     @ApiModelProperty("挂车信息")
     private LoanTemplateTrailerVo loanTemplateTrailer;
-    @ApiModelProperty("消贷金融方案")
-    private LoanTemplateSolutionsVo loanTemplateSolutions;
 
-
-    private List<TemplateSolutionVo> financeForms = new ArrayList<>();
+    private List<SolutionListVo> financeForms = new ArrayList<>();
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java

@@ -29,8 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomeVisitInvestigateInitCustomerVo;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomeVisitInvestigateInitReportStateVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomeVisitInvestigateInitCustomerVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.xml

@@ -40,7 +40,7 @@
     </select>
 
     <select id="getHomeVisitCustomerInfo"
-            resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomeVisitInvestigateInitCustomerVo">
+            resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomeVisitInvestigateInitCustomerVo">
         SELECT sid,
                isConfirmRealBuyer  AS actualBuyer,
                borrowerSid         AS lenderSid,

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java

@@ -26,14 +26,16 @@
 package com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigate;
 
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.*;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomeVisitInvestigateInitCustomerVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomeVisitInvestigateSaveCustomerDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.*;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperDto;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateSaveOperDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperVo;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderDto;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateSaveOrderDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderVo;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateInitPropDto;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateSavePropDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateInitPropVo;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranDto;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateSaveTranDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -43,8 +45,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * Project: anrui-riskcenter(家访考察) <br/>
  * File: LoanHomevisitInvestigateFeignFallback.java <br/>
@@ -138,7 +138,7 @@ public class LoanHomevisitInvestigateRest implements LoanHomevisitInvestigateFei
 	}
 
 	@Override
-	public ResultBean saveHomeVisitOrderInfo(LoanHomeVisitInvestigateInitOrderDto dto) {
+	public ResultBean saveHomeVisitOrderInfo(LoanHomeVisitInvestigateSaveOrderDto dto) {
 		return loanHomevisitInvestigateService.saveHomeVisitOrderInfo(dto);
 	}
 
@@ -148,7 +148,7 @@ public class LoanHomevisitInvestigateRest implements LoanHomevisitInvestigateFei
 	}
 
 	@Override
-	public ResultBean saveHomeVisitOperationInfo(LoanHomeVisitInvestigateInitOperDto dto) {
+	public ResultBean saveHomeVisitOperationInfo(LoanHomeVisitInvestigateSaveOperDto dto) {
 		return loanHomevisitInvestigateService.saveHomeVisitOperationInfo(dto);
 	}
 
@@ -158,7 +158,7 @@ public class LoanHomevisitInvestigateRest implements LoanHomevisitInvestigateFei
 	}
 
 	@Override
-	public ResultBean saveHomeVisitTransportInfo(LoanHomeVisitInvestigateInitTranDto dto) {
+	public ResultBean saveHomeVisitTransportInfo(LoanHomeVisitInvestigateSaveTranDto dto) {
 		return loanHomevisitInvestigateService.saveHomeVisitTransportInfo(dto);
 	}
 
@@ -168,7 +168,7 @@ public class LoanHomevisitInvestigateRest implements LoanHomevisitInvestigateFei
 	}
 
 	@Override
-	public ResultBean saveHomeVisitAssetsInfo(LoanHomeVisitInvestigateInitPropDto dto) {
+	public ResultBean saveHomeVisitAssetsInfo(LoanHomeVisitInvestigateSavePropDto dto) {
 		return loanHomevisitInvestigateService.saveHomeVisitAssetsInfo(dto);
 	}
 
@@ -178,7 +178,7 @@ public class LoanHomevisitInvestigateRest implements LoanHomevisitInvestigateFei
 	}
 
 	@Override
-	public ResultBean saveHomeVisitWitnessInfo(LoanHomeVisitInvestigateInitJFJZDto dto) {
+	public ResultBean saveHomeVisitWitnessInfo(LoanHomeVisitInvestigateSaveJFJZDto dto) {
 		return loanHomevisitInvestigateService.saveHomeVisitWitnessInfo(dto);
 	}
 
@@ -188,7 +188,7 @@ public class LoanHomevisitInvestigateRest implements LoanHomevisitInvestigateFei
 	}
 
 	@Override
-	public ResultBean saveHomeVisitProveFileInfo(LoanHomeVisitInvestigateInitZMWJDto dto) {
+	public ResultBean saveHomeVisitProveFileInfo(LoanHomeVisitInvestigateSaveZMWJDto dto) {
 		return loanHomevisitInvestigateService.saveHomeVisitProveFileInfo(dto);
 	}
 
@@ -198,7 +198,14 @@ public class LoanHomevisitInvestigateRest implements LoanHomevisitInvestigateFei
 	}
 
 	@Override
-	public ResultBean saveAssetCertificateInfo(LoanHomeVisitInvestigateInitZCLDto dto) {
+	public ResultBean saveAssetCertificateInfo(LoanHomeVisitInvestigateSaveZCLDto dto) {
 		return loanHomevisitInvestigateService.saveAssetCertificateInfo(dto);
 	}
+
+	@Override
+	public ResultBean<PagerVo<LoanHomevisitInvestigateVo>> jfjdListPage(PagerQuery<LoanHomevisitInvestigateQuery> pq) {
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<LoanHomevisitInvestigateVo> pv = loanHomevisitInvestigateService.jfjdListPage(pq);
+		return rb.success().setData(pv);
+	}
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java

@@ -31,28 +31,28 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.*;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomeVisitInvestigateInitCustomerVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomeVisitInvestigateSaveCustomerDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.*;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperDto;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateSaveOperDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperVo;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomevisitInvestigateOperationsDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomevisitInvestigateOperationsDto;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderDto;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateSaveOrderDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderVo;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomevisitInvestigateOrderDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomevisitInvestigateOrderDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomeVisitInvestigateInitOtherPeoVo;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoDetailsVo;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateInitPropDto;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateSavePropDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateInitPropVo;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomevisitInvestigatePropertyDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomevisitInvestigatePropertyDto;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranDto;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateSaveTranDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranVo;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomevisitInvestigateTransportDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomevisitInvestigateTransportDto;
-import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepVo;
 import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerService;
 import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileService;
 import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigateoperations.LoanHomevisitInvestigateOperationsService;
@@ -60,6 +60,7 @@ import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigateorder.LoanHomevisitI
 import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoService;
 import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigateproperty.LoanHomevisitInvestigatePropertyService;
 import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatetransport.LoanHomevisitInvestigateTransportService;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -105,6 +106,8 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
     private LoanHomevisitInvestigateFileService loanHomevisitInvestigateFileService;
     @Autowired
     private LoanHomevisitInvestigateOtherpeoService loanHomevisitInvestigateOtherpeoService;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
 
     public PagerVo<LoanHomevisitInvestigateVo> listPageVo(PagerQuery<LoanHomevisitInvestigateQuery> pq) {
         LoanHomevisitInvestigateQuery query = pq.getParams();
@@ -416,7 +419,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         return rb.success().setData(loanHomeVisitInvestigateInitOrderVos);
     }
 
-    public ResultBean saveHomeVisitOrderInfo(LoanHomeVisitInvestigateInitOrderDto dto) {
+    public ResultBean saveHomeVisitOrderInfo(LoanHomeVisitInvestigateSaveOrderDto dto) {
         ResultBean rb = ResultBean.fireFail();
         LoanHomevisitInvestigateOrderDto loanHomevisitInvestigateOrderDto = new LoanHomevisitInvestigateOrderDto();
         BeanUtil.copyProperties(dto,loanHomevisitInvestigateOrderDto);
@@ -435,7 +438,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         return rb.success().setData(loanHomeVisitInvestigateInitOperVo);
     }
 
-    public ResultBean saveHomeVisitOperationInfo(LoanHomeVisitInvestigateInitOperDto dto) {
+    public ResultBean saveHomeVisitOperationInfo(LoanHomeVisitInvestigateSaveOperDto dto) {
         ResultBean rb = ResultBean.fireFail();
         LoanHomevisitInvestigateOperationsDto loanHomevisitInvestigateOperationsDto = new LoanHomevisitInvestigateOperationsDto();
         BeanUtil.copyProperties(dto,loanHomevisitInvestigateOperationsDto);
@@ -455,7 +458,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         return rb.success().setData(loanHomeVisitInvestigateInitTranVo);
     }
 
-    public ResultBean saveHomeVisitTransportInfo(LoanHomeVisitInvestigateInitTranDto dto) {
+    public ResultBean saveHomeVisitTransportInfo(LoanHomeVisitInvestigateSaveTranDto dto) {
         ResultBean rb = ResultBean.fireFail();
         LoanHomevisitInvestigateTransportDto loanHomevisitInvestigateTransportDto = new LoanHomevisitInvestigateTransportDto();
         BeanUtil.copyProperties(dto,loanHomevisitInvestigateTransportDto);
@@ -482,9 +485,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         return rb.success().setData(loanHomeVisitInvestigateInitPropVo);
     }
 
-    public ResultBean saveHomeVisitAssetsInfo(LoanHomeVisitInvestigateInitPropDto dto) {
+    public ResultBean saveHomeVisitAssetsInfo(LoanHomeVisitInvestigateSavePropDto dto) {
         ResultBean rb = ResultBean.fireFail();
         LoanHomevisitInvestigatePropertyDto loanHomevisitInvestigatePropertyDto = new LoanHomevisitInvestigatePropertyDto();
+        BeanUtil.copyProperties(dto,loanHomevisitInvestigatePropertyDto);
         loanHomevisitInvestigatePropertyDto.setIsRealEstate(dto.getHouseCheck());
         loanHomevisitInvestigatePropertyDto.setPropertyType(dto.getHouseState());
         loanHomevisitInvestigatePropertyDto.setRealLoanSituation(dto.getHouseLoanKey());
@@ -494,7 +498,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         loanHomevisitInvestigatePropertyDto.setCarLoanSituation(dto.getCarLoanKey());
         loanHomevisitInvestigatePropertyDto.setDownPaySourceKey(dto.getDownPayment());
         loanHomevisitInvestigatePropertyDto.setOtherSourceKey(dto.getOtherIncome());
-        BeanUtil.copyProperties(dto,loanHomevisitInvestigatePropertyDto);
         loanHomevisitInvestigatePropertyService.saveOrUpdateDto(loanHomevisitInvestigatePropertyDto);
         return rb.success();
     }
@@ -551,47 +554,428 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         return rb.success().setData(loanHomeVisitInvestigateInitJFJZVo);
     }
 
-    public ResultBean saveHomeVisitWitnessInfo(LoanHomeVisitInvestigateInitJFJZDto dto) {
-        return null;
+    public ResultBean saveHomeVisitWitnessInfo(LoanHomeVisitInvestigateSaveJFJZDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        //定位信息
+        for (String dwxx : dto.getLocation()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DWXX.getAttachType());
+            if (dwxx.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                dwxx = dwxx.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(dwxx);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //房屋照片
+        for (String fwzp : dto.getHouse()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.FWZP.getAttachType());
+            if (fwzp.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                fwzp = fwzp.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(fwzp);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //门口照片
+        for (String mkzp : dto.getDoorway()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.MKZP.getAttachType());
+            if (mkzp.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                mkzp = mkzp.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(mkzp);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //客厅卧室
+        for (String ktwszp : dto.getIndoor()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.KTWSZP.getAttachType());
+            if (ktwszp.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                ktwszp = ktwszp.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(ktwszp);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //合影照等
+        for (String hyzd : dto.getGroupPhoto()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.HYZD.getAttachType());
+            if (hyzd.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                hyzd = hyzd.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(hyzd);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        return rb.success();
     }
 
     public ResultBean<LoanHomeVisitInvestigateInitZMWJVo> getHomeVisitProveFileInfo(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanHomeVisitInvestigateInitZMWJVo loanHomeVisitInvestigateInitZMWJVo = new LoanHomeVisitInvestigateInitZMWJVo();
         //贷款人身份证
         List<LoanHomevisitInvestigateFileDetailsVo> dkrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRSFZ.getAttachType());
+        List<String> lenderIdCard = new ArrayList<>();
+        if (dkrsfzImages != null && dkrsfzImages.size() > 0){
+            for (LoanHomevisitInvestigateFileDetailsVo dkrsfzImage : dkrsfzImages) {
+                lenderIdCard.add(dkrsfzImage.getFileUrl());
+            }
+        }
+        loanHomeVisitInvestigateInitZMWJVo.setLenderIdCard(lenderIdCard);
         //贷款人户口本
         List<LoanHomevisitInvestigateFileDetailsVo> dkrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRHKB.getAttachType());
+        List<String> lenderAccount = new ArrayList<>();
+        if (dkrhkbImages != null && dkrhkbImages.size() > 0){
+            for (LoanHomevisitInvestigateFileDetailsVo dkrhkbImage : dkrhkbImages) {
+                lenderAccount.add(dkrhkbImage.getFileUrl());
+            }
+        }
+        loanHomeVisitInvestigateInitZMWJVo.setLenderAccount(lenderAccount);
         //贷款人婚姻证明
         List<LoanHomevisitInvestigateFileDetailsVo> dkrhyzmImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRHYZM.getAttachType());
+        List<String> lenderMarriageCertificate = new ArrayList<>();
+        if (dkrhyzmImages != null && dkrhyzmImages.size() > 0){
+            for (LoanHomevisitInvestigateFileDetailsVo dkrhyzmImage : dkrhyzmImages) {
+                lenderMarriageCertificate.add(dkrhyzmImage.getFileUrl());
+            }
+        }
+        loanHomeVisitInvestigateInitZMWJVo.setLenderMarriageCertificate(lenderMarriageCertificate);
         //贷款人驾驶本
         List<LoanHomevisitInvestigateFileDetailsVo> dkrjsbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRJSB.getAttachType());
+        List<String> lenderDriverBook = new ArrayList<>();
+        if (dkrjsbImages != null && dkrjsbImages.size() > 0){
+            for (LoanHomevisitInvestigateFileDetailsVo dkrjsbImage : dkrjsbImages) {
+                lenderDriverBook.add(dkrjsbImage.getFileUrl());
+            }
+        }
+        loanHomeVisitInvestigateInitZMWJVo.setLenderDriverBook(lenderDriverBook);
         //贷款人银行流水
         List<LoanHomevisitInvestigateFileDetailsVo> dkryhlsImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRYHLS.getAttachType());
+        List<String> lenderBankStatement = new ArrayList<>();
+        if (dkryhlsImages != null && dkryhlsImages.size() > 0){
+            for (LoanHomevisitInvestigateFileDetailsVo dkryhlsImage : dkryhlsImages) {
+                lenderBankStatement.add(dkryhlsImage.getFileUrl());
+            }
+        }
+        loanHomeVisitInvestigateInitZMWJVo.setLenderBankStatement(lenderBankStatement);
         //配偶身份证
         List<LoanHomevisitInvestigateFileDetailsVo> posfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.POSFZ.getAttachType());
+        List<String> spouseIdCard = new ArrayList<>();
+        if (posfzImages != null && posfzImages.size() > 0){
+            for (LoanHomevisitInvestigateFileDetailsVo posfzImage : posfzImages) {
+                spouseIdCard.add(posfzImage.getFileUrl());
+            }
+        }
+        loanHomeVisitInvestigateInitZMWJVo.setSpouseIdCard(spouseIdCard);
         //配偶户口本
         List<LoanHomevisitInvestigateFileDetailsVo> pohkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.POHKB.getAttachType());
+        List<String> spouseAccount = new ArrayList<>();
+        if (pohkbImages != null && pohkbImages.size() > 0){
+            for (LoanHomevisitInvestigateFileDetailsVo pohkbImage : pohkbImages) {
+                spouseAccount.add(pohkbImage.getFileUrl());
+            }
+        }
+        loanHomeVisitInvestigateInitZMWJVo.setSpouseAccount(spouseAccount);
         //担保人身份证
         List<LoanHomevisitInvestigateFileDetailsVo> dbrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRSFZ.getAttachType());
+        List<String> pohkbImage = new ArrayList<>();
+        if (dbrsfzImages != null && dbrsfzImages.size() > 0){
+            for (LoanHomevisitInvestigateFileDetailsVo dbrsfzImage : dbrsfzImages) {
+                pohkbImage.add(dbrsfzImage.getFileUrl());
+            }
+        }
+        loanHomeVisitInvestigateInitZMWJVo.setGuarantorIdCard(pohkbImage);
         //担保人户口本
         List<LoanHomevisitInvestigateFileDetailsVo> dbrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRHKB.getAttachType());
-        return null;
+        List<String> guarantorAccount = new ArrayList<>();
+        if (dbrhkbImages != null && dbrhkbImages.size() > 0){
+            for (LoanHomevisitInvestigateFileDetailsVo dbrhkbImage : dbrhkbImages) {
+                guarantorAccount.add(dbrhkbImage.getFileUrl());
+            }
+        }
+        loanHomeVisitInvestigateInitZMWJVo.setGuarantorAccount(guarantorAccount);
+        loanHomeVisitInvestigateInitZMWJVo.setMainSid(sid);
+        return rb.success().setData(loanHomeVisitInvestigateInitZMWJVo);
     }
 
-    public ResultBean saveHomeVisitProveFileInfo(LoanHomeVisitInvestigateInitZMWJDto dto) {
-        return null;
+    public ResultBean saveHomeVisitProveFileInfo(LoanHomeVisitInvestigateSaveZMWJDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        //贷款人身份证
+        for (String dkrsfz : dto.getLenderIdCard()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRSFZ.getAttachType());
+            if (dkrsfz.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                dkrsfz = dkrsfz.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(dkrsfz);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //贷款人户口本
+        for (String dkrhkb : dto.getLenderAccount()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRHKB.getAttachType());
+            if (dkrhkb.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                dkrhkb = dkrhkb.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(dkrhkb);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //贷款人婚姻证明
+        for (String dkrhyzm : dto.getLenderMarriageCertificate()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRHYZM.getAttachType());
+            if (dkrhyzm.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                dkrhyzm = dkrhyzm.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(dkrhyzm);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //贷款人驾驶本
+        for (String dkrjsb : dto.getLenderDriverBook()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRJSB.getAttachType());
+            if (dkrjsb.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                dkrjsb = dkrjsb.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(dkrjsb);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //贷款人银行流水
+        for (String dkryhls : dto.getLenderBankStatement()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRYHLS.getAttachType());
+            if (dkryhls.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                dkryhls = dkryhls.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(dkryhls);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //配偶身份证
+        for (String posfz : dto.getSpouseIdCard()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.POSFZ.getAttachType());
+            if (posfz.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                posfz = posfz.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(posfz);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //配偶户口本
+        for (String pohkb : dto.getSpouseAccount()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.POHKB.getAttachType());
+            if (pohkb.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                pohkb = pohkb.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(pohkb);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //担保人身份证
+        for (String dbrsfz : dto.getGuarantorIdCard()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DBRSFZ.getAttachType());
+            if (dbrsfz.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                dbrsfz = dbrsfz.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(dbrsfz);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //担保人户口本
+        for (String dbrhkb : dto.getGuarantorAccount()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DBRHKB.getAttachType());
+            if (dbrhkb.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                dbrhkb = dbrhkb.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(dbrhkb);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        return rb.success();
     }
 
     public ResultBean<LoanHomeVisitInvestigateInitZCLVo> getAssetCertificateInfo(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanHomeVisitInvestigateInitZCLVo loanHomeVisitInvestigateInitZCLVo = new LoanHomeVisitInvestigateInitZCLVo();
         //银行卡
         List<LoanHomevisitInvestigateFileDetailsVo> yhkImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType());
+        List<String> yhkImagess = new ArrayList<>();
+        if (yhkImages != null && yhkImages.size() > 0){
+            for (LoanHomevisitInvestigateFileDetailsVo yhkImage : yhkImages) {
+                yhkImagess.add(yhkImage.getFileUrl());
+            }
+        }
+        loanHomeVisitInvestigateInitZCLVo.setYhkImages(yhkImagess);
         //房产
         List<LoanHomevisitInvestigateFileDetailsVo> fcImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.FC.getAttachType());
+        List<String> houseProperty = new ArrayList<>();
+        if (fcImages != null && fcImages.size() > 0){
+            for (LoanHomevisitInvestigateFileDetailsVo fcImage : fcImages) {
+                houseProperty.add(fcImage.getFileUrl());
+            }
+        }
+        loanHomeVisitInvestigateInitZCLVo.setHouseProperty(houseProperty);
         //车辆
         List<LoanHomevisitInvestigateFileDetailsVo> clImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.CL.getAttachType());
-        return null;
+        List<String> carProperty = new ArrayList<>();
+        if (clImages != null && clImages.size() > 0){
+            for (LoanHomevisitInvestigateFileDetailsVo clImage : clImages) {
+                carProperty.add(clImage.getFileUrl());
+            }
+        }
+        loanHomeVisitInvestigateInitZCLVo.setCarProperty(carProperty);
+        loanHomeVisitInvestigateInitZCLVo.setMainSid(sid);
+        return rb.success().setData(loanHomeVisitInvestigateInitZCLVo);
     }
 
-    public ResultBean saveAssetCertificateInfo(LoanHomeVisitInvestigateInitZCLDto dto) {
-        return null;
+    public ResultBean saveAssetCertificateInfo(LoanHomeVisitInvestigateSaveZCLDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        //银行卡
+        for (String yhk : dto.getYhkImages()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.YHK.getAttachType());
+            if (yhk.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                yhk = yhk.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(yhk);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //房产
+        for (String fc : dto.getHouseProperty()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.FC.getAttachType());
+            if (fc.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                fc = fc.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(fc);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //车辆
+        for (String cl : dto.getCarProperty()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.CL.getAttachType());
+            if (cl.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                cl = cl.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(cl);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        return rb.success();
+    }
+
+    public PagerVo<LoanHomevisitInvestigateVo> jfjdListPage(PagerQuery<LoanHomevisitInvestigateQuery> pq) {
+        LoanHomevisitInvestigateQuery query = pq.getParams();
+        QueryWrapper<LoanHomevisitInvestigate> qw = new QueryWrapper<>();
+        qw.eq("li.state", 2);
+        qw.eq("bb.busNo", 302);
+        if (StringUtils.isNotBlank(query.getMenuSid())) {
+            //=======================
+            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+            privilegeQuery.setOrgPath(query.getOrgSidPath());
+            privilegeQuery.setMenuUrl(query.getMenuSid());
+            privilegeQuery.setUserSid(query.getUserSid());
+            ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+            if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                String orgSidPath = query.getOrgSidPath();
+                orgSidPath = orgSidPath + "/";
+                int i1 = orgSidPath.indexOf("/");
+                int i2 = orgSidPath.indexOf("/", i1 + 1);
+                int i3 = orgSidPath.indexOf("/", i2 + 1);
+                int i4 = orgSidPath.indexOf("/", i3 + 1);
+                String orgLevelKey = defaultIdReltBean.getData();
+                if ("1".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i1);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if ("2".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i2);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if ("3".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i3);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if ("4".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i4);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if ("5".equals(orgLevelKey)) {
+                    qw.eq("bo.createBySid", query.getUserSid());
+                } else {
+                    PagerVo<LoanHomevisitInvestigateVo> p = new PagerVo<>();
+                    return p;
+                }
+            } else {
+                PagerVo<LoanHomevisitInvestigateVo> p = new PagerVo<>();
+                return p;
+            }
+        }
+        if (StringUtils.isNotBlank(query.getUseOrgName())) {
+            qw.like("bo.useOrgName", query.getUseOrgName());
+        }
+        if (StringUtils.isNotBlank(query.getSaleDeptName())) {
+            qw.like("bo.orgName", query.getSaleDeptName());
+        }
+        if (StringUtils.isNotBlank(query.getStaffName())) {
+            qw.like("bo.staffName", query.getStaffName());
+        }
+        if (StringUtils.isNotBlank(query.getContractNo())) {
+            qw.like("bo.contractNo", query.getContractNo());
+        }
+        if (StringUtils.isNotBlank(query.getLoanPeoName())) {
+            qw.like("bb.borrowerName", query.getLoanPeoName());
+        }
+        if (StringUtils.isNotBlank(query.getBankName())) {
+            qw.like("bb.bankName", query.getBankName());
+        }
+        if (StringUtils.isNotBlank(query.getHomeVisStaffName())) {
+            qw.like("li.homeVisStaffName", query.getHomeVisStaffName());
+        }
+        if (StringUtils.isNotBlank(query.getInvestigateValue())) {
+            qw.like("li.investigateValue", query.getInvestigateValue());
+        }
+        String orderStartDate = query.getOrderStartDate();
+        String orderEndDate = query.getOrderEndDate();
+        qw.apply(StringUtils.isNotBlank(orderStartDate), "date_format (bo.createDate,'%Y-%m-%d') >= date_format('" + orderStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(orderEndDate), "date_format (bo.createDate,'%Y-%m-%d') <= date_format('" + orderEndDate + "','%Y-%m-%d')"
+                );
+        String resHomeVisStartDate = query.getResHomeVisStartDate();
+        String resHomeVisEndDate = query.getResHomeVisEndDate();
+        qw.apply(StringUtils.isNotBlank(resHomeVisStartDate), "date_format (li.resHomeVisDate,'%Y-%m-%d') >= date_format('" + resHomeVisStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(resHomeVisEndDate), "date_format (li.resHomeVisDate,'%Y-%m-%d') <= date_format('" + resHomeVisEndDate + "','%Y-%m-%d')"
+                );
+        IPage<LoanHomevisitInvestigate> page = PagerUtil.queryToPage(pq);
+        IPage<LoanHomevisitInvestigateVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<LoanHomevisitInvestigateVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
     }
 }

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

@@ -327,7 +327,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 //首付款比例
                 String downPayRatio = "";
                 BigDecimal downPayRatio1 = downPayAmount.divide(loanTotal, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")).setScale(2, BigDecimal.ROUND_HALF_UP);
-                downPayRatio = downPayRatio1.toString() + "%";
+                downPayRatio = downPayRatio1.toString() /*+ "%"*/;
                 //产品贷款金额 = 融资项目总额-首付金额
                 loanAmount = loanTotal.subtract(downPayAmount);
                 loanSolutions.setDownPayAmount(downPayAmount);
@@ -351,7 +351,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 //贷款保证金比例
                 String bondRatio = "";
                 BigDecimal bondRatio1 = bondAmount.divide(loanAmount, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")).setScale(2, BigDecimal.ROUND_HALF_UP);
-                bondRatio = bondRatio1.toString() + "%";
+                bondRatio = bondRatio1.toString() /*+ "%"*/;
                 loanSolutions.setBondAmount(bondAmount);
                 loanSolutions.setBondRatio(bondRatio);
             } else {
@@ -457,7 +457,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 //实际首付比例
                 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() + "%";
+                downPayAmountsRatio = downPayAmountsRatio1.toString() /*+ "%"*/;
                 loanSolutionsOtherpolicy.setDownPayAmountsRatio(downPayAmountsRatio);
 
 
@@ -483,7 +483,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 //实际首付比例
                 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() + "%";
+                downPayAmountsRatio = downPayAmountsRatio1.toString() /*+ "%"*/;
                 loanSolutionsOtherpolicy.setDownPayAmountsRatio(downPayAmountsRatio);
                 //期数 = 其它融期数拼接剩余期数（6/18）
                 int i = Integer.valueOf(loanPeriod) - ii;
@@ -686,249 +686,292 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
     @Transactional(rollbackFor = Exception.class)
     public ResultBean saveDtoss(SolutionDetailsDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        String mainVehicleAmount = dto.getMainVehicleAmount();
-        if (StringUtils.isBlank(mainVehicleAmount)) {
-            return rb.setMsg("主车发票价不能为空");
-        }
-        //是否勾选融资票据
-        if (dto.isAccessoriesAmountCb()) {
-            //融资票据
-            String accessoriesAmount = dto.getAccessoriesAmount();
-            if (StringUtils.isBlank(accessoriesAmount)) {
-                return rb.setMsg("请输入配件");
+        //查詢是否有金融方案
+        LoanSolutions loanSolutions = baseMapper.selectByApplySid(dto.getBusSid());
+        if (dto.isShowMore()) {
+            String mainVehicleAmount = dto.getMainVehicleAmount();
+            if (StringUtils.isBlank(mainVehicleAmount)) {
+                return rb.setMsg("主车发票价不能为空");
             }
-        }
-        //是否勾选挂车
-        if (dto.isTrailerAmountCb()) {
-            //挂车
-            String trailerAmount = dto.getTrailerAmount();
-            if (StringUtils.isBlank(trailerAmount)) {
-                return rb.setMsg("请输入挂车金额");
+            //是否勾选融资票据
+            if (dto.isAccessoriesAmountCb()) {
+                //融资票据
+                String accessoriesAmount = dto.getAccessoriesAmount();
+                if (StringUtils.isBlank(accessoriesAmount)) {
+                    return rb.setMsg("请输入配件");
+                }
             }
-        }
-        //是否勾选保险
-        if (dto.isPremiumCb()) {
-            //保险
-            String premium = dto.getPremium();
-            if (StringUtils.isBlank(premium)) {
-                return rb.setMsg("请输入保险金额");
+            //是否勾选挂车
+            if (dto.isTrailerAmountCb()) {
+                //挂车
+                String trailerAmount = dto.getTrailerAmount();
+                if (StringUtils.isBlank(trailerAmount)) {
+                    return rb.setMsg("请输入挂车金额");
+                }
+            }
+            //是否勾选保险
+            if (dto.isPremiumCb()) {
+                //保险
+                String premium = dto.getPremium();
+                if (StringUtils.isBlank(premium)) {
+                    return rb.setMsg("请输入保险金额");
+                } else {
+                    if (StringUtils.isNotBlank(dto.getOffsetPremium())) {
+                        if (new BigDecimal(dto.getOffsetPremium()).compareTo(new BigDecimal(premium)) > 0) {
+                            return rb.setMsg("抵顶首年保险费不能超过保险费用");
+                        }
+                    }
+                }
             } else {
                 if (StringUtils.isNotBlank(dto.getOffsetPremium())) {
-                    if (new BigDecimal(dto.getOffsetPremium()).compareTo(new BigDecimal(premium)) > 0) {
+                    if (new BigDecimal(dto.getOffsetPremium()).compareTo(BigDecimal.ZERO) > 0) {
                         return rb.setMsg("抵顶首年保险费不能超过保险费用");
                     }
                 }
+
             }
-        } else {
-            if (StringUtils.isNotBlank(dto.getOffsetPremium())) {
-                if (new BigDecimal(dto.getOffsetPremium()).compareTo(BigDecimal.ZERO) > 0) {
-                    return rb.setMsg("抵顶首年保险费不能超过保险费用");
+            //是否勾选购置税
+            if (dto.isPurchaseTaxCb()) {
+                //购置税
+                String purchaseTax = dto.getPurchaseTax();
+                if (StringUtils.isBlank(purchaseTax)) {
+                    return rb.setMsg("请输入购置税");
+                } else {
+                    if (StringUtils.isNotBlank(dto.getOffsetPurchasetax())) {
+                        if (new BigDecimal(dto.getOffsetPurchasetax()).compareTo(new BigDecimal(purchaseTax)) > 0) {
+                            return rb.setMsg("抵顶购置税不能超过购置税");
+                        }
+                    }
                 }
-            }
 
-        }
-        //是否勾选购置税
-        if (dto.isPurchaseTaxCb()) {
-            //购置税
-            String purchaseTax = dto.getPurchaseTax();
-            if (StringUtils.isBlank(purchaseTax)) {
-                return rb.setMsg("请输入购置税");
             } else {
                 if (StringUtils.isNotBlank(dto.getOffsetPurchasetax())) {
-                    if (new BigDecimal(dto.getOffsetPurchasetax()).compareTo(new BigDecimal(purchaseTax)) > 0) {
+                    if (new BigDecimal(dto.getOffsetPurchasetax()).compareTo(BigDecimal.ZERO) > 0) {
                         return rb.setMsg("抵顶购置税不能超过购置税");
                     }
                 }
             }
-
-        } else {
-            if (StringUtils.isNotBlank(dto.getOffsetPurchasetax())) {
-                if (new BigDecimal(dto.getOffsetPurchasetax()).compareTo(BigDecimal.ZERO) > 0) {
-                    return rb.setMsg("抵顶购置税不能超过购置税");
+            //产品期数
+            String loanPeriod = dto.getLoanPeriod();
+            if (StringUtils.isBlank(loanPeriod)) {
+                return rb.setMsg("主方案期数不能为空");
+            }
+            if (StringUtils.isBlank(dto.getPolicySid())) {
+                return rb.setMsg("产品政策不能为空");
+            }
+            if (loanSolutions != null) {
+                baseMapper.deleteByOrderSid(dto.getBusSid());
+                loanSolutionsOtherpolicyService.deleteByLoanSid(loanSolutions.getSid());
+                loanSolutionsDetailService.deleteByLoanSid(loanSolutions.getSid());
+            }
+            //保存金融方案
+            loanSolutions = new LoanSolutions();
+            loanSolutions.setSaleOrderState(1);
+            if (StringUtils.isNotBlank(dto.getBusSid())) {
+                loanSolutions.setSalesOrderSid(dto.getBusSid());
+            }
+            BeanUtil.copyProperties(dto, loanSolutions, "sid");
+            //根据产品政策查询是否是自营非担保
+            LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(dto.getPolicySid());
+            if (loanFinPolicy != null) {
+                if ("02".equals(loanFinPolicy.getGuaranteeTypeKey())) {//非担保
+                    loanSolutions.setTypeKey("01");
+                    loanSolutions.setType("自营非担保");
                 }
             }
-        }
-        //产品期数
-        String loanPeriod = dto.getLoanPeriod();
-        if (StringUtils.isBlank(loanPeriod)) {
-            return rb.setMsg("主方案期数不能为空");
-        }
-        //查詢是否有金融方案
-        LoanSolutions loanSolutions = baseMapper.selectByApplySid(dto.getBusSid());
-        if (loanSolutions != null) {
-            baseMapper.deleteByOrderSid(dto.getBusSid());
-            loanSolutionsOtherpolicyService.deleteByLoanSid(loanSolutions.getSid());
-            loanSolutionsDetailService.deleteByLoanSid(loanSolutions.getSid());
-        }
-
-        //保存金融方案
-        loanSolutions = new LoanSolutions();
-        loanSolutions.setSaleOrderState(1);
-        if (StringUtils.isNotBlank(dto.getBusSid())) {
-            loanSolutions.setSalesOrderSid(dto.getBusSid());
-        }
-        BeanUtil.copyProperties(dto, loanSolutions, "sid");
-        //主车发票价
-        loanSolutions.setMainVehicleAmount(new BigDecimal(mainVehicleAmount));
-        //是否勾选融资票据
-        loanSolutions.setAccessoriesAmountCb(dto.isAccessoriesAmountCb() ? 1 : 0);
-        loanSolutions.setAccessoriesAmount(dto.isAccessoriesAmountCb() ? new BigDecimal(dto.getAccessoriesAmount()) : BigDecimal.ZERO);
-        //是否勾选挂车
-        loanSolutions.setTrailerAmountCb(dto.isTrailerAmountCb() ? 1 : 0);
-        loanSolutions.setTrailerAmount(dto.isTrailerAmountCb() ? new BigDecimal(dto.getTrailerAmount()) : BigDecimal.ZERO);
-        //是否勾选保险
-        loanSolutions.setPremiumCb(dto.isPremiumCb() ? 1 : 0);
-        if (StringUtils.isNotBlank(dto.getPremium())) {
-            loanSolutions.setPremium(new BigDecimal(dto.getPremium()));
-        }
+            //主车发票价
+            loanSolutions.setMainVehicleAmount(new BigDecimal(mainVehicleAmount));
+            //是否勾选融资票据
+            loanSolutions.setAccessoriesAmountCb(dto.isAccessoriesAmountCb() ? 1 : 0);
+            loanSolutions.setAccessoriesAmount(dto.isAccessoriesAmountCb() ? new BigDecimal(dto.getAccessoriesAmount()) : BigDecimal.ZERO);
+            //是否勾选挂车
+            loanSolutions.setTrailerAmountCb(dto.isTrailerAmountCb() ? 1 : 0);
+            loanSolutions.setTrailerAmount(dto.isTrailerAmountCb() ? new BigDecimal(dto.getTrailerAmount()) : BigDecimal.ZERO);
+            //是否勾选保险
+            loanSolutions.setPremiumCb(dto.isPremiumCb() ? 1 : 0);
+            if (StringUtils.isNotBlank(dto.getPremium())) {
+                loanSolutions.setPremium(new BigDecimal(dto.getPremium()));
+            }
 //        loanSolutions.setPremium(StringUtils.isNotBlank(dto.getPremium()) ? new BigDecimal(dto.getPremium()) : BigDecimal.ZERO);
-        //是否勾选购置税
-        loanSolutions.setPurchaseTaxCb(dto.isPurchaseTaxCb() ? 1 : 0);
+            //是否勾选购置税
+            loanSolutions.setPurchaseTaxCb(dto.isPurchaseTaxCb() ? 1 : 0);
 //        loanSolutions.setPurchaseTax(StringUtils.isNotBlank(dto.getPurchaseTax()) ? new BigDecimal(dto.getPurchaseTax()) : BigDecimal.ZERO);
-        if (StringUtils.isNotBlank(dto.getPurchaseTax())) {
-            loanSolutions.setPurchaseTax(new BigDecimal(dto.getPurchaseTax()));
-        }
-        //项目融资总额
-        String loanTotal = dto.getLoanTotal();
-        loanSolutions.setLoanTotal(StringUtils.isNotBlank(loanTotal) ? new BigDecimal(loanTotal) : BigDecimal.ZERO);
-        //首付比例
-        String downPayRatio = dto.getDownPayRatio();
-        loanSolutions.setDownPayRatio(downPayRatio);
-        //首付金额
-        String downPayAmount = dto.getDownPayAmount();
-        loanSolutions.setDownPayAmount(StringUtils.isNotBlank(downPayAmount) ? new BigDecimal(downPayAmount) : BigDecimal.ZERO);
-        //贷款金额
-        String loanAmount = dto.getLoanAmount();
-        loanSolutions.setLoanAmount(StringUtils.isNotBlank(loanAmount) ? new BigDecimal(loanAmount) : BigDecimal.ZERO);
-        //贷款保证金比例
-        String bondRatio = dto.getBondRatio();
-        loanSolutions.setBondRatio(bondRatio);
-        //期数
-        loanSolutions.setLoanPeriod(loanPeriod);
-        //保证金金额
-        String bondAmount = dto.getBondAmount();
-        loanSolutions.setBondAmount(StringUtils.isNotBlank(bondAmount) ? new BigDecimal(bondAmount) : BigDecimal.ZERO);
-        //厂家贴息
-        String factoryDiscount = dto.getFactoryDiscount();
-        loanSolutions.setFactoryDiscount(StringUtils.isNotBlank(factoryDiscount) ? new BigDecimal(factoryDiscount) : BigDecimal.ZERO);
-        String discountCar = dto.getDiscountCar();
-        loanSolutions.setDiscountCar(StringUtils.isNotBlank(discountCar) ? new BigDecimal(discountCar) : BigDecimal.ZERO);
-        //年利率
-        String policyYearRatio = dto.getPolicyYearRatio();
-        loanSolutions.setPolicyYearRatio(policyYearRatio);
-        //月还金额
-        String loanPayMoney = dto.getLoanPayMoney();
-        loanSolutions.setLoanPayMoney(StringUtils.isNotBlank(loanPayMoney) ? new BigDecimal(loanPayMoney) : BigDecimal.ZERO);
-        //利息总额
-        String loanInterest = dto.getLoanInterest();
-        loanSolutions.setLoanInterest(StringUtils.isNotBlank(loanInterest) ? new BigDecimal(loanInterest) : BigDecimal.ZERO);
-        LoanSolutionsOtherpolicy loanSolutionsOtherpolicy = new LoanSolutionsOtherpolicy();
-        if (dto.isOtherPolicyState()) {
-            BeanUtil.copyProperties(dto, loanSolutionsOtherpolicy, "sid");
+            if (StringUtils.isNotBlank(dto.getPurchaseTax())) {
+                loanSolutions.setPurchaseTax(new BigDecimal(dto.getPurchaseTax()));
+            }
+            //项目融资总额
+            String loanTotal = dto.getLoanTotal();
+            loanSolutions.setLoanTotal(StringUtils.isNotBlank(loanTotal) ? new BigDecimal(loanTotal) : BigDecimal.ZERO);
+            //首付比例
+            String downPayRatio = dto.getDownPayRatio();
+            loanSolutions.setDownPayRatio(downPayRatio);
+            //首付金额
+            String downPayAmount = dto.getDownPayAmount();
+            loanSolutions.setDownPayAmount(StringUtils.isNotBlank(downPayAmount) ? new BigDecimal(downPayAmount) : BigDecimal.ZERO);
             //贷款金额
-            String otherPolicyAmount = dto.getOtherPolicyAmount();
-            loanSolutionsOtherpolicy.setOtherPolicyAmount(StringUtils.isNotBlank(otherPolicyAmount) ? new BigDecimal(otherPolicyAmount) : BigDecimal.ZERO);
-            //其它融月还
-            String otherPolicyMonthlyRepay = dto.getOtherPolicyMonthlyRepay();
-            loanSolutionsOtherpolicy.setOtherPolicyMonthlyRepay(StringUtils.isNotBlank(otherPolicyMonthlyRepay) ? new BigDecimal(otherPolicyMonthlyRepay) : BigDecimal.ZERO);
-            //其它融利息总额
-            String otherPolicyInterest = dto.getOtherPolicyInterest();
-            loanSolutionsOtherpolicy.setOtherPolicyInterest(StringUtils.isNotBlank(otherPolicyInterest) ? new BigDecimal(otherPolicyInterest) : BigDecimal.ZERO);
-            loanSolutions.setOtherPolicyState(1);
-            String loanDownPay = dto.getLoanDownPay();
-            loanSolutionsOtherpolicy.setLoanDownPay(StringUtils.isNotBlank(loanDownPay) ? new BigDecimal(loanDownPay) : BigDecimal.ZERO);
-
-        } else {
-            BeanUtil.copyProperties(dto, loanSolutionsOtherpolicy, "sid");
-            String loanDownPay = dto.getLoanDownPay();
-            loanSolutionsOtherpolicy.setLoanDownPay(StringUtils.isNotBlank(loanDownPay) ? new BigDecimal(loanDownPay) : BigDecimal.ZERO);
-            loanSolutionsOtherpolicy.setOtherPolicyAmount(BigDecimal.ZERO);
-            loanSolutionsOtherpolicy.setOtherPolicyInterest(BigDecimal.ZERO);
-            loanSolutionsOtherpolicy.setOtherPolicyMonthlyRepay(BigDecimal.ZERO);
-            loanSolutionsOtherpolicy.setOtherPolicyPeriod("");
-            loanSolutionsOtherpolicy.setOtherPolicyYearRatio("");
-            loanSolutionsOtherpolicy.setOtherPolicyName("");
-            loanSolutions.setOtherPolicyState(0);
-        }
-        baseMapper.insert(loanSolutions);
-        loanSolutionsOtherpolicy.setSolutionsSid(loanSolutions.getSid());
-        loanSolutionsOtherpolicyService.insert(loanSolutionsOtherpolicy);
-        /***********************应收明细************************************/
-        LoanSolutionsDetail loanSolutionsDetail = new LoanSolutionsDetail();
-        BeanUtil.copyProperties(dto, loanSolutionsDetail, "sid");
-        //融资首付
-        String downPayAmounts = dto.getDownPayAmounts();
-        loanSolutionsDetail.setDownPayAmounts(StringUtils.isNotBlank(downPayAmounts) ? new BigDecimal(downPayAmounts) : BigDecimal.ZERO);
-        //贷款保证金
-        String bondAmounts = dto.getBondAmounts();
-        loanSolutionsDetail.setBondAmounts(StringUtils.isNotBlank(bondAmounts) ? new BigDecimal(bondAmounts) : BigDecimal.ZERO);
-        //保险保证金
-        String depositPremium = dto.getDepositPremium();
-        loanSolutionsDetail.setDepositPremium(StringUtils.isNotBlank(depositPremium) ? new BigDecimal(depositPremium) : BigDecimal.ZERO);
-        //落户保证金
-        String depositSettle = dto.getDepositSettle();
-        loanSolutionsDetail.setDepositSettle(StringUtils.isNotBlank(depositSettle) ? new BigDecimal(depositSettle) : BigDecimal.ZERO);
-        //服务费
-        String serviceAmount = dto.getServiceAmount();
-        loanSolutionsDetail.setServiceAmount(StringUtils.isNotBlank(serviceAmount) ? new BigDecimal(serviceAmount) : BigDecimal.ZERO);
-        //代收意外险
-        String proxyAccidentPremium = dto.getProxyAccidentPremium();
-        loanSolutionsDetail.setProxyAccidentPremium(StringUtils.isNotBlank(proxyAccidentPremium) ? new BigDecimal(proxyAccidentPremium) : BigDecimal.ZERO);
-        //上牌费
-        String registerAmount = dto.getRegisterAmount();
-        loanSolutionsDetail.setRegisterAmount(StringUtils.isNotBlank(registerAmount) ? new BigDecimal(registerAmount) : BigDecimal.ZERO);
-        //运管费
-        String operationAmount = dto.getOperationAmount();
-        loanSolutionsDetail.setOperationAmount(StringUtils.isNotBlank(operationAmount) ? new BigDecimal(operationAmount) : BigDecimal.ZERO);
-        //补车价
-        String vehOtherPrice = dto.getVehOtherPrice();
-        loanSolutionsDetail.setVehOtherPrice(StringUtils.isNotBlank(vehOtherPrice) ? new BigDecimal(vehOtherPrice) : BigDecimal.ZERO);
-        //其它费用
-        String otherAmount = dto.getOtherAmount();
-        loanSolutionsDetail.setOtherAmount(StringUtils.isNotBlank(otherAmount) ? new BigDecimal(otherAmount) : BigDecimal.ZERO);
-        //代收首年保险费
-        String proxyPremium = dto.getProxyPremium();
-        loanSolutionsDetail.setProxyPremium(StringUtils.isNotBlank(proxyPremium) ? new BigDecimal(proxyPremium) : BigDecimal.ZERO);
-        //代收购置费
-        String proxyPurchasetax = dto.getProxyPurchasetax();
-        loanSolutionsDetail.setProxyPurchasetax(StringUtils.isNotBlank(proxyPurchasetax) ? new BigDecimal(proxyPurchasetax) : BigDecimal.ZERO);
-        //抵顶首年保险费
-        String offsetPremium = dto.getOffsetPremium();
-        //抵顶购置税
-        String offsetPurchasetax = dto.getOffsetPurchasetax();
-        if ("0".equals(dto.getIsPack())) {
-            loanSolutionsDetail.setOffsetPremium(BigDecimal.ZERO);
-            loanSolutionsDetail.setOffsetPurchasetax(BigDecimal.ZERO);
-        } else {
-            if (!dto.isPremiumCb()) {
+            String loanAmount = dto.getLoanAmount();
+            loanSolutions.setLoanAmount(StringUtils.isNotBlank(loanAmount) ? new BigDecimal(loanAmount) : BigDecimal.ZERO);
+            //贷款保证金比例
+            String bondRatio = dto.getBondRatio();
+            loanSolutions.setBondRatio(bondRatio);
+            //期数
+            loanSolutions.setLoanPeriod(loanPeriod);
+            //保证金金额
+            String bondAmount = dto.getBondAmount();
+            loanSolutions.setBondAmount(StringUtils.isNotBlank(bondAmount) ? new BigDecimal(bondAmount) : BigDecimal.ZERO);
+            //厂家贴息
+            String factoryDiscount = dto.getFactoryDiscount();
+            loanSolutions.setFactoryDiscount(StringUtils.isNotBlank(factoryDiscount) ? new BigDecimal(factoryDiscount) : BigDecimal.ZERO);
+            String discountCar = dto.getDiscountCar();
+            loanSolutions.setDiscountCar(StringUtils.isNotBlank(discountCar) ? new BigDecimal(discountCar) : BigDecimal.ZERO);
+            //年利率
+            String policyYearRatio = dto.getPolicyYearRatio();
+            loanSolutions.setPolicyYearRatio(policyYearRatio);
+            //月还金额
+            String loanPayMoney = dto.getLoanPayMoney();
+            loanSolutions.setLoanPayMoney(StringUtils.isNotBlank(loanPayMoney) ? new BigDecimal(loanPayMoney) : BigDecimal.ZERO);
+            //利息总额
+            String loanInterest = dto.getLoanInterest();
+            loanSolutions.setLoanInterest(StringUtils.isNotBlank(loanInterest) ? new BigDecimal(loanInterest) : BigDecimal.ZERO);
+            LoanSolutionsOtherpolicy loanSolutionsOtherpolicy = new LoanSolutionsOtherpolicy();
+            if (dto.isOtherPolicyState()) {
+                BeanUtil.copyProperties(dto, loanSolutionsOtherpolicy, "sid");
+                //贷款金额
+                String otherPolicyAmount = dto.getOtherPolicyAmount();
+                loanSolutionsOtherpolicy.setOtherPolicyAmount(StringUtils.isNotBlank(otherPolicyAmount) ? new BigDecimal(otherPolicyAmount) : BigDecimal.ZERO);
+                //其它融月还
+                String otherPolicyMonthlyRepay = dto.getOtherPolicyMonthlyRepay();
+                loanSolutionsOtherpolicy.setOtherPolicyMonthlyRepay(StringUtils.isNotBlank(otherPolicyMonthlyRepay) ? new BigDecimal(otherPolicyMonthlyRepay) : BigDecimal.ZERO);
+                //其它融利息总额
+                String otherPolicyInterest = dto.getOtherPolicyInterest();
+                loanSolutionsOtherpolicy.setOtherPolicyInterest(StringUtils.isNotBlank(otherPolicyInterest) ? new BigDecimal(otherPolicyInterest) : BigDecimal.ZERO);
+                loanSolutions.setOtherPolicyState(1);
+                String loanDownPay = dto.getLoanDownPay();
+                loanSolutionsOtherpolicy.setLoanDownPay(StringUtils.isNotBlank(loanDownPay) ? new BigDecimal(loanDownPay) : BigDecimal.ZERO);
+
+            } else {
+                BeanUtil.copyProperties(dto, loanSolutionsOtherpolicy, "sid");
+                String loanDownPay = dto.getLoanDownPay();
+                loanSolutionsOtherpolicy.setLoanDownPay(StringUtils.isNotBlank(loanDownPay) ? new BigDecimal(loanDownPay) : BigDecimal.ZERO);
+                loanSolutionsOtherpolicy.setOtherPolicyAmount(BigDecimal.ZERO);
+                loanSolutionsOtherpolicy.setOtherPolicyInterest(BigDecimal.ZERO);
+                loanSolutionsOtherpolicy.setOtherPolicyMonthlyRepay(BigDecimal.ZERO);
+                loanSolutionsOtherpolicy.setOtherPolicyPeriod("");
+                loanSolutionsOtherpolicy.setOtherPolicyYearRatio("");
+                loanSolutionsOtherpolicy.setOtherPolicyName("");
+                loanSolutions.setOtherPolicyState(0);
+            }
+            baseMapper.insert(loanSolutions);
+            loanSolutionsOtherpolicy.setSolutionsSid(loanSolutions.getSid());
+            loanSolutionsOtherpolicyService.insert(loanSolutionsOtherpolicy);
+            /***********************应收明细************************************/
+            LoanSolutionsDetail loanSolutionsDetail = new LoanSolutionsDetail();
+            BeanUtil.copyProperties(dto, loanSolutionsDetail, "sid");
+            //融资首付
+            String downPayAmounts = dto.getDownPayAmounts();
+            loanSolutionsDetail.setDownPayAmounts(StringUtils.isNotBlank(downPayAmounts) ? new BigDecimal(downPayAmounts) : BigDecimal.ZERO);
+            //贷款保证金
+            String bondAmounts = dto.getBondAmounts();
+            loanSolutionsDetail.setBondAmounts(StringUtils.isNotBlank(bondAmounts) ? new BigDecimal(bondAmounts) : BigDecimal.ZERO);
+            //保险保证金
+            String depositPremium = dto.getDepositPremium();
+            loanSolutionsDetail.setDepositPremium(StringUtils.isNotBlank(depositPremium) ? new BigDecimal(depositPremium) : BigDecimal.ZERO);
+            //落户保证金
+            String depositSettle = dto.getDepositSettle();
+            loanSolutionsDetail.setDepositSettle(StringUtils.isNotBlank(depositSettle) ? new BigDecimal(depositSettle) : BigDecimal.ZERO);
+            //服务费
+            String serviceAmount = dto.getServiceAmount();
+            loanSolutionsDetail.setServiceAmount(StringUtils.isNotBlank(serviceAmount) ? new BigDecimal(serviceAmount) : BigDecimal.ZERO);
+            //代收意外险
+            String proxyAccidentPremium = dto.getProxyAccidentPremium();
+            loanSolutionsDetail.setProxyAccidentPremium(StringUtils.isNotBlank(proxyAccidentPremium) ? new BigDecimal(proxyAccidentPremium) : BigDecimal.ZERO);
+            //上牌费
+            String registerAmount = dto.getRegisterAmount();
+            loanSolutionsDetail.setRegisterAmount(StringUtils.isNotBlank(registerAmount) ? new BigDecimal(registerAmount) : BigDecimal.ZERO);
+            //运管费
+            String operationAmount = dto.getOperationAmount();
+            loanSolutionsDetail.setOperationAmount(StringUtils.isNotBlank(operationAmount) ? new BigDecimal(operationAmount) : BigDecimal.ZERO);
+            //补车价
+            String vehOtherPrice = dto.getVehOtherPrice();
+            loanSolutionsDetail.setVehOtherPrice(StringUtils.isNotBlank(vehOtherPrice) ? new BigDecimal(vehOtherPrice) : BigDecimal.ZERO);
+            //其它费用
+            String otherAmount = dto.getOtherAmount();
+            loanSolutionsDetail.setOtherAmount(StringUtils.isNotBlank(otherAmount) ? new BigDecimal(otherAmount) : BigDecimal.ZERO);
+            //代收首年保险费
+            String proxyPremium = dto.getProxyPremium();
+            loanSolutionsDetail.setProxyPremium(StringUtils.isNotBlank(proxyPremium) ? new BigDecimal(proxyPremium) : BigDecimal.ZERO);
+            //代收购置费
+            String proxyPurchasetax = dto.getProxyPurchasetax();
+            loanSolutionsDetail.setProxyPurchasetax(StringUtils.isNotBlank(proxyPurchasetax) ? new BigDecimal(proxyPurchasetax) : BigDecimal.ZERO);
+            //抵顶首年保险费
+            String offsetPremium = dto.getOffsetPremium();
+            //抵顶购置税
+            String offsetPurchasetax = dto.getOffsetPurchasetax();
+            if ("0".equals(dto.getIsPack())) {
                 loanSolutionsDetail.setOffsetPremium(BigDecimal.ZERO);
+                loanSolutionsDetail.setOffsetPurchasetax(BigDecimal.ZERO);
             } else {
-                loanSolutionsDetail.setOffsetPremium(StringUtils.isNotBlank(offsetPremium) ? new BigDecimal(offsetPremium) : BigDecimal.ZERO);
+                if (!dto.isPremiumCb()) {
+                    loanSolutionsDetail.setOffsetPremium(BigDecimal.ZERO);
+                } else {
+                    loanSolutionsDetail.setOffsetPremium(StringUtils.isNotBlank(offsetPremium) ? new BigDecimal(offsetPremium) : BigDecimal.ZERO);
+                }
+                if (!dto.isPurchaseTaxCb()) {
+                    loanSolutionsDetail.setOffsetPurchasetax(BigDecimal.ZERO);
+                } else {
+                    loanSolutionsDetail.setOffsetPurchasetax(StringUtils.isNotBlank(offsetPurchasetax) ? new BigDecimal(offsetPurchasetax) : BigDecimal.ZERO);
+                }
             }
-            if (!dto.isPurchaseTaxCb()) {
-                loanSolutionsDetail.setOffsetPurchasetax(BigDecimal.ZERO);
+            String proxyTotal = dto.getProxyTotal();
+            loanSolutionsDetail.setProxyTotal(StringUtils.isNotBlank(proxyTotal) ? new BigDecimal(proxyTotal) : BigDecimal.ZERO);
+            String offsetTotal = dto.getOffsetTotal();
+            loanSolutionsDetail.setOffsetTotal(StringUtils.isNotBlank(offsetTotal) ? new BigDecimal(offsetTotal) : BigDecimal.ZERO);
+            //应收合计
+            String receivableTotal = dto.getReceivableTotal();
+            loanSolutionsDetail.setReceivableTotal(StringUtils.isNotBlank(receivableTotal) ? new BigDecimal(receivableTotal) : BigDecimal.ZERO);
+            //实收合计
+            String realTotal = dto.getRealTotal();
+            loanSolutionsDetail.setRealTotal(StringUtils.isNotBlank(realTotal) ? new BigDecimal(realTotal) : BigDecimal.ZERO);
+            //车辆总价
+            String vehTotalPrice = dto.getVehTotalPrice();
+            loanSolutionsDetail.setVehTotalPrice(StringUtils.isNotBlank(vehTotalPrice) ? new BigDecimal(vehTotalPrice) : BigDecimal.ZERO);
+            //名义留购价
+            String nominalPrice = dto.getNominalPrice();
+            loanSolutionsDetail.setNominalPrice(StringUtils.isNotBlank(nominalPrice) ? new BigDecimal(nominalPrice) : BigDecimal.ZERO);
+            loanSolutionsDetail.setSolutionsSid(loanSolutions.getSid());
+            loanSolutionsDetailService.insert(loanSolutionsDetail);
+        } else {
+            if (loanSolutions != null) {
+                baseMapper.deleteByOrderSid(dto.getBusSid());
+                loanSolutionsOtherpolicyService.deleteByLoanSid(loanSolutions.getSid());
+                loanSolutionsDetailService.deleteByLoanSid(loanSolutions.getSid());
+            }
+            loanSolutions = new LoanSolutions();
+            //产品政策名称
+            String policyName = dto.getPolicyName();
+            if (StringUtils.isNotBlank(policyName)) {
+                loanSolutions.setPolicyName(policyName);
+            }
+            loanSolutions.setType("外部金融");
+            loanSolutions.setTypeKey("02");
+            if (StringUtils.isBlank(dto.getFactoryDiscount())) {
+                loanSolutions.setFactoryDiscount(new BigDecimal(BigInteger.ZERO));
             } else {
-                loanSolutionsDetail.setOffsetPurchasetax(StringUtils.isNotBlank(offsetPurchasetax) ? new BigDecimal(offsetPurchasetax) : BigDecimal.ZERO);
-            }
-        }
-        String proxyTotal = dto.getProxyTotal();
-        loanSolutionsDetail.setProxyTotal(StringUtils.isNotBlank(proxyTotal) ? new BigDecimal(proxyTotal) : BigDecimal.ZERO);
-        String offsetTotal = dto.getOffsetTotal();
-        loanSolutionsDetail.setOffsetTotal(StringUtils.isNotBlank(offsetTotal) ? new BigDecimal(offsetTotal) : BigDecimal.ZERO);
-        //应收合计
-        String receivableTotal = dto.getReceivableTotal();
-        loanSolutionsDetail.setReceivableTotal(StringUtils.isNotBlank(receivableTotal) ? new BigDecimal(receivableTotal) : BigDecimal.ZERO);
-        //实收合计
-        String realTotal = dto.getRealTotal();
-        loanSolutionsDetail.setRealTotal(StringUtils.isNotBlank(realTotal) ? new BigDecimal(realTotal) : BigDecimal.ZERO);
-        //车辆总价
-        String vehTotalPrice = dto.getVehTotalPrice();
-        loanSolutionsDetail.setVehTotalPrice(StringUtils.isNotBlank(vehTotalPrice) ? new BigDecimal(vehTotalPrice) : BigDecimal.ZERO);
-        //名义留购价
-        String nominalPrice = dto.getNominalPrice();
-        loanSolutionsDetail.setNominalPrice(StringUtils.isNotBlank(nominalPrice) ? new BigDecimal(nominalPrice) : BigDecimal.ZERO);
-        loanSolutionsDetail.setSolutionsSid(loanSolutions.getSid());
-        loanSolutionsDetailService.insert(loanSolutionsDetail);
+                loanSolutions.setFactoryDiscount(new BigDecimal(dto.getFactoryDiscount()));
+            }
+            loanSolutions.setDiscountCar(StringUtils.isNotBlank(dto.getDiscountCar()) ? new BigDecimal(dto.getDiscountCar()) : BigDecimal.ZERO);
+            loanSolutions.setFactoryDiscountUse(dto.getFactoryDiscountUse());
+            LoanSolutionsDetail loanSolutionsDetail = new LoanSolutionsDetail();
+            if (StringUtils.isNotBlank(dto.getServiceAmount())) {
+                loanSolutionsDetail.setServiceAmount(new BigDecimal(dto.getServiceAmount()));
+            } else {
+                loanSolutionsDetail.setServiceAmount(BigDecimal.ZERO);
+            }
+            loanSolutionsDetail.setSolutionsSid(loanSolutions.getSid());
+            loanSolutions.setSalesOrderSid(dto.getBusSid());
+            loanSolutionsDetailService.insert(loanSolutionsDetail);
+            baseMapper.insert(loanSolutions);
+        }
         return rb.success();
     }
 
@@ -940,6 +983,9 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             return rb;
         }
         BeanUtil.copyProperties(loanSolutions, solutionsDetailsVo);
+        if (loanSolutions.getTrailerAmount() != null) {
+            solutionsDetailsVo.setGcPrice(loanSolutions.getTrailerAmount().toString());
+        }
         LoanSolutionsOtherpolicy loanSolutionsOtherpolicy = loanSolutionsOtherpolicyService.selectByLoanSid(loanSolutions.getSid());
         if (loanSolutionsOtherpolicy != null) {
             BeanUtil.copyProperties(loanSolutionsOtherpolicy, solutionsDetailsVo);
@@ -948,19 +994,29 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         if (loanSolutionsDetail != null) {
             BeanUtil.copyProperties(loanSolutionsDetail, solutionsDetailsVo);
         }
-        //根据销售订单sid查询销售订单的信息
-        ResultBean<AppOrderDetailsVo> resultBean = busSalesOrderFeign.getSaleOrderDetails(loanSolutions.getSalesOrderSid());
+        //查询销售订单的状态
+        ResultBean<BusSalesOrdersVo> resultBean = busSalesOrderFeign.getSalesOrderOne(businessSid);
         if (resultBean.getData() != null) {
-            AppOrderDetailsVo appOrderDetailsVo = resultBean.getData();
-            //单车主车、挂车、上装成交价
-            AppOrderPriceInfoVo appOrderPriceInfoVo = appOrderDetailsVo.getPriceInfo();
-            if (appOrderPriceInfoVo != null) {
-                solutionsDetailsVo.setFinalPrice(appOrderPriceInfoVo.getTransactionPrice());
-                solutionsDetailsVo.setGcPrice(appOrderPriceInfoVo.getGcPrice());
-                solutionsDetailsVo.setSzPrice(appOrderPriceInfoVo.getSzPrice());
+            BusSalesOrdersVo busSalesOrdersVo = resultBean.getData();
+            solutionsDetailsVo.setSzPrice(busSalesOrdersVo.getSzPrice());
+            solutionsDetailsVo.setFinalPrice(busSalesOrdersVo.getFinalPrice());
+            if (busSalesOrdersVo.getBusSalesOrder() != null) {
+                BusSalesOrder busSalesOrder = busSalesOrdersVo.getBusSalesOrder();
+                //全款且为三方金融
+                if ("1".equals(busSalesOrder.getPayTypeKey()) && "2".equals(busSalesOrder.getFinancePlan())) {
+                    if (loanSolutions != null) {
+                        if ("02".equals(loanSolutions.getTypeKey())) {
+                            solutionsDetailsVo.setShowMore(false);
+                        } else {
+                            solutionsDetailsVo.setShowMore(true);
+                        }
+                    } else {
+                        solutionsDetailsVo.setShowMore(false);
+                    }
+                } else if ("2".equals(busSalesOrder.getPayTypeKey())) {//贷款
+                    solutionsDetailsVo.setShowMore(true);
+                }
             }
-
-
         }
         return rb.success().setData(solutionsDetailsVo);
     }
@@ -973,6 +1029,9 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             return rb;
         }
         BeanUtil.copyProperties(loanSolutions, solutionsDetailsVo);
+        if (loanSolutions.getTrailerAmount() != null) {
+            solutionsDetailsVo.setGcPrice(loanSolutions.getTrailerAmount().toString());
+        }
         LoanSolutionsOtherpolicy loanSolutionsOtherpolicy = loanSolutionsOtherpolicyService.selectByLoanSid(loanSolutions.getSid());
         if (loanSolutionsOtherpolicy != null) {
             BeanUtil.copyProperties(loanSolutionsOtherpolicy, solutionsDetailsVo);
@@ -981,6 +1040,30 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         if (loanSolutionsDetail != null) {
             BeanUtil.copyProperties(loanSolutionsDetail, solutionsDetailsVo);
         }
+        //查询销售订单的状态
+        ResultBean<BusSalesOrdersVo> resultBean = busSalesOrderFeign.getSalesOrderOne(businessSid);
+        if (resultBean.getData() != null) {
+            BusSalesOrdersVo busSalesOrdersVo = resultBean.getData();
+            solutionsDetailsVo.setSzPrice(busSalesOrdersVo.getSzPrice());
+            solutionsDetailsVo.setFinalPrice(busSalesOrdersVo.getFinalPrice());
+            if (busSalesOrdersVo.getBusSalesOrder() != null) {
+                BusSalesOrder busSalesOrder = busSalesOrdersVo.getBusSalesOrder();
+                //全款且为三方金融
+                if ("1".equals(busSalesOrder.getPayTypeKey()) && "2".equals(busSalesOrder.getFinancePlan())) {
+                    if (loanSolutions != null) {
+                        if ("02".equals(loanSolutions.getTypeKey())) {
+                            solutionsDetailsVo.setShowMore(false);
+                        } else {
+                            solutionsDetailsVo.setShowMore(true);
+                        }
+                    } else {
+                        solutionsDetailsVo.setShowMore(false);
+                    }
+                } else if ("2".equals(busSalesOrder.getPayTypeKey())) {//贷款
+                    solutionsDetailsVo.setShowMore(true);
+                }
+            }
+        }
         return rb.success().setData(solutionsDetailsVo);
     }
 
@@ -1186,6 +1269,9 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 return rb.setMsg("请选择其他融");
             }
             String otherPolicyYearRatio = query.getOtherPolicyYearRatio();
+            if(otherPolicyYearRatio.contains("%")){
+                otherPolicyYearRatio = otherPolicyYearRatio.replaceAll("%", "");
+            }
             String otherPolicyAmount = query.getOtherPolicyAmount();
             if (StringUtils.isBlank(otherPolicyAmount)) {
                 return rb.setMsg("其他融贷款金额不能为空");
@@ -1197,7 +1283,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             //总贷款金额的计算
             loanAmountTotal = loanAmountTotal.add(new BigDecimal(otherPolicyAmount));
             //根据年利率和期数、贷款金额计算月还
-            BigDecimal otherPolicyMonthlyRepay = calculatePMT(new BigDecimal(otherPolicyPeriod).divide(new BigDecimal("100"), 4, BigDecimal.ROUND_CEILING).doubleValue(), new BigDecimal(otherPolicyPeriod).doubleValue(), new BigDecimal(otherPolicyAmount).doubleValue());
+            BigDecimal otherPolicyMonthlyRepay = calculatePMT(new BigDecimal(otherPolicyYearRatio).divide(new BigDecimal("100"), 4, BigDecimal.ROUND_CEILING).doubleValue(), new BigDecimal(otherPolicyPeriod).doubleValue(), new BigDecimal(otherPolicyAmount).doubleValue());
             //根据月还计算利息总额=月还金额 乘以 期数 减去 本金
             BigDecimal otherPolicyInterest = otherPolicyMonthlyRepay.multiply(new BigDecimal(otherPolicyPeriod)).subtract(new BigDecimal(otherPolicyAmount));
             //四舍五入取整数
@@ -1407,7 +1493,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
     public ResultBean save2(SolutionssDto dto) {
         SolutionDetailsDto solutionDetailsDto = new SolutionDetailsDto();
         BeanUtil.copyProperties(dto, solutionDetailsDto);
-        solutionDetailsDto.setBusSid(dto.getBusSid());
+        solutionDetailsDto.setBusSid(dto.getSaleOrderSid());
         ResultBean resultBean = saveDtoss(solutionDetailsDto);
         return resultBean;
     }
@@ -1443,8 +1529,16 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 BusSalesOrder busSalesOrder = busSalesOrdersVo.getBusSalesOrder();
                 //全款且为三方金融
                 if ("1".equals(busSalesOrder.getPayTypeKey()) && "2".equals(busSalesOrder.getFinancePlan())) {
-                    solutionssVo.setShowMore(false);
                     solutionssVo.setFactoryDiscountUse("抵车款");
+                    if (isTrue) {
+                        if ("02".equals(loanSolutions.getTypeKey())) {
+                            solutionssVo.setShowMore(false);
+                        } else {
+                            solutionssVo.setShowMore(true);
+                        }
+                    } else {
+                        solutionssVo.setShowMore(false);
+                    }
                 } else if ("2".equals(busSalesOrder.getPayTypeKey())) {//贷款
                     solutionssVo.setShowMore(true);
                     solutionssVo.setFactoryDiscountUse("抵利息");
@@ -1456,6 +1550,12 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                                 solutionssVo.setOtherPolicySid(loanFinOtherPolicy.getSid());
                                 solutionssVo.setOtherPolicyPeriod(String.valueOf(loanFinOtherPolicy.getPeriod()));
                                 solutionssVo.setOtherPolicyYearRatio(loanFinOtherPolicy.getYearRatio().toString());
+                                solutionssVo.setOtherPolicyIsMain(true);
+                            }
+                        } else {
+                            LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(loanSolutions.getPolicySid());
+                            if (loanFinOtherPolicy != null) {
+                                solutionssVo.setOtherPolicyIsMain(true);
                             }
                         }
                     }
@@ -1588,10 +1688,10 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             //贷款保证金比例
             StringBuilder bondRatioValue = new StringBuilder();
             if (StringUtils.isNotBlank(solutionssVo.getBondRatio())) {
-                bondRatioValue = bondRatioValue.append("贷款保证金比例：").append(solutionssVo.getBondRatio());
+                bondRatioValue = bondRatioValue.append("贷款保证金比例（%）：").append(solutionssVo.getBondRatio());
 
             } else {
-                bondRatioValue = bondRatioValue.append("贷款保证金比例：").append("-");
+                bondRatioValue = bondRatioValue.append("贷款保证金比例（%）：").append("-");
             }
             list.add(getValueSpanSize(bondRatioValue.toString(), 1, 0, false));
             //贷款保证金
@@ -1622,10 +1722,10 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             //年利率
             StringBuilder policyYearRatioValue = new StringBuilder();
             if (StringUtils.isNotBlank(solutionssVo.getPolicyYearRatio())) {
-                policyYearRatioValue = policyYearRatioValue.append("年利率：").append(solutionssVo.getPolicyYearRatio());
+                policyYearRatioValue = policyYearRatioValue.append("年利率（%）：").append(solutionssVo.getPolicyYearRatio());
 
             } else {
-                policyYearRatioValue = policyYearRatioValue.append("年利率：").append("-");
+                policyYearRatioValue = policyYearRatioValue.append("年利率（%）：").append("-");
             }
             list.add(getValueSpanSize(policyYearRatioValue.toString(), 1, 0, false));
             //利息总额
@@ -1679,9 +1779,9 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 //年利率
                 StringBuilder otherPolicyYearRatioValue = new StringBuilder();
                 if (StringUtils.isNotBlank(solutionssVo.getOtherPolicyYearRatio())) {
-                    otherPolicyYearRatioValue = otherPolicyYearRatioValue.append("年利率：").append(solutionssVo.getOtherPolicyYearRatio());
+                    otherPolicyYearRatioValue = otherPolicyYearRatioValue.append("年利率（%）：").append(solutionssVo.getOtherPolicyYearRatio());
                 } else {
-                    otherPolicyYearRatioValue = otherPolicyYearRatioValue.append("年利率：").append("-");
+                    otherPolicyYearRatioValue = otherPolicyYearRatioValue.append("年利率（%）：").append("-");
                 }
                 list.add(getValueSpanSize(otherPolicyYearRatioValue.toString(), 1, 0, false));
                 //利息总额
@@ -1714,9 +1814,9 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             list.add(getValueSpanSize(loanDownPayValue.toString(), 1, 0, false));
             StringBuilder downPayAmountsRatioValue = new StringBuilder();
             if (StringUtils.isNotBlank(solutionssVo.getDownPayAmountsRatio())) {
-                downPayAmountsRatioValue = downPayAmountsRatioValue.append("实际首付比例：").append(solutionssVo.getDownPayAmountsRatio());
+                downPayAmountsRatioValue = downPayAmountsRatioValue.append("实际首付比例（%）：").append(solutionssVo.getDownPayAmountsRatio());
             } else {
-                downPayAmountsRatioValue = downPayAmountsRatioValue.append("实际首付比例：").append("-");
+                downPayAmountsRatioValue = downPayAmountsRatioValue.append("实际首付比例（%）：").append("-");
             }
             list.add(getValueSpanSize(downPayAmountsRatioValue.toString(), 1, 0, false));
             //总贷款金额
@@ -1755,7 +1855,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             list.add(getValueSpanSize(interestValue.toString(), 1, 0, false));
             //预计首期还款日
             StringBuilder returnTimeValue = new StringBuilder();
-            if (org.apache.commons.lang3.StringUtils.isNotBlank(solutionssVo.getReturnTime())) {
+            if (StringUtils.isNotBlank(solutionssVo.getReturnTime())) {
                 returnTimeValue = returnTimeValue.append("预计首期还款日：").append(solutionssVo.getReturnTime());
             } else {
                 returnTimeValue = returnTimeValue.append("预计首期还款日：").append("-");
@@ -1859,10 +1959,9 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 dealWayValue = dealWayValue.append("办理方式选择：").append("-");
             }
             list.add(getValueSpanSize(dealWayValue.toString(), 2, 2, false));
-            //抵顶费用合计
             StringBuilder proxyTotalValue = new StringBuilder();
             if (StringUtils.isNotBlank(solutionssVo.getProxyTotal())) {
-                proxyTotalValue = proxyTotalValue.append("代收合计：").append(solutionssVo.getOffsetTotal());
+                proxyTotalValue = proxyTotalValue.append("代收合计：").append(solutionssVo.getProxyTotal());
             } else {
                 proxyTotalValue = proxyTotalValue.append("代收合计：").append("-");
             }
@@ -1971,9 +2070,9 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             //贴息抵车款
             StringBuilder factoryDiscountUseMoneyValue = new StringBuilder();
             if (StringUtils.isNotBlank(solutionssVo.getDiscountCar())) {
-                factoryDiscountUseMoneyValue = factoryDiscountUseValue.append("贴息抵车款：").append(solutionssVo.getDiscountCar());
+                factoryDiscountUseMoneyValue = factoryDiscountUseMoneyValue.append("贴息抵车款：").append(solutionssVo.getDiscountCar());
             } else {
-                factoryDiscountUseMoneyValue = factoryDiscountUseValue.append("贴息抵车款：").append("-");
+                factoryDiscountUseMoneyValue = factoryDiscountUseMoneyValue.append("贴息抵车款：").append("-");
             }
             list.add(getValueSpanSize(factoryDiscountUseMoneyValue.toString(), 1, 0, false));
             list.add(getValueSpanSize("应收明细", 2, 1, true));
@@ -2013,6 +2112,46 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         SolutionssVo solutionssVo = new SolutionssVo();
         BeanUtil.copyProperties(query, solutionssVo);
         if (query.isShowMore()) {
+            if (query.isPremiumCb()) {
+                //保险
+                String premium = query.getPremium();
+                if (StringUtils.isBlank(premium)) {
+                    return rb.setMsg("请输入保险金额");
+                } else {
+                    if (StringUtils.isNotBlank(query.getOffsetPremium())) {
+                        if (new BigDecimal(query.getOffsetPremium()).compareTo(new BigDecimal(premium)) > 0) {
+                            return rb.setMsg("抵顶首年保险费不能超过保险费用");
+                        }
+                    }
+                }
+            } else {
+                if (StringUtils.isNotBlank(query.getOffsetPremium())) {
+                    if (new BigDecimal(query.getOffsetPremium()).compareTo(BigDecimal.ZERO) > 0) {
+                        return rb.setMsg("抵顶首年保险费不能超过保险费用");
+                    }
+                }
+            }
+            //是否勾选购置税
+            if (query.isPurchaseTaxCb()) {
+                //购置税
+                String purchaseTax = query.getPurchaseTax();
+                if (StringUtils.isBlank(purchaseTax)) {
+                    return rb.setMsg("请输入购置税");
+                } else {
+                    if (StringUtils.isNotBlank(query.getOffsetPurchasetax())) {
+                        if (new BigDecimal(query.getOffsetPurchasetax()).compareTo(new BigDecimal(purchaseTax)) > 0) {
+                            return rb.setMsg("抵顶购置税不能超过购置税");
+                        }
+                    }
+                }
+
+            } else {
+                if (StringUtils.isNotBlank(query.getOffsetPurchasetax())) {
+                    if (new BigDecimal(query.getOffsetPurchasetax()).compareTo(BigDecimal.ZERO) > 0) {
+                        return rb.setMsg("抵顶购置税不能超过购置税");
+                    }
+                }
+            }
             CalculateQuery calculateQuery = new CalculateQuery();
             BeanUtil.copyProperties(query, calculateQuery);
             ResultBean<CalculateVo> resultBean = calculate(calculateQuery);
@@ -2027,6 +2166,10 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         return rb.success().setData(solutionssVo);
     }
 
+    public LoanSolutions selectByApplySid(String sid) {
+        return baseMapper.selectByApplySid(sid);
+    }
+
   /*  @Autowired
     private LoanSolutionsTopService loanSolutionsTopService;
     @Autowired

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateService.java

@@ -26,8 +26,12 @@ import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy;
 import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import com.yxt.anrui.riskcenter.api.loansolutions.SolutionDetailsDto;
+import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionListVo;
 import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
 import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDto;
+import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssVo;
+import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail;
+import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicy;
 import com.yxt.anrui.riskcenter.api.loantemplate.*;
 import com.yxt.anrui.riskcenter.api.loantemplate.flowable.SubmitTemplateDto;
 import com.yxt.anrui.riskcenter.api.loantemplate.flowable.TemplateApplyNodeQuery;
@@ -40,6 +44,8 @@ import com.yxt.anrui.riskcenter.api.loantemplatetrailer.LoanTemplateTrailer;
 import com.yxt.anrui.riskcenter.api.loantemplatetrailer.LoanTemplateTrailerDto;
 import com.yxt.anrui.riskcenter.api.loantemplatetrailer.LoanTemplateTrailerVo;
 import com.yxt.anrui.riskcenter.biz.loansolutions.LoanSolutionsService;
+import com.yxt.anrui.riskcenter.biz.loansolutionsdetail.LoanSolutionsDetailService;
+import com.yxt.anrui.riskcenter.biz.loansolutionsotherpolicy.LoanSolutionsOtherpolicyService;
 import com.yxt.anrui.riskcenter.biz.loantemplateinstall.LoanTemplateInstallService;
 import com.yxt.anrui.riskcenter.biz.loantemplatetrailer.LoanTemplateTrailerService;
 import com.yxt.common.base.config.component.FileUploadComponent;
@@ -95,6 +101,10 @@ public class LoanTemplateService extends MybatisBaseService<LoanTemplateMapper,
     private FileUploadComponent fileUploadComponent;
     @Autowired
     private LoanSolutionsService loanSolutionsService;
+    @Autowired
+    private LoanSolutionsOtherpolicyService loanSolutionsOtherpolicyService;
+    @Autowired
+    private LoanSolutionsDetailService loanSolutionsDetailService;
 
 
     public PagerVo<LoanTemplateVo> listPageVo(PagerQuery<LoanTemplateQuery> pq) {
@@ -179,6 +189,7 @@ public class LoanTemplateService extends MybatisBaseService<LoanTemplateMapper,
                 SolutionDetailsDto solutionsDto = new SolutionDetailsDto();
                 BeanUtil.copyProperties(loanTemplateSolutionsDto, solutionsDto, "sid");
                 solutionsDto.setBusSid(sid);
+                solutionsDto.setShowMore(true);
                 ResultBean resultBean = loanSolutionsService.saveDtoss(solutionsDto);
                 if (!resultBean.getSuccess()) {
                     return rb.setMsg(resultBean.getMsg());
@@ -198,6 +209,7 @@ public class LoanTemplateService extends MybatisBaseService<LoanTemplateMapper,
                 SolutionDetailsDto solutionsDto = new SolutionDetailsDto();
                 BeanUtil.copyProperties(loanTemplateSolutionsDto, solutionsDto, "sid");
                 solutionsDto.setBusSid(sid);
+                solutionsDto.setShowMore(true);
                 loanSolutionsService.saveDtoss(solutionsDto);
             }
             baseMapper.updateById(loanTemplate);
@@ -548,7 +560,80 @@ public class LoanTemplateService extends MybatisBaseService<LoanTemplateMapper,
     }
 
     public ResultBean<TemplateApplyVo> getTemplateApply(String sid) {
-        return null;
+        ResultBean<TemplateApplyVo> rb = ResultBean.fireFail();
+        TemplateApplyVo templateApplyVo = new TemplateApplyVo();
+        LoanTemplate loanTemplate = fetchBySid(sid);
+        if (loanTemplate == null) {
+            return rb.setMsg("该申请不存在");
+        }
+        BeanUtil.copyProperties(loanTemplate, templateApplyVo, "sid");
+        templateApplyVo.setUserSid(loanTemplate.getCreateBySid());
+        templateApplyVo.setSid(loanTemplate.getSid());
+        templateApplyVo.setTaskId(loanTemplate.getTaskId());
+        templateApplyVo.setProcInstId(loanTemplate.getProcInstId());
+        LoanTemplateInstall loanTemplateInstall = loanTemplateInstallService.selectByMainSid(sid);
+        if (loanTemplateInstall != null) {
+            templateApplyVo.setInstall(true);
+            //根据上装配置sid查询上装配置信息
+            String installSid = loanTemplateInstall.getVehInstallModelSid();
+            ResultBean<BaseVehinstallmodelDetailsVo> installModelDetailsVoResultBean = baseVehinstallmodelFeign.fetchDetailsBySid(installSid);
+            if (installModelDetailsVoResultBean.getData() != null) {
+                BaseVehinstallmodelDetailsVo baseVehinstallmodelDetailsVo = installModelDetailsVoResultBean.getData();
+                LoanTemplateInstallVo loanTemplateInstallVo = new LoanTemplateInstallVo();
+                BeanUtil.copyProperties(installModelDetailsVoResultBean.getData(), loanTemplateInstallVo, "sid");
+                BeanUtil.copyProperties(loanTemplateInstall, loanTemplateInstallVo);
+                String wkSize = "长" + baseVehinstallmodelDetailsVo.getWk_long() + "mm,宽" + baseVehinstallmodelDetailsVo.getWk_wide() + "mm,高" + baseVehinstallmodelDetailsVo.getWk_high() + "mm";
+                loanTemplateInstallVo.setWkSize(wkSize);
+                String plateThickness = "底" + baseVehinstallmodelDetailsVo.getPlateThicknessBottom() + "mm,边" + baseVehinstallmodelDetailsVo.getPlateThicknessEdge() + "mm";
+                templateApplyVo.setLoanTemplateInstall(loanTemplateInstallVo);
+            }
+
+        }
+        LoanTemplateTrailer loanTemplateTrailer = loanTemplateTrailerService.selectByMainSid(sid);
+        if (loanTemplateTrailer != null) {
+            templateApplyVo.setTrailer(true);
+            //根据挂车配置sid查询挂车的配置信息
+            String trailerSid = loanTemplateTrailer.getVehTrailerModelSid();
+            ResultBean<BaseTrailerModelDetailsVo> trailerModelDetailsVoResultBean = baseTrailerModelFeign.fetchDetailsBySid(trailerSid);
+            if (trailerModelDetailsVoResultBean.getData() != null) {
+                BaseTrailerModelDetailsVo baseTrailerModelDetailsVo = trailerModelDetailsVoResultBean.getData();
+                LoanTemplateTrailerVo loanTemplateTrailerVo = new LoanTemplateTrailerVo();
+                BeanUtil.copyProperties(trailerModelDetailsVoResultBean.getData(), loanTemplateTrailerVo, "sid");
+                BeanUtil.copyProperties(loanTemplateTrailer, loanTemplateTrailerVo);
+                String files = loanTemplateTrailer.getVehTrailerCertificateFile();
+                if (StringUtils.isNotBlank(files)) {
+                    List<String> fileList = Arrays.asList(files.split(","));
+                    //拼接前缀
+                    fileList = fileList.stream().map(v -> fileUploadComponent.getUrlPrefix() + v).collect(Collectors.toList());
+                    loanTemplateTrailerVo.setVehTrailerCertificateFile(fileList);
+                }
+                //挂车车型名称:挂车类型（外观尺寸长宽高总高）
+                String trailerModelName = baseTrailerModelDetailsVo.getTrailerTypeValue() + "(长" + baseTrailerModelDetailsVo.getAppearanceSizeLong() + "mm,宽" + baseTrailerModelDetailsVo.getAppearanceSizeWide() + "mm,高" + baseTrailerModelDetailsVo.getAppearanceSizeHigh() + "mm,总高" + baseTrailerModelDetailsVo.getAppearanceSizeTotalHigh() + "mm";
+                loanTemplateTrailerVo.setModelTrailerName(trailerModelName);
+                String insideSize = "长" + baseTrailerModelDetailsVo.getInsideSizeLong() + "mm,宽" + baseTrailerModelDetailsVo.getInsideSizeWide() + "mm,高" + baseTrailerModelDetailsVo.getInsideSizeHigh() + "mm";
+                loanTemplateTrailerVo.setInsideSize(insideSize);
+                templateApplyVo.setLoanTemplateTrailer(loanTemplateTrailerVo);
+            }
+        }
+        SolutionssVo solutionssVo = new SolutionssVo();
+        //根据sid查询初始化
+        //根据关联sid查询是否存在金融方案
+        LoanSolutions loanSolutions = loanSolutionsService.selectByApplySid(sid);
+        if (loanSolutions != null) {
+            BeanUtil.copyProperties(loanSolutions, solutionssVo);
+            LoanSolutionsOtherpolicy loanSolutionsOtherpolicy = loanSolutionsOtherpolicyService.selectByLoanSid(loanSolutions.getSid());
+            if (loanSolutionsOtherpolicy != null) {
+                BeanUtil.copyProperties(loanSolutionsOtherpolicy, solutionssVo);
+            }
+            LoanSolutionsDetail loanSolutionsDetail = loanSolutionsDetailService.selectLoanSid(loanSolutions.getSid());
+            if (loanSolutionsDetail != null) {
+                BeanUtil.copyProperties(loanSolutionsDetail, solutionssVo);
+            }
+        }
+        solutionssVo.setShowMore(true);
+        List<SolutionListVo> formList = loanSolutionsService.getFormList(solutionssVo);
+        templateApplyVo.setFinanceForms(formList);
+        return rb.success().setData(templateApplyVo);
     }
 
     @Transactional(rollbackFor = Exception.class)

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZCLVo.java

@@ -10,6 +10,8 @@ import java.util.List;
 public class AppLoanHomeVisitInvestigateInitZCLVo implements Vo {
 
     private String sid;
+    @ApiModelProperty("银行卡")
+    private List<String> yhkImages;
     @ApiModelProperty("房产")
     private List<String> houseProperty;
     @ApiModelProperty("车辆")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveCustomerDto.java

@@ -56,7 +56,7 @@ public class AppLoanHomeVisitInvestigateSaveCustomerDto implements Dto {
     @ApiModelProperty("配偶现住址")
     private String spousePreAddress;
     @ApiModelProperty("其他人员")
-    private List<AppLoanHomeVisitInvestigateInitOtherPeoDto> otherPersonnel = new ArrayList<>();
+    private List<AppLoanHomeVisitInvestigateSaveOtherPeoDto> otherPersonnel = new ArrayList<>();
     @ApiModelProperty("紧急联系人姓名")
     private String emergencyContactName;
     @ApiModelProperty("紧急联系人电话")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitJFJZDto.java → anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveJFJZDto.java

@@ -7,7 +7,7 @@ import lombok.Data;
 import java.util.List;
 
 @Data
-public class AppLoanHomeVisitInvestigateInitJFJZDto implements Vo {
+public class AppLoanHomeVisitInvestigateSaveJFJZDto implements Vo {
 
     private String sid;
     @ApiModelProperty("定位信息")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOperDto.java → anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveOperDto.java

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-public class AppLoanHomeVisitInvestigateInitOperDto implements Vo {
+public class AppLoanHomeVisitInvestigateSaveOperDto implements Vo {
 
     private String sid;
     @ApiModelProperty("运营年限")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOrderDto.java → anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveOrderDto.java

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-public class AppLoanHomeVisitInvestigateInitOrderDto implements Vo {
+public class AppLoanHomeVisitInvestigateSaveOrderDto implements Vo {
 
     private String sid;
     @ApiModelProperty("销售订单sid")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOtherPeoDto.java → anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveOtherPeoDto.java

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-public class AppLoanHomeVisitInvestigateInitOtherPeoDto implements Vo {
+public class AppLoanHomeVisitInvestigateSaveOtherPeoDto implements Vo {
 
     private String sid;
     @ApiModelProperty("姓名")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitPropDto.java → anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSavePropDto.java

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-public class AppLoanHomeVisitInvestigateInitPropDto implements Vo {
+public class AppLoanHomeVisitInvestigateSavePropDto implements Vo {
 
     private String sid;
     @ApiModelProperty("房产状态")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitTranDto.java → anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveTranDto.java

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-public class AppLoanHomeVisitInvestigateInitTranDto implements Vo {
+public class AppLoanHomeVisitInvestigateSaveTranDto implements Vo {
 
     private String sid;
     @ApiModelProperty("运输路线")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZCLDto.java → anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveZCLDto.java

@@ -7,9 +7,11 @@ import lombok.Data;
 import java.util.List;
 
 @Data
-public class AppLoanHomeVisitInvestigateInitZCLDto implements Vo {
+public class AppLoanHomeVisitInvestigateSaveZCLDto implements Vo {
 
     private String sid;
+    @ApiModelProperty("银行卡")
+    private List<String> yhkImages;
     @ApiModelProperty("房产")
     private List<String> houseProperty;
     @ApiModelProperty("车辆")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZMWJDto.java → anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveZMWJDto.java

@@ -7,7 +7,7 @@ import lombok.Data;
 import java.util.List;
 
 @Data
-public class AppLoanHomeVisitInvestigateInitZMWJDto implements Vo {
+public class AppLoanHomeVisitInvestigateSaveZMWJDto implements Vo {
 
     private String sid;
     @ApiModelProperty("贷款人身份证")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java

@@ -62,7 +62,7 @@ public interface LoanHomeVisitInvestigateFeign {
     @ApiOperation("保存家访考察订单信息")
     @PostMapping("/saveHomeVisitOrderInfo")
     @ResponseBody
-    public ResultBean saveHomeVisitOrderInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateInitOrderDto dto);
+    public ResultBean saveHomeVisitOrderInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateSaveOrderDto dto);
 
     @ApiOperation("初始化家访考察运营经历")
     @GetMapping("/getHomeVisitOperationInfo")
@@ -72,7 +72,7 @@ public interface LoanHomeVisitInvestigateFeign {
     @ApiOperation("保存家访考察运营经历")
     @PostMapping("/saveHomeVisitOperationInfo")
     @ResponseBody
-    public ResultBean saveHomeVisitOperationInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateInitOperDto dto);
+    public ResultBean saveHomeVisitOperationInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateSaveOperDto dto);
 
     @ApiOperation("初始化家访考察运输信息")
     @GetMapping("/getHomeVisitTransportInfo")
@@ -82,7 +82,7 @@ public interface LoanHomeVisitInvestigateFeign {
     @ApiOperation("保存家访考察运输信息")
     @PostMapping("/saveHomeVisitTransportInfo")
     @ResponseBody
-    public ResultBean saveHomeVisitTransportInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateInitTranDto dto);
+    public ResultBean saveHomeVisitTransportInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateSaveTranDto dto);
 
     @ApiOperation("初始化家访考察资产情况")
     @GetMapping("/getHomeVisitAssetsInfo")
@@ -92,7 +92,7 @@ public interface LoanHomeVisitInvestigateFeign {
     @ApiOperation("保存家访考察资产情况")
     @PostMapping("/saveHomeVisitAssetsInfo")
     @ResponseBody
-    public ResultBean saveHomeVisitAssetsInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateInitPropDto dto);
+    public ResultBean saveHomeVisitAssetsInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateSavePropDto dto);
 
     @ApiOperation("初始化家访考察家访见证")
     @GetMapping("/getHomeVisitWitnessInfo")
@@ -102,7 +102,7 @@ public interface LoanHomeVisitInvestigateFeign {
     @ApiOperation("保存家访考察家访见证")
     @PostMapping("/saveHomeVisitWitnessInfo")
     @ResponseBody
-    public ResultBean saveHomeVisitWitnessInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateInitJFJZDto dto);
+    public ResultBean saveHomeVisitWitnessInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateSaveJFJZDto dto);
 
     @ApiOperation("初始化家访考察证明文件")
     @GetMapping("/getHomeVisitProveFileInfo")
@@ -112,7 +112,7 @@ public interface LoanHomeVisitInvestigateFeign {
     @ApiOperation("保存家访考察证明文件")
     @PostMapping("/saveHomeVisitProveFileInfo")
     @ResponseBody
-    public ResultBean saveHomeVisitProveFileInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateInitZMWJDto dto);
+    public ResultBean saveHomeVisitProveFileInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateSaveZMWJDto dto);
 
     @ApiOperation("初始化家访考察资产类")
     @GetMapping("/getAssetCertificateInfo")
@@ -122,6 +122,10 @@ public interface LoanHomeVisitInvestigateFeign {
     @ApiOperation("保存家访考察资产类")
     @PostMapping("/saveAssetCertificateInfo")
     @ResponseBody
-    public ResultBean saveAssetCertificateInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateInitZCLDto dto);
+    public ResultBean saveAssetCertificateInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateSaveZCLDto dto);
 
+    @ApiOperation("获取家访申诉列表")
+    @PostMapping("/getHomeAppealList")
+    @ResponseBody
+    ResultBean<PagerVo<LoanHomeVisitInvestigatePageVo>> getHomeAppealList(@RequestBody PagerQuery<LoanHomeVisitInvestigatePageQuery> pagerQuery);
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigatePageVo.java

@@ -26,7 +26,9 @@ public class LoanHomeVisitInvestigatePageVo implements Vo {
     @ApiModelProperty("家访地址")
     private String address;
     @ApiModelProperty("是否显示办理按钮")
-    private Boolean showHandleBtn;
+    private Boolean showHandleBtn = false;
     @ApiModelProperty("是否显示预约按钮")
-    private Boolean showAppointmentBtn;
+    private Boolean showAppointmentBtn = false;
+    @ApiModelProperty("是否显示申诉按钮")
+    private Boolean showAppealBtn = false;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loantemplate/TemplateFeign.java

@@ -1,14 +1,14 @@
 package com.yxt.anrui.terminal.api.risk.loantemplate;
 
-import com.yxt.anrui.terminal.api.supplychain.vehicleApply.VehicleApplyFeignFallback;
-import com.yxt.anrui.terminal.api.supplychain.vehicleApply.VehicleApplyVo;
+import com.yxt.anrui.terminal.api.risk.loantemplate.flowable.TemplatTaskQuery;
+import com.yxt.anrui.terminal.api.risk.loantemplate.flowable.TemplateApplyDto;
+import com.yxt.anrui.terminal.api.risk.loantemplate.flowable.TemplateApplyQuery;
 import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @description:
@@ -26,6 +26,31 @@ public interface TemplateFeign {
     @ApiOperation("方案详情")
     @GetMapping("/getTemplateApply/{sid}")
     @ResponseBody
-    ResultBean<VehicleApplyVo> getTemplateApply(@PathVariable("sid") String sid);
+    ResultBean<TemplateVo> getTemplateApply(@PathVariable("sid") String sid);
+
+    @ApiOperation("办理")
+    @PutMapping("/agreeTemplateApplyInfo")
+    @ResponseBody
+    ResultBean agreeTemplateApplyInfo(@RequestBody TemplateApplyDto dto);
+
+    @ApiOperation("驳回")
+    @PutMapping("/rejectTemplateApplyInfo")
+    @ResponseBody
+    ResultBean rejectTemplateApplyInfo(@RequestBody TemplatTaskQuery query);
+
+    @ApiOperation("撤回")
+    @PutMapping("/recallTemplateApplyInfo")
+    @ResponseBody
+    ResultBean recallTemplateApplyInfo(@RequestBody TemplatTaskQuery query);
+
+    @ApiOperation("终止")
+    @PutMapping("/stopTemplateApplyInfo")
+    @ResponseBody
+    ResultBean stopTemplateApplyInfo(@RequestBody TemplatTaskQuery query);
+
+    @ApiOperation("获取流程操作标题")
+    @GetMapping("/getFlowOperateTitle")
+    @ResponseBody
+    ResultBean<String> getFlowOperateTitle(@SpringQueryMap TemplateApplyQuery query);
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loantemplate/TemplateInstallVo.java

@@ -0,0 +1,52 @@
+package com.yxt.anrui.terminal.api.risk.loantemplate;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/8/16
+ **/
+@Data
+public class TemplateInstallVo {
+
+    @ApiModelProperty("上装名称")
+    private String installNameValue;
+    @ApiModelProperty("委改方式")
+    private String refitMethodValue;
+    @ApiModelProperty("供应商")
+    private String refitFactory;
+    @ApiModelProperty("外廓尺寸_长")
+    @JsonIgnore
+    private String wk_long;
+    @ApiModelProperty("外廓尺寸_宽")
+    @JsonIgnore
+    private String wk_wide;
+    @ApiModelProperty("外廓尺寸_高")
+    @JsonIgnore
+    private String wk_high;
+    @ApiModelProperty("外廓尺寸")
+    private String wkSize;
+    @ApiModelProperty("板材材质")
+    private String plateMaterialValue;
+    @ApiModelProperty("板材厚度边")
+    @JsonIgnore
+    private String plateThicknessEdge;
+    @ApiModelProperty("板材厚度底")
+    @JsonIgnore
+    private String plateThicknessBottom;
+    @ApiModelProperty("板材厚度")
+    private String plateThickness;
+    @ApiModelProperty("颜色")
+    private String colorValue;
+    @ApiModelProperty("更多配置")
+    private String moreConfig;
+    @ApiModelProperty("融资价格")
+    private String vehInstallPrice;
+    @ApiModelProperty("备注说明")
+    private String vehInstallRemark;
+    @ApiModelProperty("上装配置sid")
+    private String vehInstallModelSid;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loantemplate/TemplateTrailerVo.java

@@ -0,0 +1,67 @@
+package com.yxt.anrui.terminal.api.risk.loantemplate;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/8/16
+ **/
+@Data
+public class TemplateTrailerVo {
+
+    @ApiModelProperty("车型名称")
+    private String modelTrailerName;
+    @ApiModelProperty("挂车类型")
+    @JsonIgnore
+    private String trailerTypeValue;
+
+    @ApiModelProperty("车辆品牌")
+    private String brandName;
+    @ApiModelProperty("车辆型号名称")
+    private String carModelName;
+    @ApiModelProperty("生产厂商名称")
+    private String manufacturerName;
+
+    @ApiModelProperty("内部尺寸")
+    private String insideSize;
+    @ApiModelProperty("内部尺寸长")
+    @JsonIgnore
+    private String insideSizeLong;
+    @ApiModelProperty("内部尺寸宽")
+    @JsonIgnore
+    private String insideSizeWide;
+    @ApiModelProperty("内部尺寸高")
+    @JsonIgnore
+    private String insideSizeHigh;
+    @ApiModelProperty("外观尺寸长")
+    @JsonIgnore
+    private String appearanceSizeLong;
+    @ApiModelProperty("外观尺寸宽")
+    @JsonIgnore
+    private String appearanceSizeWide;
+    @ApiModelProperty("外观尺寸高")
+    @JsonIgnore
+    private String appearanceSizeHigh;
+    @ApiModelProperty("外观尺寸总高")
+    @JsonIgnore
+    private String appearanceSizeTotalHigh;
+
+    @ApiModelProperty("箱体颜色")
+    private String boxColor;
+    @ApiModelProperty("融资价格")
+    private String vehTrailerPrice;
+    @ApiModelProperty("更多配置")
+    private String moreConfig;
+    @ApiModelProperty("同车型合格证上传")
+    private List<String> vehTrailerCertificateFile = new ArrayList<>();
+    @ApiModelProperty("备注说明")
+    private String vehTrailerRemark;
+    @ApiModelProperty("挂车配置sid")
+    private String vehTrailerModelSid;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loantemplate/TemplateVo.java

@@ -1,8 +1,14 @@
 package com.yxt.anrui.terminal.api.risk.loantemplate;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.OrderSolutionListVo;
 import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @description:
  * @author: dimengzhe
@@ -11,4 +17,48 @@ import lombok.Data;
 @Data
 public class TemplateVo implements Vo {
     private static final long serialVersionUID = 5875529565501843924L;
+
+    @ApiModelProperty(value = "实例id")
+    @JsonProperty("procInsId")
+    private String procInstId;
+
+    @ApiModelProperty(value = "taskId")
+    private String taskId;
+    private String sid;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("车型全组织sid")
+    private String modelOrgPath;
+    @ApiModelProperty("模板名称")
+    private String templateName;
+    @ApiModelProperty("方案key")
+    private String showTypeKey;
+    @ApiModelProperty("方案value")
+    private String showTypeValue;
+    @ApiModelProperty("车型sid")
+    private String vehModelSid;
+    @ApiModelProperty("车型名称")
+    private String vehModel;
+    @ApiModelProperty("配置sid")
+    private String vehModelConfigSid;
+    @ApiModelProperty("常用配置名称")
+    private String vehModelConfig;
+    @ApiModelProperty("更多配置名称")
+    private String vehModelConfigMore;
+    @ApiModelProperty("单台指导价")
+    private String vehPrice;
+    @ApiModelProperty("合格证公告型号")
+    private String vehNoticeModel;
+
+    @ApiModelProperty("是否包含上装")
+    private boolean install;
+    @ApiModelProperty("是否包含挂车")
+    private boolean trailer;
+
+    @ApiModelProperty("上装信息")
+    private TemplateInstallVo loanTemplateInstall;
+    @ApiModelProperty("挂车信息")
+    private TemplateTrailerVo loanTemplateTrailer;
+
+    private List<OrderSolutionListVo> financeForms = new ArrayList<>();
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loantemplate/flowable/TemplatTaskQuery.java

@@ -0,0 +1,47 @@
+package com.yxt.anrui.terminal.api.risk.loantemplate.flowable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/8/16
+ **/
+@Data
+public class TemplatTaskQuery implements Query {
+    private static final long serialVersionUID = -433099622407821293L;
+
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("任务Id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    /**
+     * 终止、驳回
+     */
+    @ApiModelProperty("任务意见")
+    private String comment;
+    /**
+     * 终止、撤回、驳回
+     */
+    @ApiModelProperty("用户Sid")
+    private String userSid;
+    /**
+     * 终止
+     */
+    @ApiModelProperty("流程实例Id")
+    @JsonProperty("procInsId")
+    private String instanceId;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loantemplate/flowable/TemplateApplyDto.java

@@ -0,0 +1,39 @@
+package com.yxt.anrui.terminal.api.risk.loantemplate.flowable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/8/16
+ **/
+@Data
+public class TemplateApplyDto implements Dto {
+    private static final long serialVersionUID = -6876770959954200830L;
+
+    @ApiModelProperty(value = "任务id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    @ApiModelProperty(value = "流程id")
+    @NotBlank(message = "参数错误：procInsId")
+    @JsonProperty("procInsId")
+    private String instanceId;
+    @ApiModelProperty(value = "意见")
+    private String comment;
+    @ApiModelProperty(value = "业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    @ApiModelProperty(value = "用户sid")
+    @NotBlank(message = "参数错误：userSid")
+    private String userSid;
+    @ApiModelProperty(value = "节点id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+
+    private String orgPath;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loantemplate/flowable/TemplateApplyQuery.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.terminal.api.risk.loantemplate.flowable;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/8/16
+ **/
+@Data
+public class TemplateApplyQuery implements Query {
+    private static final long serialVersionUID = -2400776719460867925L;
+
+    @ApiModelProperty(value = "节点key")
+    private String taskDefKey;
+    @ApiModelProperty(value = "业务sid")
+    private String businessSid;
+    @ApiModelProperty(value = "0 上一环节  1下一环节")
+    @NotNull(message = "参数错误：next")
+    private Integer next;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionssDto.java

@@ -16,9 +16,12 @@ import javax.validation.constraints.NotBlank;
 public class AppSolutionssDto implements Dto {
     private static final long serialVersionUID = 939727612021140148L;
 
+    @ApiModelProperty("展示更多")
+    @JsonProperty("isShowMore")
+    private boolean isShowMore;
     @ApiModelProperty("关联sid")
     @JsonProperty("saleOrderSid")
-    private String busSid;
+    private String saleOrderSid;
     @ApiModelProperty("是否打包：1是0否")
     private String isPack;
     @ApiModelProperty("产品政策名称")

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java

@@ -74,7 +74,7 @@ public class LoanHomeVisitInvestigateRest implements LoanHomeVisitInvestigateFei
     }
 
     @Override
-    public ResultBean saveHomeVisitOrderInfo(AppLoanHomeVisitInvestigateInitOrderDto dto) {
+    public ResultBean saveHomeVisitOrderInfo(AppLoanHomeVisitInvestigateSaveOrderDto dto) {
         return loanHomeVisitInvestigateService.saveHomeVisitOrderInfo(dto);
     }
 
@@ -84,7 +84,7 @@ public class LoanHomeVisitInvestigateRest implements LoanHomeVisitInvestigateFei
     }
 
     @Override
-    public ResultBean saveHomeVisitOperationInfo(AppLoanHomeVisitInvestigateInitOperDto dto) {
+    public ResultBean saveHomeVisitOperationInfo(AppLoanHomeVisitInvestigateSaveOperDto dto) {
         return loanHomeVisitInvestigateService.saveHomeVisitOperationInfo(dto);
     }
 
@@ -94,7 +94,7 @@ public class LoanHomeVisitInvestigateRest implements LoanHomeVisitInvestigateFei
     }
 
     @Override
-    public ResultBean saveHomeVisitTransportInfo(AppLoanHomeVisitInvestigateInitTranDto dto) {
+    public ResultBean saveHomeVisitTransportInfo(AppLoanHomeVisitInvestigateSaveTranDto dto) {
         return loanHomeVisitInvestigateService.saveHomeVisitTransportInfo(dto);
     }
 
@@ -104,7 +104,7 @@ public class LoanHomeVisitInvestigateRest implements LoanHomeVisitInvestigateFei
     }
 
     @Override
-    public ResultBean saveHomeVisitAssetsInfo(AppLoanHomeVisitInvestigateInitPropDto dto) {
+    public ResultBean saveHomeVisitAssetsInfo(AppLoanHomeVisitInvestigateSavePropDto dto) {
         return loanHomeVisitInvestigateService.saveHomeVisitAssetsInfo(dto);
     }
 
@@ -114,7 +114,7 @@ public class LoanHomeVisitInvestigateRest implements LoanHomeVisitInvestigateFei
     }
 
     @Override
-    public ResultBean saveHomeVisitWitnessInfo(AppLoanHomeVisitInvestigateInitJFJZDto dto) {
+    public ResultBean saveHomeVisitWitnessInfo(AppLoanHomeVisitInvestigateSaveJFJZDto dto) {
         return loanHomeVisitInvestigateService.saveHomeVisitWitnessInfo(dto);
     }
 
@@ -124,7 +124,7 @@ public class LoanHomeVisitInvestigateRest implements LoanHomeVisitInvestigateFei
     }
 
     @Override
-    public ResultBean saveHomeVisitProveFileInfo(AppLoanHomeVisitInvestigateInitZMWJDto dto) {
+    public ResultBean saveHomeVisitProveFileInfo(AppLoanHomeVisitInvestigateSaveZMWJDto dto) {
         return loanHomeVisitInvestigateService.saveHomeVisitProveFileInfo(dto);
     }
 
@@ -134,7 +134,12 @@ public class LoanHomeVisitInvestigateRest implements LoanHomeVisitInvestigateFei
     }
 
     @Override
-    public ResultBean saveAssetCertificateInfo(AppLoanHomeVisitInvestigateInitZCLDto dto) {
+    public ResultBean saveAssetCertificateInfo(AppLoanHomeVisitInvestigateSaveZCLDto dto) {
         return loanHomeVisitInvestigateService.saveAssetCertificateInfo(dto);
     }
+
+    @Override
+    public ResultBean<PagerVo<LoanHomeVisitInvestigatePageVo>> getHomeAppealList(PagerQuery<LoanHomeVisitInvestigatePageQuery> pagerQuery) {
+        return loanHomeVisitInvestigateService.getHomeAppealList(pagerQuery);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java

@@ -28,14 +28,16 @@ package com.yxt.anrui.terminal.biz.risk.loanhomevisitinvestigate;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.*;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomeVisitInvestigateInitCustomerVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomeVisitInvestigateSaveCustomerDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.*;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperDto;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateSaveOperDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperVo;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderDto;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateSaveOrderDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderVo;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateInitPropDto;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateSavePropDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateInitPropVo;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranDto;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateSaveTranDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranVo;
 import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.*;
 import com.yxt.common.base.utils.StringUtils;
@@ -144,9 +146,9 @@ public class LoanHomeVisitInvestigateService {
         return rb.success().setData(appLoanHomeVisitInvestigateInitOrderVo);
     }
 
-    public ResultBean saveHomeVisitOrderInfo(AppLoanHomeVisitInvestigateInitOrderDto dto) {
+    public ResultBean saveHomeVisitOrderInfo(AppLoanHomeVisitInvestigateSaveOrderDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        LoanHomeVisitInvestigateInitOrderDto loanHomeVisitInvestigateInitOrderDto = new LoanHomeVisitInvestigateInitOrderDto();
+        LoanHomeVisitInvestigateSaveOrderDto loanHomeVisitInvestigateInitOrderDto = new LoanHomeVisitInvestigateSaveOrderDto();
         BeanUtil.copyProperties(dto,loanHomeVisitInvestigateInitOrderDto);
         loanHomevisitInvestigateFeign.saveHomeVisitOrderInfo(loanHomeVisitInvestigateInitOrderDto);
         return rb.success();
@@ -160,9 +162,9 @@ public class LoanHomeVisitInvestigateService {
         return rb.success().setData(appLoanHomeVisitInvestigateInitOperVo);
     }
 
-    public ResultBean saveHomeVisitOperationInfo(AppLoanHomeVisitInvestigateInitOperDto dto) {
+    public ResultBean saveHomeVisitOperationInfo(AppLoanHomeVisitInvestigateSaveOperDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        LoanHomeVisitInvestigateInitOperDto loanHomeVisitInvestigateInitOperDto = new LoanHomeVisitInvestigateInitOperDto();
+        LoanHomeVisitInvestigateSaveOperDto loanHomeVisitInvestigateInitOperDto = new LoanHomeVisitInvestigateSaveOperDto();
         BeanUtil.copyProperties(dto,loanHomeVisitInvestigateInitOperDto);
         loanHomevisitInvestigateFeign.saveHomeVisitOperationInfo(loanHomeVisitInvestigateInitOperDto);
         return rb.success();
@@ -176,9 +178,9 @@ public class LoanHomeVisitInvestigateService {
         return rb.success().setData(appLoanHomeVisitInvestigateInitTranVo);
     }
 
-    public ResultBean saveHomeVisitTransportInfo(AppLoanHomeVisitInvestigateInitTranDto dto) {
+    public ResultBean saveHomeVisitTransportInfo(AppLoanHomeVisitInvestigateSaveTranDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        LoanHomeVisitInvestigateInitTranDto loanHomeVisitInvestigateInitTranDto = new LoanHomeVisitInvestigateInitTranDto();
+        LoanHomeVisitInvestigateSaveTranDto loanHomeVisitInvestigateInitTranDto = new LoanHomeVisitInvestigateSaveTranDto();
         BeanUtil.copyProperties(dto,loanHomeVisitInvestigateInitTranDto);
         loanHomevisitInvestigateFeign.saveHomeVisitTransportInfo(loanHomeVisitInvestigateInitTranDto);
         return rb.success();
@@ -192,9 +194,9 @@ public class LoanHomeVisitInvestigateService {
         return rb.success().setData(appLoanHomeVisitInvestigateInitPropVo);
     }
 
-    public ResultBean saveHomeVisitAssetsInfo(AppLoanHomeVisitInvestigateInitPropDto dto) {
+    public ResultBean saveHomeVisitAssetsInfo(AppLoanHomeVisitInvestigateSavePropDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        LoanHomeVisitInvestigateInitPropDto loanHomeVisitInvestigateInitPropDto = new LoanHomeVisitInvestigateInitPropDto();
+        LoanHomeVisitInvestigateSavePropDto loanHomeVisitInvestigateInitPropDto = new LoanHomeVisitInvestigateSavePropDto();
         BeanUtil.copyProperties(dto,loanHomeVisitInvestigateInitPropDto);
         loanHomevisitInvestigateFeign.saveHomeVisitAssetsInfo(loanHomeVisitInvestigateInitPropDto);
         return rb.success();
@@ -208,9 +210,9 @@ public class LoanHomeVisitInvestigateService {
         return rb.success().setData(appLoanHomeVisitInvestigateInitJFJZVo);
     }
 
-    public ResultBean saveHomeVisitWitnessInfo(AppLoanHomeVisitInvestigateInitJFJZDto dto) {
+    public ResultBean saveHomeVisitWitnessInfo(AppLoanHomeVisitInvestigateSaveJFJZDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        LoanHomeVisitInvestigateInitJFJZDto loanHomeVisitInvestigateInitJFJZDto = new LoanHomeVisitInvestigateInitJFJZDto();
+        LoanHomeVisitInvestigateSaveJFJZDto loanHomeVisitInvestigateInitJFJZDto = new LoanHomeVisitInvestigateSaveJFJZDto();
         BeanUtil.copyProperties(dto,loanHomeVisitInvestigateInitJFJZDto);
         loanHomevisitInvestigateFeign.saveHomeVisitWitnessInfo(loanHomeVisitInvestigateInitJFJZDto);
         return rb.success();
@@ -224,9 +226,9 @@ public class LoanHomeVisitInvestigateService {
         return rb.success().setData(appLoanHomeVisitInvestigateInitZMWJVo);
     }
 
-    public ResultBean saveHomeVisitProveFileInfo(AppLoanHomeVisitInvestigateInitZMWJDto dto) {
+    public ResultBean saveHomeVisitProveFileInfo(AppLoanHomeVisitInvestigateSaveZMWJDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        LoanHomeVisitInvestigateInitZMWJDto loanHomeVisitInvestigateInitZMWJDto = new LoanHomeVisitInvestigateInitZMWJDto();
+        LoanHomeVisitInvestigateSaveZMWJDto loanHomeVisitInvestigateInitZMWJDto = new LoanHomeVisitInvestigateSaveZMWJDto();
         BeanUtil.copyProperties(dto,loanHomeVisitInvestigateInitZMWJDto);
         loanHomevisitInvestigateFeign.saveHomeVisitProveFileInfo(loanHomeVisitInvestigateInitZMWJDto);
         return rb.success();
@@ -240,11 +242,52 @@ public class LoanHomeVisitInvestigateService {
         return rb.success().setData(appLoanHomeVisitInvestigateInitZCLVo);
     }
 
-    public ResultBean saveAssetCertificateInfo(AppLoanHomeVisitInvestigateInitZCLDto dto) {
+    public ResultBean saveAssetCertificateInfo(AppLoanHomeVisitInvestigateSaveZCLDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        LoanHomeVisitInvestigateInitZCLDto loanHomeVisitInvestigateInitZCLDto = new LoanHomeVisitInvestigateInitZCLDto();
+        LoanHomeVisitInvestigateSaveZCLDto loanHomeVisitInvestigateInitZCLDto = new LoanHomeVisitInvestigateSaveZCLDto();
         BeanUtil.copyProperties(dto,loanHomeVisitInvestigateInitZCLDto);
         loanHomevisitInvestigateFeign.saveAssetCertificateInfo(loanHomeVisitInvestigateInitZCLDto);
         return rb.success();
     }
+
+    public ResultBean<PagerVo<LoanHomeVisitInvestigatePageVo>> getHomeAppealList(PagerQuery<LoanHomeVisitInvestigatePageQuery> pagerQuery) {
+        ResultBean<PagerVo<LoanHomeVisitInvestigatePageVo>> rb = ResultBean.fireFail();
+        PagerQuery<LoanHomevisitInvestigateQuery> pq = new PagerQuery<>();
+        LoanHomeVisitInvestigatePageQuery params = pagerQuery.getParams();
+        LoanHomevisitInvestigateQuery params1 = new LoanHomevisitInvestigateQuery();
+        params1.setOrgSidPath(params.getOrgPath());
+        params1.setUserSid(params.getUserSid());
+        params1.setNames(params.getNames());
+        pq.setParams(params1);
+        ResultBean<PagerVo<LoanHomevisitInvestigateVo>> resultBean = loanHomevisitInvestigateFeign.jfjdListPage(pq);
+        List<LoanHomeVisitInvestigatePageVo> loanHomeVisitInvestigatePageVos = new ArrayList<>();
+        PagerVo<LoanHomeVisitInvestigatePageVo> v = new PagerVo<>();
+        List<LoanHomevisitInvestigateVo> records = resultBean.getData().getRecords();
+        for (LoanHomevisitInvestigateVo record : records) {
+            LoanHomeVisitInvestigatePageVo loanHomeVisitInvestigatePageVo = new LoanHomeVisitInvestigatePageVo();
+            loanHomeVisitInvestigatePageVo.setSid(record.getSid());
+            loanHomeVisitInvestigatePageVo.setContractId(record.getContractNo());
+            if (StringUtils.isNotBlank(record.getResHomeVisDate())){
+                loanHomeVisitInvestigatePageVo.setNodeState("已预约");
+            }else {
+                loanHomeVisitInvestigatePageVo.setNodeState("未预约");
+                loanHomeVisitInvestigatePageVo.setShowAppointmentBtn(true);
+            }
+            loanHomeVisitInvestigatePageVo.setSalesName(record.getStaffName());
+            loanHomeVisitInvestigatePageVo.setCreateDate(record.getCreateDate());
+            loanHomeVisitInvestigatePageVo.setLenderName(record.getBorrowerName());
+            loanHomeVisitInvestigatePageVo.setMobile(record.getMobile());
+            loanHomeVisitInvestigatePageVo.setTimes(record.getResHomeVisDate());
+            loanHomeVisitInvestigatePageVo.setAddress(record.getHomeVisAddress());
+            if (record.getState().equals("1")) {
+                loanHomeVisitInvestigatePageVo.setShowHandleBtn(true);
+            }
+            if (record.getState().equals("2") && record.getInvestigateValue().equals("不通过")){
+                loanHomeVisitInvestigatePageVo.setShowAppealBtn(true);
+            }
+            loanHomeVisitInvestigatePageVos.add(loanHomeVisitInvestigatePageVo);
+        }
+        v.setRecords(loanHomeVisitInvestigatePageVos);
+        return rb.success().setData(v);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loantemplate/TemplateRest.java

@@ -0,0 +1,54 @@
+package com.yxt.anrui.terminal.biz.risk.loantemplate;
+
+import com.yxt.anrui.terminal.api.risk.loantemplate.TemplateFeign;
+import com.yxt.anrui.terminal.api.risk.loantemplate.TemplateVo;
+import com.yxt.anrui.terminal.api.risk.loantemplate.flowable.TemplatTaskQuery;
+import com.yxt.anrui.terminal.api.risk.loantemplate.flowable.TemplateApplyDto;
+import com.yxt.anrui.terminal.api.risk.loantemplate.flowable.TemplateApplyQuery;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/8/16
+ **/
+@Controller
+@RequestMapping("/risk/v1/Template")
+public class TemplateRest implements TemplateFeign {
+
+    @Autowired
+    private TemplateService templateService;
+
+    @Override
+    public ResultBean<TemplateVo> getTemplateApply(String sid) {
+        return templateService.getTemplateApply(sid);
+    }
+
+    @Override
+    public ResultBean agreeTemplateApplyInfo(TemplateApplyDto dto) {
+        return templateService.agreeTemplateApplyInfo(dto);
+    }
+
+    @Override
+    public ResultBean rejectTemplateApplyInfo(TemplatTaskQuery query) {
+        return templateService.rejectTemplateApplyInfo(query);
+    }
+
+    @Override
+    public ResultBean recallTemplateApplyInfo(TemplatTaskQuery query) {
+        return templateService.recallTemplateApplyInfo(query);
+    }
+
+    @Override
+    public ResultBean stopTemplateApplyInfo(TemplatTaskQuery query) {
+        return templateService.stopTemplateApplyInfo(query);
+    }
+
+    @Override
+    public ResultBean<String> getFlowOperateTitle(TemplateApplyQuery query) {
+        return templateService.getFlowOperateTitle(query);
+    }
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loantemplate/TemplateService.java

@@ -0,0 +1,115 @@
+package com.yxt.anrui.terminal.biz.risk.loantemplate;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateFeign;
+import com.yxt.anrui.riskcenter.api.loantemplate.TemplateApplyVo;
+import com.yxt.anrui.riskcenter.api.loantemplate.flowable.TemplateApplyNodeQuery;
+import com.yxt.anrui.riskcenter.api.loantemplate.flowable.TemplateApplyNodeVo;
+import com.yxt.anrui.riskcenter.api.loantemplate.flowable.TemplateApplyTaskQuery;
+import com.yxt.anrui.riskcenter.api.loantemplate.flowable.TemplateCompleteDto;
+import com.yxt.anrui.terminal.api.risk.loantemplate.TemplateVo;
+import com.yxt.anrui.terminal.api.risk.loantemplate.flowable.TemplatTaskQuery;
+import com.yxt.anrui.terminal.api.risk.loantemplate.flowable.TemplateApplyDto;
+import com.yxt.anrui.terminal.api.risk.loantemplate.flowable.TemplateApplyQuery;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/8/16
+ **/
+@Service
+public class TemplateService {
+
+    @Autowired
+    private LoanTemplateFeign loanTemplateFeign;
+
+    public ResultBean<TemplateVo> getTemplateApply(String sid) {
+        ResultBean<TemplateVo> rb = ResultBean.fireFail();
+        ResultBean<TemplateApplyVo> resultBean = loanTemplateFeign.getTemplateApply(sid);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        TemplateVo templateVo = new TemplateVo();
+        BeanUtil.copyProperties(resultBean.getData(), templateVo);
+        return rb.success().setData(templateVo);
+    }
+
+    public ResultBean agreeTemplateApplyInfo(TemplateApplyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        TemplateCompleteDto templateCompleteDto = new TemplateCompleteDto();
+        BeanUtil.copyProperties(dto, templateCompleteDto);
+        ResultBean resultBean = loanTemplateFeign.complete(templateCompleteDto);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
+    public ResultBean rejectTemplateApplyInfo(TemplatTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        TemplateApplyTaskQuery templateApplyTaskQuery = new TemplateApplyTaskQuery();
+        BeanUtil.copyProperties(query, templateApplyTaskQuery);
+        ResultBean resultBean = loanTemplateFeign.taskReject(templateApplyTaskQuery);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
+    public ResultBean recallTemplateApplyInfo(TemplatTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        TemplateApplyTaskQuery templateApplyTaskQuery = new TemplateApplyTaskQuery();
+        BeanUtil.copyProperties(query, templateApplyTaskQuery);
+        ResultBean resultBean = loanTemplateFeign.revokeProcess(templateApplyTaskQuery);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
+    public ResultBean stopTemplateApplyInfo(TemplatTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        TemplateApplyTaskQuery templateApplyTaskQuery = new TemplateApplyTaskQuery();
+        BeanUtil.copyProperties(query, templateApplyTaskQuery);
+        ResultBean resultBean = loanTemplateFeign.breakProcess(templateApplyTaskQuery);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
+    public ResultBean<String> getFlowOperateTitle(TemplateApplyQuery query) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        //0 上一环节  1下一环节
+        int next = query.getNext();
+        TemplateApplyNodeQuery getNodeQuery = new TemplateApplyNodeQuery();
+        BeanUtil.copyProperties(query, getNodeQuery);
+        String data = "";
+        if (next == 0) {
+            ResultBean<List<TemplateApplyNodeVo>> getPreviousNodesForReject = loanTemplateFeign.getPreviousNodesForReject(getNodeQuery);
+            if (getPreviousNodesForReject.getSuccess()) {
+                getPreviousNodesForReject.getData().removeAll(Collections.singleton(null));
+                data = getPreviousNodesForReject.getData().get(0).getName();
+            } else {
+                return rb.setMsg(getPreviousNodesForReject.getMsg());
+            }
+        } else if (next == 1) {
+            ResultBean<List<TemplateApplyNodeVo>> getNextNodesForSubmit = loanTemplateFeign.getNextNodesForSubmit(getNodeQuery);
+            if (getNextNodesForSubmit.getSuccess()) {
+                getNextNodesForSubmit.getData().removeAll(Collections.singleton(null));
+                data = getNextNodesForSubmit.getData().get(0).getName();
+            } else {
+                return rb.setMsg(getNextNodesForSubmit.getMsg());
+            }
+        } else {
+            return rb.setMsg("参数错误：next");
+        }
+        return rb.success().setData(data);
+    }
+}