diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java index d00d2f4fed..34b1afd0bd 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java @@ -2,6 +2,7 @@ package com.yxt.anrui.base.api.basevehiclestate; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModelProperty; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -34,7 +35,17 @@ public interface BaseVehicleStateFeign { @ResponseBody ResultBean selectOneQKKPByBusSid(@RequestParam("busSid") String sid); - @PostMapping("selectByVinSid") + @PostMapping("selectByBusSid") @ResponseBody - ResultBean selectByVinSid(@RequestParam("vehSid") String vehSid); + ResultBean selectByBusSid(@RequestParam("busSid") String busSid); + + @ApiModelProperty("根据车辆业务状态查询车辆业务sid") + @PostMapping("selectBusSidListByBusState") + @ResponseBody + ResultBean> selectBusSidListByBusState(@RequestParam("busState") String busState); + + @ApiModelProperty("根据车辆业务sid更新车辆业务状态") + @PostMapping("updateBusStateByBusSid") + ResultBean updateBusStateByBusSid(@RequestParam("busVinSid") String busVinSid, @RequestParam("busState") String busState); + } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java index e29f8f8317..914edafa38 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java @@ -7,6 +7,8 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import java.util.List; + /** * @description: * @author: dimengzhe @@ -22,5 +24,10 @@ public interface BaseVehicleStateMapper extends BaseMapper { BaseVehicleState selectOneQKKPByBusSid(String sid); - BaseVehicleState selectByVinSid(String vehSid); + BaseVehicleState selectByBusSid(String busSid); + List selectBusSidListByBusState(String busState); + + + + int updateBusStateByBusSid(@Param("busVinSid") String busVinSid, @Param("busState") String busState); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml index 543e03452d..4d249f5418 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml @@ -1,6 +1,11 @@ + + update base_vehicle_state + set busState = #{busState} + where busSid = #{busVinSid} + 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 * FROM base_vehicle_state - WHERE vinSid = #{vehSid} + WHERE busSid = #{busSid} AND carryVehicleState = '0' AND carryInvoiceState = '0' + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateRest.java index 380384e418..b932b66e6d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateRest.java @@ -41,8 +41,18 @@ public class BaseVehicleStateRest implements BaseVehicleStateFeign { } @Override - public ResultBean selectByVinSid(String vehSid) { - return baseVehicleStateService.selectByVinSid(vehSid); + public ResultBean selectByBusSid(String busSid) { + return baseVehicleStateService.selectByBusSid(busSid); + } + + @Override + public ResultBean> selectBusSidListByBusState(String busState) { + return baseVehicleStateService.selectBusSidListByBusState(busState); + } + + @Override + public ResultBean updateBusStateByBusSid(String busVinSid, String busState) { + return baseVehicleStateService.updateBusStateByBusSid(busVinSid, busState); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java index a26c195b9c..151141e9ba 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java @@ -33,7 +33,7 @@ public class BaseVehicleStateService extends MybatisBaseService selectByVinSid(String vehSid) { + public ResultBean selectByBusSid(String busSid) { ResultBean rb = ResultBean.fireFail(); - BaseVehicleState baseVehicleState = baseMapper.selectByVinSid(vehSid); + BaseVehicleState baseVehicleState = baseMapper.selectByBusSid(busSid); return rb.success().setData(baseVehicleState); } + + public ResultBean> selectBusSidListByBusState(String busState) { + ResultBean> rb = ResultBean.fireFail(); + List busSidList = baseMapper.selectBusSidListByBusState(busState); + return rb.success().setData(busSidList); + } + + public ResultBean updateBusStateByBusSid(String busVinSid, String busState) { + ResultBean rb = ResultBean.fireFail(); + int i = baseMapper.updateBusStateByBusSid(busVinSid,busState); + return rb.success(); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index eb09c11098..43261440e0 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -1953,13 +1953,13 @@ public class CommonContractService extends MybatisBaseService future4 = pool.submit(() -> { return getReceiveCar(map, appOrderDetailsVo); }); - Future future5 = pool.submit(() -> { + /* Future future5 = pool.submit(() -> { return getInvoicMessage(map, appOrderDetailsVo); - }); + });*/ String singleFinalPriceOne = priceInfo.getSingleFinalPrice(); String depositOne = depositInfo.getDeposit(); //单台成交价与单台订金相等 - Future future6 = null; + /* Future future6 = null; if (new BigDecimal(singleFinalPriceOne).compareTo(new BigDecimal(depositOne)) != 0) { future6 = pool.submit(() -> { return getCarFin(map, appOrderDetailsVo); @@ -1967,7 +1967,7 @@ public class CommonContractService extends MybatisBaseService future7 = pool.submit(() -> { return getMoneyFin(map, appOrderDetailsVo); - }); + });*/ Future future8 = null; if (!"02".equals(appOrderDetailsVo.getInvoiceType())) { future8 = pool.submit(() -> { @@ -2010,11 +2010,11 @@ public class CommonContractService extends MybatisBaseService 0) { // String typeName = ContractTemplateEnum.CONTRACTALL.getName() + "_" + DateUtil.format(new Date(), "yyyMMdd") + System.currentTimeMillis() + ".pdf"; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java index 8d753d310e..540b9b241a 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java @@ -80,4 +80,10 @@ public interface BusSalesOrderLoancontractFeign { @GetMapping("/selectByBorrowerSid/{saleOrderBorrowerSid}") @ResponseBody ResultBean> selectByBorrowerSid(@PathVariable("saleOrderBorrowerSid") String saleOrderBorrowerSid); + + @ApiOperation("根据销售订单SID获取一条记录") + @GetMapping("/fetchDetailsByOrderSid/{orderSid}") + @ResponseBody + public ResultBean fetchDetailsByOrderSid(@PathVariable("orderSid") String sid); + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java index 78df59e075..863272ac85 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java @@ -74,4 +74,9 @@ public class BusSalesOrderLoancontractFeignFallback implements BusSalesOrderLoan public ResultBean> selectByBorrowerSid(String saleOrderBorrowerSid) { return null; } + + @Override + public ResultBean fetchDetailsByOrderSid(String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.java index 30cc3781d2..9774e55c7d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.java @@ -54,15 +54,18 @@ import java.util.List; @Mapper public interface BusSalesOrderLoancontractMapper extends BaseMapper { - //@Update("update bus_sales_order_loancontract set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from bus_sales_order_loancontract") - List selectListVo(); + //@Update("update bus_sales_order_loancontract set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from bus_sales_order_loancontract") + List selectListVo(); + + @Select("select * from bus_sales_order_loancontract where salesOrderSid = #{sid}") + BusSalesOrderLoancontract fetchDetailsByOrderSid(String sid); @Select("select * from bus_sales_order_loancontract where borrowerSid = #{saleOrderBorrowerSid}") List selectByBorrowerSid(String saleOrderBorrowerSid); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java index 9959714621..087192fc64 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java @@ -104,4 +104,11 @@ public class BusSalesOrderLoancontractRest implements BusSalesOrderLoancontractF List busSalesOrderLoancontractDetailsVos = busSalesOrderLoancontractService.selectByBorrowerSid(saleOrderBorrowerSid); return rb.success().setData(busSalesOrderLoancontractDetailsVos); } + + @Override + public ResultBean fetchDetailsByOrderSid(String sid) { + ResultBean rb = ResultBean.fireFail(); + BusSalesOrderLoancontract entity = busSalesOrderLoancontractService.fetchDetailsByOrderSid(sid); + return rb.success().setData(entity); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java index 63dac92ad6..911f13295f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java @@ -113,4 +113,9 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService selectByBorrowerSid(String saleOrderBorrowerSid) { return baseMapper.selectByBorrowerSid(saleOrderBorrowerSid); } + + public BusSalesOrderLoancontract fetchDetailsByOrderSid(String sid) { + BusSalesOrderLoancontract entity = baseMapper.fetchDetailsByOrderSid(sid); + return entity; + } } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmSolutions.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmSolutions.java new file mode 100644 index 0000000000..2d15f3f855 --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmSolutions.java @@ -0,0 +1,165 @@ +package com.yxt.anrui.crm.api.crmvehicledemand; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.util.ArrayList; +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/8/29 + **/ +@Data +public class AppCrmSolutions { + + @JsonProperty("isShowMore") + private boolean isShowMore; + @ApiModelProperty("是否打包：1是0否") + private String isPack; + @ApiModelProperty("产品政策名称") + private String policyName; + private String policySid; + + @ApiModelProperty("主车发票价") + private String mainVehicleAmount; + @ApiModelProperty("融资票据") + private String accessoriesAmount; + + @ApiModelProperty("挂车金额") + private String trailerAmount; + @ApiModelProperty("购置税") + private String purchaseTax; + @ApiModelProperty("保险金额") + private String premium; + + @ApiModelProperty("融资项目总额") + private String loanTotal; + + @ApiModelProperty("是否有融资票据") + private boolean accessoriesAmountCb; + @ApiModelProperty("是否有挂车") + private boolean trailerAmountCb; + @ApiModelProperty("是否有购置税") + private boolean purchaseTaxCb; + @ApiModelProperty("是否有保险") + private boolean premiumCb; + + @ApiModelProperty("首付款比例") + private String downPayRatio; + @ApiModelProperty("首付金额") + @NotBlank(message = "首付金额不能为空") + private String downPayAmount; + @ApiModelProperty("贷款金额") + private String loanAmount; + @ApiModelProperty("贷款期数") + @NotBlank(message = "产品期数不能为空") + private String loanPeriod; + @ApiModelProperty("贷款保证金比例") + private String bondRatio; + @ApiModelProperty("贷款保证金金额") + @NotBlank(message = "贷款保证金不能为空") + private String bondAmount; + @ApiModelProperty("厂家贴息") + @NotBlank(message = "厂家贴息不能为空") + private String factoryDiscount; + @ApiModelProperty("厂家贴息用途") + private String factoryDiscountUse; + + @ApiModelProperty("贴息抵车款") + @JsonProperty("factoryDiscountUseMoney") + private String discountCar; + + @ApiModelProperty("年利率") + private String policyYearRatio; + @ApiModelProperty("月还金额") + @NotBlank(message = "月还金额不能为空") + private String loanPayMoney; + @ApiModelProperty("利息总额") + private String loanInterest; + + @ApiModelProperty("是否勾选其它融") + private boolean otherPolicyState; + + @ApiModelProperty("其它融名称") + private String otherPolicyName; + private String otherPolicySid; + @ApiModelProperty("其它融贷款金额") + private String otherPolicyAmount; + @ApiModelProperty("其它融期数") + private String otherPolicyPeriod; + @ApiModelProperty("其它融月还") + private String otherPolicyMonthlyRepay; + @ApiModelProperty("其它融利息总额") + private String otherPolicyInterest; + @ApiModelProperty("其它融年利率") + private String otherPolicyYearRatio; + + @ApiModelProperty("'融资首付") + private String loanDownPay; + @ApiModelProperty("实际首付比例") + private String downPayAmountsRatio; + @ApiModelProperty("总贷款金额") + private String loanAmountTotal; + @ApiModelProperty("期数") + private String period; + @ApiModelProperty("月还金额") + private String monthlyRepay; + @ApiModelProperty("利息总额") + private String interest; + @ApiModelProperty("预计首期还款日") + private String returnTime; + + @ApiModelProperty("融资首付") + private String downPayAmounts; + @ApiModelProperty("贷款保证金") + private String bondAmounts; + @ApiModelProperty("保险保证金") + private String depositPremium; + @ApiModelProperty("落户保证金") + private String depositSettle; + @ApiModelProperty("服务费") + @NotBlank(message = "服务费不能为空") + private String serviceAmount; + @ApiModelProperty("代收意外险") + private String proxyAccidentPremium; + @ApiModelProperty("上牌费") + private String registerAmount; + @ApiModelProperty("运管费") + private String operationAmount; + + @ApiModelProperty("补车价") + private String vehOtherPrice; + @ApiModelProperty("其它费用") + private String otherAmount; + @ApiModelProperty("其它费用说明") + private String otherAmountRemark; + @ApiModelProperty("办理方式选择") + private String dealWay; + @ApiModelProperty("办理方式选择key") + private String dealWayKey; + + @ApiModelProperty("代收首年保险费") + private String proxyPremium; + @ApiModelProperty("代收购置费") + private String proxyPurchasetax; + @ApiModelProperty("抵顶首年保险费") + private String offsetPremium; + @ApiModelProperty("抵顶购置税") + private String offsetPurchasetax; + @ApiModelProperty("抵顶费用合计") + private String offsetTotal; + @ApiModelProperty("应收合计") + private String receivableTotal; + @ApiModelProperty("实收合计") + private String realTotal; + @ApiModelProperty("车辆总价") + private String vehTotalPrice; + @ApiModelProperty("名义留购价") + private String nominalPrice; + + private List financeForms = new ArrayList<>(); +} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandParticularsVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandParticularsVo.java index 23f51a52ad..374befa7c0 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandParticularsVo.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandParticularsVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.crm.api.crmvehicledemand; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -39,4 +40,14 @@ public class AppCrmVehicleDemandParticularsVo implements Vo { @ApiModelProperty("备注") private String remarks; + @JsonProperty("finTypeKey") + private String typeKey; + + private AppCrmSolutions finNormal; + + @ApiModelProperty(value = "金融方案key") + private String financePlan; + @ApiModelProperty(value = "金融方案value") + private String financePlanValue; + } diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandUpdateDto.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandUpdateDto.java index 09c8dad4d9..efb827f7f7 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandUpdateDto.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandUpdateDto.java @@ -40,5 +40,7 @@ public class AppCrmVehicleDemandUpdateDto implements Dto { @ApiModelProperty(value = "1自有资金，2三方金融") private String financePlanValue; @ApiModelProperty("金融方案") - private CrmSolutions finNormal; + private AppCrmSolutions finNormal; + @ApiModelProperty("1常规、2定制") + private String finTypeKey; } diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandDetailsVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandDetailsVo.java index b8a21f5201..08d86715c9 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandDetailsVo.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandDetailsVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.crm.api.crmvehicledemand; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -46,5 +47,11 @@ public class AppCrmVehicledemandDetailsVo implements Vo { private String financePlan; @ApiModelProperty(value = "金融方案value") private String financePlanValue; + @JsonProperty("finTypeKey") + private String typeKey; + private String type; + + private AppCrmSolutions finNormal; + } diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmSolutionListVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmSolutionListVo.java new file mode 100644 index 0000000000..7f236dc6bd --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmSolutionListVo.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.crm.api.crmvehicledemand; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/8/29 + **/ +@Data +public class CrmSolutionListVo { + + @ApiModelProperty(value = "内容") + private String value; + + @ApiModelProperty(value = "单元格大小") + private Integer spanSize; + + @ApiModelProperty("类型:0 最普通的 1 标题的 2是 加上划线的") + private Integer type; + @ApiModelProperty("是否加粗，true是，false否") + private boolean bold; +} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmSolutions.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmSolutions.java index c71c93d2c1..d8ba4597a1 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmSolutions.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmSolutions.java @@ -66,6 +66,8 @@ public class CrmSolutions { private String factoryDiscount; @ApiModelProperty("厂家贴息用途") private String factoryDiscountUse; + @ApiModelProperty("贴息抵车款") + private String discountCar; @ApiModelProperty("年利率") private String policyYearRatio; diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemand.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemand.java index 41979a7bf4..03da49340e 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemand.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemand.java @@ -87,6 +87,8 @@ public class CrmVehicledemand extends BaseEntity { @ApiModelProperty("1自有资金，2三方金融，3非担保，4担保") private String financePlanValue; @ApiModelProperty("01资方常规，02定制金融") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String typeKey; + @TableField(updateStrategy = FieldStrategy.IGNORED) private String type; } diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml index 29caf87c55..b350db540b 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml @@ -108,7 +108,8 @@ cv.otherConfig, cv.sketChconfiguration as configName, cv.financePlan, - cv.financePlanValue + cv.financePlanValue, + cv.typeKey FROM crm_vehicledemand cv WHERE cv.sid = #{intentionSid} @@ -125,7 +126,10 @@ cv.comonConfigSid AS configSid, cv.number, cv.remarks, - cv.estimatedPickupDate AS `date` + cv.estimatedPickupDate AS `date`, + cv.financePlan, + cv.financePlanValue, + cv.typeKey FROM crm_vehicledemand cv WHERE cv.sid = #{sid} diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandRest.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandRest.java index 97e9a6e425..049287fbfc 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandRest.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandRest.java @@ -165,8 +165,7 @@ public class CrmVehicledemandRest implements CrmVehicledemandFeign { */ @Override public ResultBean initVisitDemands(String intentionSid) { - AppCrmVehicledemandDetailsVo vo = crmVehicledemandService.initVisitDemands(intentionSid); - return new ResultBean().success().setData(vo); + return crmVehicledemandService.initVisitDemands(intentionSid); } /** @@ -177,9 +176,7 @@ public class CrmVehicledemandRest implements CrmVehicledemandFeign { */ @Override public ResultBean saveVisitDemands(AppCrmVehicleDemandUpdateDto appCrmVehicleDemandUpdateDto) { - ResultBean rb = ResultBean.fireFail(); - crmVehicledemandService.saveVisitDemands(appCrmVehicleDemandUpdateDto); - return rb.success(); + return crmVehicledemandService.saveVisitDemands(appCrmVehicleDemandUpdateDto); } /** @@ -190,8 +187,7 @@ public class CrmVehicledemandRest implements CrmVehicledemandFeign { */ @Override public ResultBean intendedModel(String sid) { - AppCrmVehicleDemandParticularsVo vo = crmVehicledemandService.intendedModel(sid); - return new ResultBean().success().setData(vo); + return crmVehicledemandService.intendedModel(sid); } @Override diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java index abe59e16d1..02a162d257 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java @@ -1,12 +1,14 @@ package com.yxt.anrui.crm.biz.crmvehicledemand; import cn.hutool.core.bean.BeanUtil; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign; import com.yxt.anrui.base.api.basevehmodelconfig.AppModelVeDetailVo; import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign; import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo; +import com.yxt.anrui.buscenter.api.bussalesorder.OrderSolutionVo; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp; import com.yxt.anrui.crm.api.crmfindemand.CrmFindemand; import com.yxt.anrui.crm.api.crmfindemand.CrmFindemandDto; @@ -19,10 +21,15 @@ import com.yxt.anrui.crm.biz.crmcustomertemp.CrmCustomerTempService; import com.yxt.anrui.crm.biz.crmfindemand.CrmFindemandService; import com.yxt.anrui.crm.biz.crmvehiclefinance.CrmVehicleFinanceService; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign; 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.SolutionssDto; +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.LoanTemplateSolutionsVo; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -37,9 +44,8 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.text.SimpleDateFormat; -import java.util.Arrays; -import java.util.Date; -import java.util.List; +import java.util.*; +import java.util.stream.Collectors; /** * Project: anrui-crm(客户管理)
@@ -353,21 +359,36 @@ public class CrmVehicledemandService extends MybatisBaseService initVisitDemands(String intentionSid) { + ResultBean rb = ResultBean.fireFail(); AppCrmVehicledemandDetailsVo appCrmVehicledemandDetailsVo = baseMapper.selectBySid(intentionSid); - return appCrmVehicledemandDetailsVo; + if(!"1".equals(appCrmVehicledemandDetailsVo.getFinancePlan())){ + ResultBean resultBean = loanSolutionsFeign.selectDetails3(intentionSid); + if (resultBean.getData() != null) { + AppCrmSolutions finNormal = new AppCrmSolutions(); + BeanUtil.copyProperties(resultBean.getData(), finNormal); + List financeForms = resultBean.getData().getFinanceForms(); + if (!financeForms.isEmpty()) { + List voList = Optional.ofNullable(financeForms).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), CrmSolutionListVo.class)).collect(Collectors.toList()); + finNormal.setFinanceForms(voList); + } + appCrmVehicledemandDetailsVo.setFinNormal(finNormal); + } + } + return rb.success().setData(appCrmVehicledemandDetailsVo); } /** * 修改意向车型 - * - * @param appCrmVehicleDemandUpdateDto */ @Transactional(rollbackFor = Exception.class) public ResultBean saveVisitDemands(AppCrmVehicleDemandUpdateDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = dto.getIntentionSid(); CrmVehicledemand entity = fetchBySid(sid); + if (entity == null) { + return rb.setMsg("该车辆需求不存在"); + } BeanUtil.copyProperties(dto, entity); entity.setEstimatedPickupDate(dto.getDate()); if (StringUtils.isNotBlank(dto.getPrice())) { @@ -375,14 +396,45 @@ public class CrmVehicledemandService extends MybatisBaseService intendedModel(String sid) { + ResultBean rb = ResultBean.fireFail(); AppCrmVehicleDemandParticularsVo appCrmVehicleDemandParticularsVo = baseMapper.intendedModel(sid); - return appCrmVehicleDemandParticularsVo; + if(!"1".equals(appCrmVehicleDemandParticularsVo.getFinancePlan())){ + ResultBean resultBean = loanSolutionsFeign.selectDetails3(sid); + if (resultBean.getData() != null) { + AppCrmSolutions finNormal = new AppCrmSolutions(); + BeanUtil.copyProperties(resultBean.getData(), finNormal); + List financeForms = resultBean.getData().getFinanceForms(); + if (!financeForms.isEmpty()) { + List voList = Optional.ofNullable(financeForms).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), CrmSolutionListVo.class)).collect(Collectors.toList()); + finNormal.setFinanceForms(voList); + } + appCrmVehicleDemandParticularsVo.setFinNormal(finNormal); + } + } + + return rb.success().setData(appCrmVehicleDemandParticularsVo); } /** @@ -534,7 +601,7 @@ public class CrmVehicledemandService extends MybatisBaseService fjApplicationAppendxs; @ApiModelProperty("证件") private List zjApplicationAppendxs; // 证件 + @ApiModelProperty("车辆买卖合同附件信息") + private List carBuyContractImages; @ApiModelProperty("客户开票申请书") private List khkpsqsApplicationAppendxs; // 客户开票申请书 @ApiModelProperty("开票信息确认书") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java index 78a97a7414..e05e5e7831 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java @@ -153,6 +153,8 @@ public class FinBillApplicationDto implements Dto { private List finBillVehicles; @ApiModelProperty("开票挂车信息") private List finBillTrailers; + @ApiModelProperty("车辆买卖合同附件信息") + private List carBuyContractImages = new ArrayList<>(); @ApiModelProperty("客户开票申请书附件信息") private List khkpsqsApplicationAppendxs = new ArrayList<>(); @ApiModelProperty("款项确认书附件信息") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/flowable/FinBillCompleteDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/flowable/FinBillCompleteDto.java index dc7f4209e1..5b9d45efca 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/flowable/FinBillCompleteDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/flowable/FinBillCompleteDto.java @@ -39,6 +39,8 @@ public class FinBillCompleteDto implements Dto { @NotBlank(message = "参数错误：businessSid") private String businessSid; + @ApiModelProperty("车辆买卖合同") + private List carBuyContractImages = new ArrayList<>(); @ApiModelProperty("客户开票申请书附件信息") private List khkpsqsApplicationAppendxs = new ArrayList<>(); @ApiModelProperty("款项确认书附件信息") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinAttachTypeEnum.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinAttachTypeEnum.java index 849ef52b2e..df543e8a89 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinAttachTypeEnum.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinAttachTypeEnum.java @@ -12,7 +12,8 @@ public enum FinAttachTypeEnum { CLDJHT("003", "车辆登记合同"), ZJ("004", "证件"), FJ("005", "附件"), - QKLPFJ("006", "欠款领票附件"); + QKLPFJ("006", "欠款领票附件"), + CLMMHT("007", "车辆买卖合同"); /** * 附件类型 diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index 29e7274f42..6b62297cd0 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -385,6 +385,7 @@ public class FinBillApplicationService extends MybatisBaseService finBillTrailers = dto.getFinBillTrailers(); List finBillVehicles = dto.getFinBillVehicles(); + List carBuyContractImages = dto.getCarBuyContractImages(); List khkpsqsApplicationAppendxs = dto.getKhkpsqsApplicationAppendxs(); List kpxxqrsApplicationAppendxs = dto.getKpxxqrsApplicationAppendxs(); List cldjhtApplicationAppendxs = dto.getCldjhtApplicationAppendxs(); @@ -415,6 +416,16 @@ public class FinBillApplicationService extends MybatisBaseService -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + finBillFileDto.setFileUrl(filePath); + finBillFileDto.setBillAppSid(finBillApplication.getSid()); + finBillFileDto.setAttachType(FinAttachTypeEnum.CLMMHT.getAttachType()); + finBillFileService.saveOrUpdateDto(finBillFileDto); + } for (FinBillFileDto finBillFileDto : khkpsqsApplicationAppendxs) { String filePath = finBillFileDto.getFileUrl(); if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { @@ -465,6 +476,18 @@ public class FinBillApplicationService extends MybatisBaseService -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + finBillFileDto.setFileUrl(filePath); + finBillFileDto.setBillAppSid(finBillApplication.getSid()); + finBillFileDto.setAttachType(FinAttachTypeEnum.CLMMHT.getAttachType()); + finBillFileService.saveOrUpdateDto(finBillFileDto); + } + } if (khkpsqsApplicationAppendxs != null) { for (FinBillFileDto finBillFileDto : khkpsqsApplicationAppendxs) { String filePath = finBillFileDto.getFileUrl(); @@ -598,6 +621,13 @@ public class FinBillApplicationService extends MybatisBaseService clmmhtApplicationAppendxs = finBillFileService.fetchclmmhtBySid(sid); + for (FinBillFileVo clmmhtApplicationAppendx : clmmhtApplicationAppendxs) { + String fileUrl = clmmhtApplicationAppendx.getFileUrl(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + fileUrl = urlPrefix + fileUrl; + clmmhtApplicationAppendx.setFileUrl(fileUrl); + } List khkpsqsApplicationAppendxs = finBillFileService.fetchkhkpsqsBySid(sid); for (FinBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) { String fileUrl = khkpsqsApplicationAppendx.getFileUrl(); @@ -640,6 +670,7 @@ public class FinBillApplicationService extends MybatisBaseService finBillVehicles = dto.getFinBillVehicles(); for (FinBillVehicleDto finBillVehicle : finBillVehicles) { - BaseVehicleState baseVehicleState = baseVehicleStateFeign.selectByVinSid(finBillVehicle.getVehSid()).getData(); + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(dto.getContractNo(), finBillVehicle.getVehSid()).getData(); + BaseVehicleState baseVehicleState = baseVehicleStateFeign.selectByBusSid(busSalesOrderVehicle.getSid()).getData(); if (baseVehicleState == null){ return rb.setMsg("车架号" + finBillVehicle.getVinNo() + "已发起过欠款提车或欠款开票，请重新选择"); } @@ -3434,6 +3466,7 @@ public class FinBillApplicationService extends MybatisBaseService carBuyContractImages = query.getCarBuyContractImages(); List khkpsqsApplicationAppendxs = query.getKhkpsqsApplicationAppendxs(); List kpxxqrsApplicationAppendxs = query.getKpxxqrsApplicationAppendxs(); List cldjhtApplicationAppendxs = query.getCldjhtApplicationAppendxs(); @@ -3475,6 +3508,18 @@ public class FinBillApplicationService extends MybatisBaseService 0) { + for (FinBillFileDto finBillFileDto : carBuyContractImages) { + String filePath = finBillFileDto.getFileUrl(); + if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + finBillFileDto.setFileUrl(filePath); + finBillFileDto.setBillAppSid(businessSid); + finBillFileDto.setAttachType(FinAttachTypeEnum.CLMMHT.getAttachType()); + finBillFileService.saveOrUpdateDto(finBillFileDto); + } + } if (khkpsqsApplicationAppendxs.size() > 0) { for (FinBillFileDto finBillFileDto : khkpsqsApplicationAppendxs) { String filePath = finBillFileDto.getFileUrl(); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.java index e241227366..d4a64f143f 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.java @@ -92,5 +92,8 @@ public interface FinBillFileMapper extends BaseMapper { @Select("select * from fin_bill_file where billAppSid = #{sid} and attachType = '006'") List fetchqklpfjBySid(String sid); + @Select("select * from fin_bill_file where billAppSid = #{sid} and attachType = '007'") + List fetchclmmhtBySid(String sid); + List fetchFileByBillSid(@Param("sid") String sid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java index 9ba5589ee6..6aeb138e39 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java @@ -173,4 +173,8 @@ public class FinBillFileService extends MybatisBaseService fetchqklpfjBySid(String sid) { return baseMapper.fetchqklpfjBySid(sid); } + + public List fetchclmmhtBySid(String sid) { + return baseMapper.fetchclmmhtBySid(sid); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 9bfd234fcd..4a1171e64e 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -527,7 +527,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService payConfirmFiles = dto.getPayConfirmFiles(); if (payConfirmFiles.size() > 0) { diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDto.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDto.java index 2789ac42df..8ba3451a4d 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDto.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDto.java @@ -75,7 +75,8 @@ public class SysStaffinfoDto implements Dto { @ApiModelProperty(value = "住址", required = false) private String address; @ApiModelProperty(value = "手机号", required = true) - @Pattern(regexp = "^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|(19[1,3,5-9])|166|(147))\\d{8}$", message = "手机号码格式不正确") +// @Pattern(regexp = "^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|(19[1,3,5-9])|166|(147))\\d{8}$", message = "手机号码格式不正确") + @Pattern(regexp = "^[0-9]{11}$", message = "手机号码格式不正确") @NotBlank(message = "手机号不能为空") private String mobile; @ApiModelProperty(value = "邮箱", required = false) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfile/LoanFile.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfile/LoanFile.java new file mode 100644 index 0000000000..979ae52b81 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfile/LoanFile.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.riskcenter.api.loanfile; + +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author fan + * @Date 2022/11/14 22:40 + * @Description + */ +@Data +public class LoanFile extends BaseEntity { + private static final long serialVersionUID = -1625798325169874963L; + @ApiModelProperty("关联sid") + private String linkSid; + @ApiModelProperty("文件类型") + private String fileType; + @ApiModelProperty("附件类型") + private String attachType; + @ApiModelProperty("文件名") + private String fileName; + @ApiModelProperty("文件大小") + private String fileSize; + @ApiModelProperty("文件路径") + private String filePath; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfile/LoanFileEnum.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfile/LoanFileEnum.java new file mode 100644 index 0000000000..3885737688 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfile/LoanFileEnum.java @@ -0,0 +1,41 @@ +package com.yxt.anrui.riskcenter.api.loanfile; + +/** + * @Author fan + * @Date 2022/11/14 22:46 + * @Description + */ +public enum LoanFileEnum { + + REGISTRATION_FILES_ONE("001", "登记证（1、2页）"), + REGISTRATION_FILES_TWO("002", "登记证（3、4页）"), + TAXI_FILES("003", "营运证"), + DRIVING_CARD_FILES("004", "行驶证"), + ; + + + /** + * 附件类型 + */ + private final String attachType; + + /** + * 代号 + */ + private final String mark; + + LoanFileEnum(String attachType, String mark) { + this.attachType = attachType; + this.mark = mark; + } + + public String getAttachType() { + return attachType; + } + + public String getMark() { + return mark; + } + + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomeVisitInvestigateInitCustomerVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomeVisitInvestigateInitCustomerVo.java index febf9df69a..0c515c8d3a 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomeVisitInvestigateInitCustomerVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomeVisitInvestigateInitCustomerVo.java @@ -68,6 +68,4 @@ public class LoanHomeVisitInvestigateInitCustomerVo implements Vo { private String emergencyContactType; @ApiModelProperty("紧急联系人类型key") private String emergencyContactTypeKey; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomeVisitInvestigateSaveCustomerDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomeVisitInvestigateSaveCustomerDto.java index 11cf513244..3bbccaab47 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomeVisitInvestigateSaveCustomerDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomeVisitInvestigateSaveCustomerDto.java @@ -68,6 +68,4 @@ public class LoanHomeVisitInvestigateSaveCustomerDto implements Dto { private String emergencyContactType; @ApiModelProperty("紧急联系人类型key") private String emergencyContactTypeKey; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitJFJZVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitJFJZVo.java index 9279b82092..89676b2b4b 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitJFJZVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitJFJZVo.java @@ -20,6 +20,4 @@ public class LoanHomeVisitInvestigateInitJFJZVo implements Vo { private List indoor; @ApiModelProperty("合影照等") private List groupPhoto; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZCLVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZCLVo.java index 11d1012db9..6fba20cceb 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZCLVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZCLVo.java @@ -16,6 +16,4 @@ public class LoanHomeVisitInvestigateInitZCLVo implements Vo { private List houseProperty; @ApiModelProperty("车辆") private List carProperty; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZMWJVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZMWJVo.java index 9157aecc18..0ed9f74bef 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZMWJVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZMWJVo.java @@ -30,6 +30,4 @@ public class LoanHomeVisitInvestigateInitZMWJVo implements Vo { private List guarantorAccount; @ApiModelProperty("是否有配偶") private Boolean spouseState = true; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateSaveJFJZDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateSaveJFJZDto.java index 5f2b14b9af..8257131efc 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateSaveJFJZDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateSaveJFJZDto.java @@ -21,6 +21,4 @@ public class LoanHomeVisitInvestigateSaveJFJZDto implements Vo { private List indoor = new ArrayList<>();; @ApiModelProperty("合影照等") private List groupPhoto = new ArrayList<>();; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateSaveZCLDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateSaveZCLDto.java index 9a2ac4f324..54dbc80506 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateSaveZCLDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateSaveZCLDto.java @@ -16,6 +16,4 @@ public class LoanHomeVisitInvestigateSaveZCLDto implements Vo { private List houseProperty; @ApiModelProperty("车辆") private List carProperty; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateSaveZMWJDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateSaveZMWJDto.java index 93506b9e2a..c4d21dbae9 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateSaveZMWJDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateSaveZMWJDto.java @@ -28,6 +28,4 @@ public class LoanHomeVisitInvestigateSaveZMWJDto implements Vo { private List guarantorIdCard; @ApiModelProperty("担保人户口本") private List guarantorAccount; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateoperations/LoanHomeVisitInvestigateInitOperVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateoperations/LoanHomeVisitInvestigateInitOperVo.java index c89751f3b5..2c32fb310f 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateoperations/LoanHomeVisitInvestigateInitOperVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateoperations/LoanHomeVisitInvestigateInitOperVo.java @@ -18,6 +18,4 @@ public class LoanHomeVisitInvestigateInitOperVo implements Vo { private String operationType; @ApiModelProperty("运营方式key") private String operationKey; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateoperations/LoanHomeVisitInvestigateSaveOperDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateoperations/LoanHomeVisitInvestigateSaveOperDto.java index 0bebc8f024..baa45040df 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateoperations/LoanHomeVisitInvestigateSaveOperDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateoperations/LoanHomeVisitInvestigateSaveOperDto.java @@ -18,6 +18,4 @@ public class LoanHomeVisitInvestigateSaveOperDto implements Vo { private String operationType; @ApiModelProperty("运营方式key") private String operationKey; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomeVisitInvestigateInitOrderVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomeVisitInvestigateInitOrderVo.java index 5fdeea1df6..dde4da015f 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomeVisitInvestigateInitOrderVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomeVisitInvestigateInitOrderVo.java @@ -28,6 +28,4 @@ public class LoanHomeVisitInvestigateInitOrderVo implements Vo { private String paymentRatiokey; @ApiModelProperty("金融首付比例备注") private String paymentRemarks; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomeVisitInvestigateSaveOrderDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomeVisitInvestigateSaveOrderDto.java index 964d2d6c35..59fee67654 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomeVisitInvestigateSaveOrderDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomeVisitInvestigateSaveOrderDto.java @@ -28,6 +28,4 @@ public class LoanHomeVisitInvestigateSaveOrderDto implements Vo { private String paymentRatiokey; @ApiModelProperty("金融首付比例备注") private String paymentRemarks; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomeVisitInvestigateInitPropVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomeVisitInvestigateInitPropVo.java index ce0e318a5c..9f93be5e6d 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomeVisitInvestigateInitPropVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomeVisitInvestigateInitPropVo.java @@ -36,6 +36,4 @@ public class LoanHomeVisitInvestigateInitPropVo implements Vo { private String otherIncomeKey; @ApiModelProperty("其他收入来源") private String otherIncome; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomeVisitInvestigateSavePropDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomeVisitInvestigateSavePropDto.java index 16e3f47e1a..1125c0be6a 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomeVisitInvestigateSavePropDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomeVisitInvestigateSavePropDto.java @@ -36,6 +36,4 @@ public class LoanHomeVisitInvestigateSavePropDto implements Vo { private String otherIncomeKey; @ApiModelProperty("其他收入来源") private String otherIncome; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomeVisitInvestigateInitTranVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomeVisitInvestigateInitTranVo.java index 93fe236e97..be2dc62b1e 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomeVisitInvestigateInitTranVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomeVisitInvestigateInitTranVo.java @@ -38,6 +38,4 @@ public class LoanHomeVisitInvestigateInitTranVo implements Vo { private String income; @ApiModelProperty("净收入") private String netIncome; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomeVisitInvestigateSaveTranDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomeVisitInvestigateSaveTranDto.java index 96c0129f2b..d0d08205c0 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomeVisitInvestigateSaveTranDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomeVisitInvestigateSaveTranDto.java @@ -38,6 +38,4 @@ public class LoanHomeVisitInvestigateSaveTranDto implements Vo { private String income; @ApiModelProperty("净收入") private String netIncome; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransact.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransact.java new file mode 100644 index 0000000000..3a6ef7ab4c --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransact.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.riskcenter.api.loanmortgageinformationtransact; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author Administrator + * @description + * @date 2023/8/16 14:34 + */ +@Data +@ApiModel(value = "抵押资料办理", description = "抵押资料办理") +@TableName("loan_mortgage_information_transact") +public class LoanMortgageInformationTransact extends BaseEntity { + @ApiModelProperty("销售订单sid") + private String salesOrderSid; + @ApiModelProperty("抵押日期") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date mortgageDate = new Date(); + @ApiModelProperty("业务车辆sid") + private String busVinSid; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("使用组织名称") + private String useOrgName; + @ApiModelProperty("使用组织全路径") + private String orgSidPath; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactDetailsVo.java new file mode 100644 index 0000000000..6db5d7c567 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactDetailsVo.java @@ -0,0 +1,39 @@ +package com.yxt.anrui.riskcenter.api.loanmortgageinformationtransact; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/8/21 9:13 + */ +@Data +public class LoanMortgageInformationTransactDetailsVo implements Vo { + @ApiModelProperty("业务车辆sid") + private String busVinSid; + @ApiModelProperty("消贷合同编号") + private String contractId; + @ApiModelProperty("贷款人") + private String borrowerName; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("抵押日期") + private String mortgageDate; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("登记证 1-2页") + private List registrationFiles1 = new ArrayList<>(); + @ApiModelProperty("登记证 3-4页") + private List registrationFiles2 = new ArrayList<>(); + @ApiModelProperty("营运证") + private List taxiFiles = new ArrayList<>(); + @ApiModelProperty("行驶证") + private List drivingFiles = new ArrayList<>(); +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactDto.java new file mode 100644 index 0000000000..56d8f2c7da --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactDto.java @@ -0,0 +1,33 @@ +package com.yxt.anrui.riskcenter.api.loanmortgageinformationtransact; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/8/21 9:12 + */ +@Data +public class LoanMortgageInformationTransactDto implements Dto { + @ApiModelProperty("业务车辆sid") + private String busVinSid; + @ApiModelProperty("抵押日期") + private Date mortgageDate; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("登记证 1-2页") + private List registrationFiles1 = new ArrayList<>(); + @ApiModelProperty("登记证 3-4页") + private List registrationFiles2 = new ArrayList<>(); + @ApiModelProperty("营运证") + private List taxiFiles = new ArrayList<>(); + @ApiModelProperty("行驶证") + private List drivingFiles = new ArrayList<>(); +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactFeign.java new file mode 100644 index 0000000000..809f79d6f3 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactFeign.java @@ -0,0 +1,68 @@ +package com.yxt.anrui.riskcenter.api.loanmortgageinformationtransact; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + + +/** + * @description: 抵押办理 + * @author: fan + * @date: 2023/7/6 + **/ +@Api(tags = "抵押办理") +@FeignClient( + contextId = "anrui-riskcenter-LoanMortgageInformationTransact", + name = "anrui-riskcenter", + path = "v1/loanmortgageinformationtransact", + fallback = LoanMortgageInformationTransactFeignFallback.class) +public interface LoanMortgageInformationTransactFeign { + + /** + * 根据条件分页查询数据的列表（已测试） + * + * @param pq + */ + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + /** + * 保存 抵押办理 + * + * @param + */ + @ApiOperation("保存抵押办理") + @PostMapping("/saveMortgageInfo") + public ResultBean saveMortgageInfo(@RequestBody LoanMortgageInformationTransactDto dto); + + + /** + * 保存 抵押办理 + * + * @param + */ + @ApiOperation("提交") + @PostMapping("/submitMortgageInfo") + public ResultBean submitMortgageInfo(@RequestBody LoanMortgageInformationTransactDto dto); + + + /** + * 初始化详情 + * + * @param + */ + @ApiOperation("初始化详情") + @GetMapping("/getMortgageInfo") + @ResponseBody + public ResultBean getMortgageInfo(@RequestParam("busVinSid") String busVinSid); + + + + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactFeignFallback.java new file mode 100644 index 0000000000..84d4926e80 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactFeignFallback.java @@ -0,0 +1,35 @@ +package com.yxt.anrui.riskcenter.api.loanmortgageinformationtransact; + +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; + +/** + * @author Administrator + * @description + * @date 2023/8/16 14:36 + */ +@Component +public class LoanMortgageInformationTransactFeignFallback implements LoanMortgageInformationTransactFeign { + + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean saveMortgageInfo(LoanMortgageInformationTransactDto dto) { + return null; + } + + @Override + public ResultBean submitMortgageInfo(LoanMortgageInformationTransactDto dto) { + return null; + } + + @Override + public ResultBean getMortgageInfo(String busVinSid) { + return null; + } +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactQuery.java new file mode 100644 index 0000000000..e0258bd34b --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactQuery.java @@ -0,0 +1,29 @@ +package com.yxt.anrui.riskcenter.api.loanmortgageinformationtransact; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/8/16 15:05 + */ +@Data +public class LoanMortgageInformationTransactQuery implements Query { + + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("组织全路径") + private String orgPath; + @ApiModelProperty("菜单sid") + private String menuSid; + @ApiModelProperty("菜单url") + private String menuUrl; + @ApiModelProperty("合同编号/贷款人姓名/车架号") + private String names; + @ApiModelProperty("“” 全部 1待抵押 2已抵押") + private String type; + + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactVo.java new file mode 100644 index 0000000000..e7d077c533 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactVo.java @@ -0,0 +1,43 @@ +package com.yxt.anrui.riskcenter.api.loanmortgageinformationtransact; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author Administrator + * @description + * @date 2023/8/16 15:04 + */ +@Data +public class LoanMortgageInformationTransactVo implements Vo { + @ApiModelProperty("销售订单sid") + private String salesOrderSid; + @ApiModelProperty("抵押日期") + private String disbursementDate; + @ApiModelProperty("业务车辆sid") + private String sid; + @ApiModelProperty("消贷合同编号") + private String contractId; + @ApiModelProperty("分公司") + private String company; + @ApiModelProperty("销售部门") + private String department; + @ApiModelProperty("销售专员") + private String salesman; + @ApiModelProperty("贷款人") + private String lenderName; + @ApiModelProperty("车架号") + private String vin; + @ApiModelProperty("资方") + private String bankName; + private String createBySid; + private String orgSidPath; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; + private boolean showHandleBtn; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeign.java index ec2d10d761..664e294f33 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeign.java @@ -110,6 +110,10 @@ public interface LoanSolutionsFeign { @PostMapping("/selectDetails2") ResultBean selectDetails2(@RequestParam("salesOrderSid") String busSid); + @ApiOperation("客户洽谈金融方案初始化") + @PostMapping("/selectDetails3") + ResultBean selectDetails3(@RequestParam("salesOrderSid") String busSid); + @ApiOperation("移动端计算初始化") @PostMapping("/details2") ResultBean details2(@RequestBody SolutionssQuery query); diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeignFallback.java index fc24b59a3a..6c245868d9 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeignFallback.java @@ -78,6 +78,11 @@ public class LoanSolutionsFeignFallback implements LoanSolutionsFeign { return null; } + @Override + public ResultBean selectDetails3(String busSid) { + return null; + } + @Override public ResultBean details2(SolutionssQuery query) { return null; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanAuditInfoDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanAuditInfoDto.java new file mode 100644 index 0000000000..b48b480e32 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanAuditInfoDto.java @@ -0,0 +1,37 @@ +package com.yxt.anrui.riskcenter.api.loanwarrantinformation; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/8/28 17:44 + */ +@Data +public class LoanAuditInfoDto implements Dto { + @ApiModelProperty("业务sid") + private String sid; + @ApiModelProperty("消贷合同编号") + private String contractNo; + @ApiModelProperty("客户名称") + private String borrowerName; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("资方名称") + private String bankName; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("登记证 1-2页") + private List registrationFiles1 = new ArrayList<>(); + @ApiModelProperty("登记证 3-4页") + private List registrationFiles2 = new ArrayList<>(); + @ApiModelProperty("营运证") + private List taxiFiles = new ArrayList<>(); + @ApiModelProperty("行驶证") + private List drivingFiles = new ArrayList<>(); +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanAuditInfoVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanAuditInfoVo.java new file mode 100644 index 0000000000..bb59679b9a --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanAuditInfoVo.java @@ -0,0 +1,37 @@ +package com.yxt.anrui.riskcenter.api.loanwarrantinformation; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/8/28 17:33 + */ +@Data +public class LoanAuditInfoVo implements Vo { + @ApiModelProperty("业务sid") + private String sid; + @ApiModelProperty("消贷合同编号") + private String contractNo; + @ApiModelProperty("客户名称") + private String borrowerName; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("资方名称") + private String bankName; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("登记证 1-2页") + private List registrationFiles1 = new ArrayList<>(); + @ApiModelProperty("登记证 3-4页") + private List registrationFiles2 = new ArrayList<>(); + @ApiModelProperty("营运证") + private List taxiFiles = new ArrayList<>(); + @ApiModelProperty("行驶证") + private List drivingFiles = new ArrayList<>(); +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanTransferInfoDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanTransferInfoDto.java new file mode 100644 index 0000000000..2bdfa5c5df --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanTransferInfoDto.java @@ -0,0 +1,33 @@ +package com.yxt.anrui.riskcenter.api.loanwarrantinformation; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/8/21 9:12 + */ +@Data +public class LoanTransferInfoDto implements Dto { + private String[] sids; + @ApiModelProperty("移交资料") + private String transferInformation; + @ApiModelProperty("送达日期") + private String deliveryDate; + @ApiModelProperty("快递单号") + private String trackingNo; + @ApiModelProperty("移交方式key") + private String transferWayKey; + @ApiModelProperty("移交方式value") + private String transferWayValue; + @ApiModelProperty("接收人/签收人") + private String recipient; + @ApiModelProperty("移交备注") + private String transferRemarks; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanTransferInfoVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanTransferInfoVo.java new file mode 100644 index 0000000000..6529a8f521 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanTransferInfoVo.java @@ -0,0 +1,37 @@ +package com.yxt.anrui.riskcenter.api.loanwarrantinformation; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author Administrator + * @description + * @date 2023/8/29 9:04 + */ +@Data +public class LoanTransferInfoVo implements Vo { + @ApiModelProperty("资方") + private String bankName; + @ApiModelProperty("消贷合同号") + private String contractNo; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("移交资料") + private String transferInformation; + @ApiModelProperty("送达日期") + private String deliveryDate; + @ApiModelProperty("快递单号") + private String trackingNo; + @ApiModelProperty("移交方式key") + private String transferWayKey; + @ApiModelProperty("移交方式value") + private String transferWayValue; + @ApiModelProperty("接收人/签收人") + private String recipient; + @ApiModelProperty("移交备注") + private String transferRemarks; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformation.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformation.java new file mode 100644 index 0000000000..854e47e3a4 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformation.java @@ -0,0 +1,64 @@ +package com.yxt.anrui.riskcenter.api.loanwarrantinformation; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author Administrator + * @description + * @date 2023/8/16 14:34 + */ +@Data +@ApiModel(value = "权证资料管理", description = "权证资料管理") +@TableName("loan_warrant_information") +public class LoanWarrantInformation extends BaseEntity { + @ApiModelProperty("销售订单sid") + private String salesOrderSid; + @ApiModelProperty("审核状态key") + private String auditStateKey; + @ApiModelProperty("审核状态Value") + private String auditStateValue; + @ApiModelProperty("送达日期") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date deliveryDate; + @ApiModelProperty("业务车辆sid") + private String busVinSid; + @ApiModelProperty("移交资料") + private String transferInformation; + @ApiModelProperty("移交备注") + private String transferRemarks; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date transferDate; + @ApiModelProperty("消贷合同号") + private String contractNo; + @ApiModelProperty("销售部门") + private String department; + @ApiModelProperty("销售专员") + private String salesman; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("资方") + private String bankName; + @ApiModelProperty("贷款人") + private String borrowerName; + @ApiModelProperty("快递单号") + private String trackingNo; + @ApiModelProperty("移交方式key") + private String transferWayKey; + @ApiModelProperty("移交方式value") + private String transferWayValue; + @ApiModelProperty("接收人/签收人") + private String recipient; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("使用组织名称") + private String useOrgName; + @ApiModelProperty("使用组织全路径") + private String orgSidPath; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationDetailsVo.java new file mode 100644 index 0000000000..bb9f792e13 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationDetailsVo.java @@ -0,0 +1,37 @@ +package com.yxt.anrui.riskcenter.api.loanwarrantinformation; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/8/21 9:13 + */ +@Data +public class LoanWarrantInformationDetailsVo implements Vo { + @ApiModelProperty("业务车辆sid") + private String busVinSid; + @ApiModelProperty("消贷合同编号") + private String contractId; + @ApiModelProperty("贷款人") + private String borrowerName; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("抵押日期") + private String mortgageDate; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("登记证 1-2页") + private List registrationFiles1 = new ArrayList<>(); + @ApiModelProperty("登记证 3-4页") + private List registrationFiles2 = new ArrayList<>(); + @ApiModelProperty("营运证") + private List taxiFiles = new ArrayList<>(); + @ApiModelProperty("行驶证") + private List drivingFiles = new ArrayList<>(); +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationFeign.java new file mode 100644 index 0000000000..0cf04dddb5 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationFeign.java @@ -0,0 +1,88 @@ +package com.yxt.anrui.riskcenter.api.loanwarrantinformation; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + + +/** + * @description: 抵押办理 + * @author: fan + * @date: 2023/7/6 + **/ +@Api(tags = "抵押办理") +@FeignClient( + contextId = "anrui-riskcenter-LoanWarrantInformation", + name = "anrui-riskcenter", + path = "v1/loanwarrantinformation", + fallback = LoanWarrantInformationFeignFallback.class) +public interface LoanWarrantInformationFeign { + + /** + * 根据条件分页查询数据的列表（已测试） + * + * @param pq + */ + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + + /** + * 审核回显 + * + * @param + */ + @ApiOperation("审核回显") + @GetMapping("/getAuditInfo") + @ResponseBody + public ResultBean getAuditInfo(@RequestParam("sid") String sid); + + + /** + * 审核保存 + * + * @param + */ + @ApiOperation("审核保存") + @PostMapping("/saveWarrantInfo") + public ResultBean saveWarrantInfo(@RequestBody LoanAuditInfoDto dto); + + + /** + * 审核通过 + * + * @param + */ + @ApiOperation("审核通过") + @PostMapping("/approvedWarrantInfo") + public ResultBean approvedWarrantInfo(@RequestBody LoanAuditInfoDto dto); + + + + /** + * 移交回显 + * + * @param + */ + @ApiOperation("移交回显") + @PostMapping("/transferInfo") + @ResponseBody + public ResultBean transferInfo(@RequestBody String[] sids); + + /** + * 移交保存 + * + * @param + */ + @ApiOperation("移交保存") + @PostMapping("/saveTransferInfo") + public ResultBean saveTransferInfo(@RequestBody LoanTransferInfoDto dto); + + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationFeignFallback.java new file mode 100644 index 0000000000..c7ba673fc9 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationFeignFallback.java @@ -0,0 +1,48 @@ +package com.yxt.anrui.riskcenter.api.loanwarrantinformation; + +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; + +/** + * @author Administrator + * @description + * @date 2023/8/16 14:36 + */ +@Component +public class LoanWarrantInformationFeignFallback implements LoanWarrantInformationFeign { + + + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean getAuditInfo(String sid) { + return null; + } + + @Override + public ResultBean saveWarrantInfo(LoanAuditInfoDto dto) { + return null; + } + + @Override + public ResultBean transferInfo(String[] sids) { + return null; + } + + @Override + public ResultBean saveTransferInfo(LoanTransferInfoDto dto) { + return null; + } + + @Override + public ResultBean approvedWarrantInfo(LoanAuditInfoDto dto) { + return null; + } + + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationQuery.java new file mode 100644 index 0000000000..7d05ec424b --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationQuery.java @@ -0,0 +1,44 @@ +package com.yxt.anrui.riskcenter.api.loanwarrantinformation; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/8/16 15:05 + */ +@Data +public class LoanWarrantInformationQuery implements Query { + + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("组织全路径") + private String orgPath; + @ApiModelProperty("菜单sid") + private String menuSid; + @ApiModelProperty("菜单url") + private String menuUrl; + @ApiModelProperty("分公司") + private String company; + @ApiModelProperty("销售部门") + private String department; + @ApiModelProperty("销售专员") + private String salesman; + @ApiModelProperty("贷款人") + private String borrowerName; + @ApiModelProperty("消贷合同编号") + private String contractNo; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("资方") + private String bankName; + @ApiModelProperty("审核状态key") + private String auditStateKey; + @ApiModelProperty("移交开始日期") + private String startTime; + @ApiModelProperty("移交结束日期") + private String endTime; + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationVo.java new file mode 100644 index 0000000000..efb066feae --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationVo.java @@ -0,0 +1,39 @@ +package com.yxt.anrui.riskcenter.api.loanwarrantinformation; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author Administrator + * @description + * @date 2023/8/16 15:04 + */ +@Data +public class LoanWarrantInformationVo implements Vo { + @ApiModelProperty("sid") + private String sid; + @ApiModelProperty("消贷合同编号") + private String contractNo; + @ApiModelProperty("分公司") + private String company; + @ApiModelProperty("销售部门") + private String department; + @ApiModelProperty("销售专员") + private String salesman; + @ApiModelProperty("贷款人") + private String borrowerName; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("审核状态value") + private String auditStateValue; + @ApiModelProperty("移交日期") + private String transferDate; + @ApiModelProperty("资方") + private String bankName; + @ApiModelProperty("备注") + private String transferRemarks; +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfile/LoanFileMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfile/LoanFileMapper.java new file mode 100644 index 0000000000..5f88624254 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfile/LoanFileMapper.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.riskcenter.biz.loanfile; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile; +import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/11/14 22:44 + * @Description + */ +@Mapper +public interface LoanFileMapper extends BaseMapper { + List selectByLinkSid(@Param("sid") String sid, @Param("attachType") String attachType); + + int deleteByLinkSid(String sid); + + LoanFile selectByLinkSidOne(@Param("sid") String sid, @Param("attachType") String attachType); + + @Delete("delete from loan_file where linkSid = #{sid} and attachType = #{attachType}") + void delByLinkSidOrType(@Param("sid") String sid, @Param("attachType") String attachType); +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfile/LoanFileMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfile/LoanFileMapper.xml new file mode 100644 index 0000000000..874338edb9 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfile/LoanFileMapper.xml @@ -0,0 +1,23 @@ + + + + + + + delete + from loan_file + where linkSid = #{sid} + + + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfile/LoanFileService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfile/LoanFileService.java new file mode 100644 index 0000000000..a08989fed7 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfile/LoanFileService.java @@ -0,0 +1,71 @@ +package com.yxt.anrui.riskcenter.biz.loanfile; + +import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; +import com.yxt.common.base.config.component.FileUploadComponent; +import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.io.File; +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/11/14 22:43 + * @Description + */ +@Service +public class LoanFileService extends MybatisBaseService { + @Autowired + private FileUploadComponent fileUploadComponent; + + public List selectByLinkSid(String sid, String attachType) { + return baseMapper.selectByLinkSid(sid, attachType); + } + + public int deleteByLinkSid(String sid) { + return baseMapper.deleteByLinkSid(sid); + } + + public void saveAll(String sid, List imageFiles, String attachType) { + if (!imageFiles.isEmpty()) { + imageFiles.stream().forEach(str -> { + LoanFile loanFile = new LoanFile(); + File file = new File(fileUploadComponent.getUploadPath() + str.replace("/", File.separator)); + if (file != null) { + loanFile.setFileSize(fileUploadComponent.getPrintSize(file.length())); + } + loanFile.setLinkSid(sid); + loanFile.setFileName(str.substring(str.lastIndexOf("/") + 1, str.lastIndexOf("."))); + loanFile.setFileType(str.substring(str.lastIndexOf(".") + 1)); + loanFile.setAttachType(attachType); + loanFile.setFilePath(str.replace(fileUploadComponent.getUrlPrefix(), "")); + save(loanFile); + }); + } + + } + + public LoanFile selectByLinkSidOne(String sid, String attachType) { + return baseMapper.selectByLinkSidOne(sid, attachType); + } + + public void delByLinkSidOrType(String sid, String attachType) { + baseMapper.delByLinkSidOrType(sid, attachType); + } + + public void saveFile(String sid, String filePath, String attachType) { + LoanFile loanFile = new LoanFile(); + String str = filePath; + File file = new File(fileUploadComponent.getUploadPath() + str.replace("/", File.separator)); + if (file != null) { + loanFile.setFileSize(fileUploadComponent.getPrintSize(file.length())); + } + loanFile.setLinkSid(sid); + loanFile.setFileName(str.substring(str.lastIndexOf("/") + 1, str.lastIndexOf("."))); + loanFile.setFileType(str.substring(str.lastIndexOf(".") + 1)); + loanFile.setAttachType(attachType); + loanFile.setFilePath(str.replace(fileUploadComponent.getUrlPrefix(), "")); + save(loanFile); + } +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java index 6d7efad819..9be0e8c9a6 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java @@ -124,7 +124,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService qw = new QueryWrapper<>(); qw.eq("li.state", query.getType()); - if ("1".equals(query.getType())){ + if ("1".equals(query.getType())) { qw.eq("bb.busNo", 302); } if (StringUtils.isNotBlank(query.getMenuSid())) { @@ -474,7 +474,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService loanHomeVisitInvestigateInitOtherPeoVos = loanHomevisitInvestigateOtherpeoService.selByMainSid(sid); loanHomeVisitInvestigateInitCustomerVo.setOtherPersonnel(loanHomeVisitInvestigateInitOtherPeoVos); - loanHomeVisitInvestigateInitCustomerVo.setMainSid(sid); + loanHomeVisitInvestigateInitCustomerVo.setSid(sid); return rb.success().setData(loanHomeVisitInvestigateInitCustomerVo); } public ResultBean saveHomeVisitCustomerInfo(LoanHomeVisitInvestigateSaveCustomerDto dto) { ResultBean rb = ResultBean.fireFail(); - LoanHomevisitInvestigateCustomerDto loanHomevisitInvestigateCustomerDto = new LoanHomevisitInvestigateCustomerDto(); List otherPersonnel = dto.getOtherPersonnel(); - BeanUtil.copyProperties(dto, loanHomevisitInvestigateCustomerDto); + LoanHomevisitInvestigateCustomerDto loanHomevisitInvestigateCustomerDto = new LoanHomevisitInvestigateCustomerDto(); + LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.selByMainSid(dto.getSid()); + if (loanHomevisitInvestigateCustomerDetailsVo == null) { + BeanUtil.copyProperties(dto, loanHomevisitInvestigateCustomerDto, "sid"); + } else { + BeanUtil.copyProperties(loanHomevisitInvestigateCustomerDetailsVo, loanHomevisitInvestigateCustomerDto); + } loanHomevisitInvestigateCustomerDto.setIsConfirmRealBuyer(dto.getActualBuyer()); loanHomevisitInvestigateCustomerDto.setBorrowerSid(dto.getLenderSid()); loanHomevisitInvestigateCustomerDto.setBorrowerName(dto.getLenderNam()); @@ -532,9 +537,9 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { dwxx = dwxx.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -738,9 +768,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { fwzp = fwzp.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -749,9 +780,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { mkzp = mkzp.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -760,9 +792,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { ktwszp = ktwszp.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -771,9 +804,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { hyzd = hyzd.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -868,16 +902,17 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { dkrsfz = dkrsfz.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -886,9 +921,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { dkrhkb = dkrhkb.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -897,9 +933,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { dkrhyzm = dkrhyzm.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -908,9 +945,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { dkrjsb = dkrjsb.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -919,9 +957,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { dkryhls = dkryhls.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -930,9 +969,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { posfz = posfz.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -941,9 +981,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { pohkb = pohkb.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -952,9 +993,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { dbrsfz = dbrsfz.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -963,9 +1005,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { dbrhkb = dbrhkb.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -1006,16 +1049,17 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { yhk = yhk.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -1024,9 +1068,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { fc = fc.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -1035,9 +1080,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { cl = cl.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -1051,7 +1097,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService yhkImages = new ArrayList<>(); List loanHomevisitInvestigateFileDetailsVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType()); - if (loanHomevisitInvestigateFileDetailsVos != null && loanHomevisitInvestigateFileDetailsVos.size() > 0){ + if (loanHomevisitInvestigateFileDetailsVos != null && loanHomevisitInvestigateFileDetailsVos.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : loanHomevisitInvestigateFileDetailsVos) { yhkImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); } } financeForm12.setFiles(yhkImages); userInfo.add(financeForm12); - if ("0004".equals(loanHomevisitInvestigateCustomerDetailsVo.getMaritalStatusKey())){ + if ("0004".equals(loanHomevisitInvestigateCustomerDetailsVo.getMaritalStatusKey())) { FinanceForm financeForm13 = new FinanceForm(); financeForm13.setValue("配偶"); financeForm13.setSpanSize(2); @@ -1153,7 +1199,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService loanHomeVisitInvestigateInitOtherPeoVos = loanHomevisitInvestigateOtherpeoService.selByMainSid(sid); - if (loanHomeVisitInvestigateInitOtherPeoVos != null && loanHomeVisitInvestigateInitOtherPeoVos.size() > 0){ + if (loanHomeVisitInvestigateInitOtherPeoVos != null && loanHomeVisitInvestigateInitOtherPeoVos.size() > 0) { FinanceForm financeForm20 = new FinanceForm(); financeForm20.setValue("其他人员"); financeForm20.setSpanSize(2); @@ -1272,7 +1318,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService zCInfo = new ArrayList<>(); - if (loanHomevisitInvestigatePropertyDetailsVo.getIsRealEstate()){ + if (loanHomevisitInvestigatePropertyDetailsVo.getIsRealEstate()) { FinanceForm financeForm43 = new FinanceForm(); financeForm43.setValue("房产"); financeForm43.setSpanSize(2); @@ -1281,11 +1327,11 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService { - @Autowired - private FileUploadComponent fileUploadComponent; + @Autowired + private FileUploadComponent fileUploadComponent; - private QueryWrapper createQueryWrapper(LoanHomevisitInvestigateFileQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - LoanHomevisitInvestigateFileQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(LoanHomevisitInvestigateFileDto dto){ + private QueryWrapper createQueryWrapper(LoanHomevisitInvestigateFileQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + LoanHomevisitInvestigateFileQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(LoanHomevisitInvestigateFileDto dto) { String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { this.insertByDto(dto); - return; - } - this.updateByDto(dto); - } - - public void insertByDto(LoanHomevisitInvestigateFileDto dto){ - LoanHomevisitInvestigateFile entity = new LoanHomevisitInvestigateFile(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } - - public void updateByDto(LoanHomevisitInvestigateFileDto dto){ - String dtoSid = dto.getSid(); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(LoanHomevisitInvestigateFileDto dto) { + LoanHomevisitInvestigateFile entity = new LoanHomevisitInvestigateFile(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(LoanHomevisitInvestigateFileDto dto) { + String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { return; - } - LoanHomevisitInvestigateFile entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public LoanHomevisitInvestigateFileDetailsVo fetchDetailsVoBySid(String sid){ - LoanHomevisitInvestigateFile entity = fetchBySid(sid); - LoanHomevisitInvestigateFileDetailsVo vo = new LoanHomevisitInvestigateFileDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } + } + LoanHomevisitInvestigateFile entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public LoanHomevisitInvestigateFileDetailsVo fetchDetailsVoBySid(String sid) { + LoanHomevisitInvestigateFile entity = fetchBySid(sid); + LoanHomevisitInvestigateFileDetailsVo vo = new LoanHomevisitInvestigateFileDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public ResultBean saveOrUpdateAllDto(LoanHomevisitInvestigateFileAllDto dto) { + ResultBean rb = ResultBean.fireFail(); + //定位信息 + for (String dwxxImage : dto.getDwxxImages()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + if (dwxxImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + dwxxImage = dwxxImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(dwxxImage); + loanHomevisitInvestigateFileDto.setSid(dto.getSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DWXX.getAttachType()); + saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //房屋照片 + for (String fwzpImage : dto.getFwzpImages()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + if (fwzpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + fwzpImage = fwzpImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(fwzpImage); + loanHomevisitInvestigateFileDto.setSid(dto.getSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.FWZP.getAttachType()); + saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //门口照片 + for (String mkzpImage : dto.getMkzpImages()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + if (mkzpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + mkzpImage = mkzpImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(mkzpImage); + loanHomevisitInvestigateFileDto.setSid(dto.getSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.MKZP.getAttachType()); + saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //客厅卧室照片 + for (String ktwszpImage : dto.getKtwszpImages()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + if (ktwszpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + ktwszpImage = ktwszpImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(ktwszpImage); + loanHomevisitInvestigateFileDto.setSid(dto.getSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.KTWSZP.getAttachType()); + saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //合影照等 + for (String hyzdImage : dto.getHyzdImages()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + if (hyzdImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + hyzdImage = hyzdImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(hyzdImage); + loanHomevisitInvestigateFileDto.setSid(dto.getSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.HYZD.getAttachType()); + saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //贷款人身份证 + for (String dkrsfzImage : dto.getDkrsfzImages()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + if (dkrsfzImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + dkrsfzImage = dkrsfzImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(dkrsfzImage); + loanHomevisitInvestigateFileDto.setSid(dto.getSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRSFZ.getAttachType()); + saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //贷款人户口本 + for (String dkrhkbImage : dto.getDkrhkbImages()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + if (dkrhkbImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + dkrhkbImage = dkrhkbImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(dkrhkbImage); + loanHomevisitInvestigateFileDto.setSid(dto.getSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRHKB.getAttachType()); + saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //贷款人婚姻证明 + for (String dkrhyzmImage : dto.getDkrhyzmImages()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + if (dkrhyzmImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + dkrhyzmImage = dkrhyzmImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(dkrhyzmImage); + loanHomevisitInvestigateFileDto.setSid(dto.getSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRHYZM.getAttachType()); + saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //贷款人驾驶本 + for (String dkrjsbImage : dto.getDkrjsbImages()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + if (dkrjsbImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + dkrjsbImage = dkrjsbImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(dkrjsbImage); + loanHomevisitInvestigateFileDto.setSid(dto.getSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRJSB.getAttachType()); + saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //贷款人银行流水 + for (String dkryhlsImage : dto.getDkryhlsImages()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + if (dkryhlsImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + dkryhlsImage = dkryhlsImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(dkryhlsImage); + loanHomevisitInvestigateFileDto.setSid(dto.getSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRYHLS.getAttachType()); + saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //配偶身份证 + for (String posfzImage : dto.getPosfzImages()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + if (posfzImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + posfzImage = posfzImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(posfzImage); + loanHomevisitInvestigateFileDto.setSid(dto.getSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.POSFZ.getAttachType()); + saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //配偶户口本 + for (String pohkbImage : dto.getPohkbImages()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + if (pohkbImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + pohkbImage = pohkbImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(pohkbImage); + loanHomevisitInvestigateFileDto.setSid(dto.getSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.POHKB.getAttachType()); + saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //担保人身份证 + for (String dbrsfzImage : dto.getDbrsfzImages()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + if (dbrsfzImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + dbrsfzImage = dbrsfzImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(dbrsfzImage); + loanHomevisitInvestigateFileDto.setSid(dto.getSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DBRSFZ.getAttachType()); + saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //担保人户口本 + for (String dbrhkbImage : dto.getDbrhkbImages()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + if (dbrhkbImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + dbrhkbImage = dbrhkbImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(dbrhkbImage); + loanHomevisitInvestigateFileDto.setSid(dto.getSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DBRHKB.getAttachType()); + saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //银行卡 + for (String yhkImage : dto.getYhkImages()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + if (yhkImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + yhkImage = yhkImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(yhkImage); + loanHomevisitInvestigateFileDto.setSid(dto.getSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.YHK.getAttachType()); + saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //房产 + for (String fcImage : dto.getFcImages()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + if (fcImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + fcImage = fcImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(fcImage); + loanHomevisitInvestigateFileDto.setSid(dto.getSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.FC.getAttachType()); + saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //车辆 + for (String clImage : dto.getClImages()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + if (clImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + clImage = clImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(clImage); + loanHomevisitInvestigateFileDto.setSid(dto.getSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.CL.getAttachType()); + saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + return rb.success(); + } - public ResultBean saveOrUpdateAllDto(LoanHomevisitInvestigateFileAllDto dto) { - ResultBean rb = ResultBean.fireFail(); - //定位信息 - for (String dwxxImage : dto.getDwxxImages()) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - if (dwxxImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - dwxxImage = dwxxImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(dwxxImage); - loanHomevisitInvestigateFileDto.setSid(dto.getSid()); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DWXX.getAttachType()); - saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - //房屋照片 - for (String fwzpImage : dto.getFwzpImages()) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - if (fwzpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - fwzpImage = fwzpImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(fwzpImage); - loanHomevisitInvestigateFileDto.setSid(dto.getSid()); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.FWZP.getAttachType()); - saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - //门口照片 - for (String mkzpImage : dto.getMkzpImages()) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - if (mkzpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - mkzpImage = mkzpImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(mkzpImage); - loanHomevisitInvestigateFileDto.setSid(dto.getSid()); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.MKZP.getAttachType()); - saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - //客厅卧室照片 - for (String ktwszpImage : dto.getKtwszpImages()) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - if (ktwszpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - ktwszpImage = ktwszpImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(ktwszpImage); - loanHomevisitInvestigateFileDto.setSid(dto.getSid()); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.KTWSZP.getAttachType()); - saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - //合影照等 - for (String hyzdImage : dto.getHyzdImages()) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - if (hyzdImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - hyzdImage = hyzdImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(hyzdImage); - loanHomevisitInvestigateFileDto.setSid(dto.getSid()); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.HYZD.getAttachType()); - saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - //贷款人身份证 - for (String dkrsfzImage : dto.getDkrsfzImages()) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - if (dkrsfzImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - dkrsfzImage = dkrsfzImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(dkrsfzImage); - loanHomevisitInvestigateFileDto.setSid(dto.getSid()); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRSFZ.getAttachType()); - saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - //贷款人户口本 - for (String dkrhkbImage : dto.getDkrhkbImages()) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - if (dkrhkbImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - dkrhkbImage = dkrhkbImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(dkrhkbImage); - loanHomevisitInvestigateFileDto.setSid(dto.getSid()); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRHKB.getAttachType()); - saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - //贷款人婚姻证明 - for (String dkrhyzmImage : dto.getDkrhyzmImages()) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - if (dkrhyzmImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - dkrhyzmImage = dkrhyzmImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(dkrhyzmImage); - loanHomevisitInvestigateFileDto.setSid(dto.getSid()); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRHYZM.getAttachType()); - saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - //贷款人驾驶本 - for (String dkrjsbImage : dto.getDkrjsbImages()) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - if (dkrjsbImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - dkrjsbImage = dkrjsbImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(dkrjsbImage); - loanHomevisitInvestigateFileDto.setSid(dto.getSid()); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRJSB.getAttachType()); - saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - //贷款人银行流水 - for (String dkryhlsImage : dto.getDkryhlsImages()) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - if (dkryhlsImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - dkryhlsImage = dkryhlsImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(dkryhlsImage); - loanHomevisitInvestigateFileDto.setSid(dto.getSid()); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRYHLS.getAttachType()); - saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - //配偶身份证 - for (String posfzImage : dto.getPosfzImages()) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - if (posfzImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - posfzImage = posfzImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(posfzImage); - loanHomevisitInvestigateFileDto.setSid(dto.getSid()); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.POSFZ.getAttachType()); - saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - //配偶户口本 - for (String pohkbImage : dto.getPohkbImages()) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - if (pohkbImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - pohkbImage = pohkbImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(pohkbImage); - loanHomevisitInvestigateFileDto.setSid(dto.getSid()); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.POHKB.getAttachType()); - saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - //担保人身份证 - for (String dbrsfzImage : dto.getDbrsfzImages()) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - if (dbrsfzImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - dbrsfzImage = dbrsfzImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(dbrsfzImage); - loanHomevisitInvestigateFileDto.setSid(dto.getSid()); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DBRSFZ.getAttachType()); - saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - //担保人户口本 - for (String dbrhkbImage : dto.getDbrhkbImages()) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - if (dbrhkbImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - dbrhkbImage = dbrhkbImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(dbrhkbImage); - loanHomevisitInvestigateFileDto.setSid(dto.getSid()); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DBRHKB.getAttachType()); - saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - //银行卡 - for (String yhkImage : dto.getYhkImages()) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - if (yhkImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - yhkImage = yhkImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(yhkImage); - loanHomevisitInvestigateFileDto.setSid(dto.getSid()); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.YHK.getAttachType()); - saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - //房产 - for (String fcImage : dto.getFcImages()) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - if (fcImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - fcImage = fcImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(fcImage); - loanHomevisitInvestigateFileDto.setSid(dto.getSid()); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.FC.getAttachType()); - saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - //车辆 - for (String clImage : dto.getClImages()) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - if (clImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - clImage = clImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(clImage); - loanHomevisitInvestigateFileDto.setSid(dto.getSid()); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.CL.getAttachType()); - saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - return rb.success(); - } + public List selByMainSidAndTypeKey(String sid, String attachType) { + return baseMapper.selByMainSidAndTypeKey(sid, attachType, fileUploadComponent.getUrlPrefix()); + } - public List selByMainSidAndTypeKey(String sid, String attachType) { - return baseMapper.selByMainSidAndTypeKey(sid,attachType,fileUploadComponent.getUrlPrefix()); - } + public void delByMainSid(String dtoSid) { + baseMapper.delByMainSid(dtoSid); + } - public void delByMainSid(String dtoSid) { - baseMapper.delByMainSid(dtoSid); - } + public void delByMainSidAndType(String dtoSid, String type) { + baseMapper.delByMainSidAndType(dtoSid, type); + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactMapper.java new file mode 100644 index 0000000000..0099b4a95b --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactMapper.java @@ -0,0 +1,31 @@ +package com.yxt.anrui.riskcenter.biz.loanmortgageinformationtransact; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.riskcenter.api.loanmortgageinformationtransact.LoanMortgageInformationTransact; +import com.yxt.anrui.riskcenter.api.loanmortgageinformationtransact.LoanMortgageInformationTransactDetailsVo; +import com.yxt.anrui.riskcenter.api.loanmortgageinformationtransact.LoanMortgageInformationTransactVo; +import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameter; +import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + + +/** + * @description: + * @author: fan + * @date: 2023/8/21 + **/ +@Mapper +public interface LoanMortgageInformationTransactMapper extends BaseMapper { + + List listPageDo(@Param(Constants.WRAPPER) QueryWrapper qw); + + LoanMortgageInformationTransact fetchByBusVinSid(String busVinSid); + + LoanMortgageInformationTransactDetailsVo getMortgageInfo(String busVinSid); +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactMapper.xml new file mode 100644 index 0000000000..584605ee86 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactRest.java new file mode 100644 index 0000000000..9fa688fec2 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactRest.java @@ -0,0 +1,47 @@ +package com.yxt.anrui.riskcenter.biz.loanmortgageinformationtransact; + + +import com.yxt.anrui.riskcenter.api.loanmortgageinformationtransact.*; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @description: + * @author: fan + * @date: 2023/8/21 + **/ +@Api(tags = "抵押资料办理") +@RestController +@RequestMapping("v1/loanmortgageinformationtransact") +public class LoanMortgageInformationTransactRest implements LoanMortgageInformationTransactFeign { + + @Autowired + private LoanMortgageInformationTransactService loanMortgageInformationTransactService; + + @Override + public ResultBean> listPage(PagerQuery pq) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo page = loanMortgageInformationTransactService.listPage(pq); + return rb.success().setData(page).setMsg(page.getMsg()); + } + + @Override + public ResultBean saveMortgageInfo(LoanMortgageInformationTransactDto dto) { + return loanMortgageInformationTransactService.saveMortgageInfo(dto); + } + + @Override + public ResultBean submitMortgageInfo(LoanMortgageInformationTransactDto dto) { + return loanMortgageInformationTransactService.submitMortgageInfo(dto); + } + + @Override + public ResultBean getMortgageInfo(String busVinSid) { + return loanMortgageInformationTransactService.getMortgageInfo(busVinSid); + } +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java new file mode 100644 index 0000000000..9f88da5254 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java @@ -0,0 +1,621 @@ +package com.yxt.anrui.riskcenter.biz.loanmortgageinformationtransact; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState; +import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign; +import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile; +import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFileEnum; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderVo; +import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontract; +import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractFeign; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; +import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; +import com.yxt.anrui.riskcenter.api.loanmortgageinformationtransact.*; +import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameter; +import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterQuery; +import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo; +import com.yxt.anrui.riskcenter.api.loanwarrantinformation.LoanWarrantInformation; +import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService; +import com.yxt.anrui.riskcenter.biz.loanwarrantinformation.LoanWarrantInformationService; +import com.yxt.common.base.config.component.FileUploadComponent; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + + +/** + * @description: + * @author: fan + * @date: 2023/8/21 + **/ +@Service +public class LoanMortgageInformationTransactService extends MybatisBaseService { + + @Autowired + private SysUserFeign sysUserFeign; + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + private SysOrganizationFeign sysOrganizationFeign; + @Autowired + private BaseVehicleStateFeign baseVehicleStateFeign; + @Autowired + private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign; + @Autowired + private BusSalesOrderFeign busSalesOrderFeign; + @Autowired + private BusSalesOrderLoancontractFeign busSalesOrderLoancontractFeign; + @Autowired + private LoanFileService loanFileService; + @Autowired + private FileUploadComponent fileUploadComponent; + + @Autowired + private LoanWarrantInformationService loanWarrantInformationService; + + /** + * 分页方法 + */ + public List pageBySubList(List list, int pagesize, int currentPage) { + int totalcount = list.size(); + int pagecount = 0; + List subList; + int m = totalcount % pagesize; + if (m > 0) { + pagecount = totalcount / pagesize + 1; + } else { + pagecount = totalcount / pagesize; + } + if (m == 0) { + subList = list.subList((currentPage - 1) * pagesize, pagesize * (currentPage)); + } else { + if (currentPage == pagecount) { + subList = list.subList((currentPage - 1) * pagesize, totalcount); + } else { + subList = list.subList((currentPage - 1) * pagesize, pagesize * (currentPage)); + } + } + return subList; + } + + /** + * 待抵押列表 + * + * @return + */ + public List pageToDo(LoanMortgageInformationTransactQuery query) { + List voList = new ArrayList<>(); + List finalList = new ArrayList<>(); + // 查询车辆状态表 + List busSids = baseVehicleStateFeign.selectBusSidListByBusState("307").getData(); + busSids.removeAll(Collections.singleton(null)); + if (!busSids.isEmpty()) { + for (String busSid : busSids) { + LoanMortgageInformationTransactVo vo = new LoanMortgageInformationTransactVo(); + vo.setShowHandleBtn(true); + vo.setDisbursementDate("-"); + vo.setSid(busSid); + //根据业务车辆sid查询 销售订单业务车辆表 + BusSalesOrderVehicle orderVehicle = busSalesOrderVehicleFeign.details(busSid).getData(); + if (null != orderVehicle) { + if (StringUtils.isNotBlank(orderVehicle.getLinkNo())) { + vo.setVin(orderVehicle.getLinkNo()); + } + String salesOrderSid = orderVehicle.getSalesOrderSid(); + vo.setSalesOrderSid(salesOrderSid); + BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(salesOrderSid).getData(); + if (null != salesOrder) { + //创建人sid + if (StringUtils.isNotBlank(salesOrder.getCreateBySid())) { + vo.setCreateBySid(salesOrder.getCreateBySid()); + } + //销售部门 + if (StringUtils.isNotBlank(salesOrder.getOrgName())) { + vo.setDepartment(salesOrder.getOrgName()); + } + //销售专员 + if (StringUtils.isNotBlank(salesOrder.getStaffName())) { + vo.setSalesman(salesOrder.getStaffName()); + } + //分公司 + if (StringUtils.isNotBlank(salesOrder.getUseOrgName())) { + vo.setCompany(salesOrder.getUseOrgName()); + } + //销售订单创建日期 + vo.setCreateTime(salesOrder.getCreateTime()); + //组织全路径 + if (StringUtils.isNotBlank(salesOrder.getOrgSidPath())) { + vo.setOrgSidPath(salesOrder.getOrgSidPath()); + } + //根据销售订单sid查询消贷合同表 + BusSalesOrderLoancontract loancontract = busSalesOrderLoancontractFeign.fetchDetailsByOrderSid(salesOrderSid).getData(); + if (null != loancontract) { + //消贷合同编号 + if (StringUtils.isNotBlank(loancontract.getLoanCotractNo())) { + vo.setContractId(loancontract.getLoanCotractNo()); + } + //贷款人 + if (StringUtils.isNotBlank(loancontract.getBorrowerName())) { + vo.setLenderName(loancontract.getBorrowerName()); + } + //资方 + if (StringUtils.isNotBlank(loancontract.getBankName())) { + vo.setBankName(loancontract.getBankName()); + } + } + } + } + voList.add(vo); + } + } + //========== 数据权限 ============= + String orgPath = ""; + String userSid = ""; + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuSid(query.getMenuSid()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + 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)) { + orgPath = orgSidPath.substring(0, i1); + } else if ("2".equals(orgLevelKey)) { + orgPath = orgSidPath.substring(0, i2); + } else if ("3".equals(orgLevelKey)) { + orgPath = orgSidPath.substring(0, i3); + } else if ("4".equals(orgLevelKey)) { + orgPath = orgSidPath.substring(0, i4); + } else if ("5".equals(orgLevelKey)) { + userSid = query.getUserSid(); + } else { + List p = new ArrayList<>(); + return p; + } + } else { + List p = new ArrayList<>(); + return p; + } +// ================== 最终加上数据权限组装 ======================== + if (!voList.isEmpty()) { + for (LoanMortgageInformationTransactVo vo : voList) { + if (StringUtils.isNotBlank(userSid)) { + if (vo.getCreateBySid().equals(userSid)) { + finalList.add(vo); + } + } else if (StringUtils.isNotBlank(orgPath)) { + if (vo.getOrgSidPath().contains(orgPath)) { + finalList.add(vo); + } + } + } + } + if (!finalList.isEmpty()) { + finalList.sort((t1, t2) -> t2.getCreateTime().compareTo(t1.getCreateTime())); + } + return finalList; + } + + /** + * 已抵押列表 + */ + public List listPageDo(PagerQuery pq) { + LoanMortgageInformationTransactQuery pagerQuery = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + //======================= + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(pagerQuery.getOrgPath()); + privilegeQuery.setMenuSid(pagerQuery.getMenuSid()); + privilegeQuery.setMenuUrl(pagerQuery.getMenuUrl()); + privilegeQuery.setUserSid(pagerQuery.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = pagerQuery.getOrgPath(); + 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("orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("createBySid", pagerQuery.getUserSid()); + } else { + List p = new ArrayList<>(); + return p; + } + } else { + List p = new ArrayList<>(); + return p; + } + //======================= + qw.orderByDesc("createTime"); + List voList = baseMapper.listPageDo(qw); + voList.removeAll(Collections.singleton(null)); + if (!voList.isEmpty()) { + for (LoanMortgageInformationTransactVo vo : voList) { + vo.setShowHandleBtn(false); + //根据业务车辆sid查询 销售订单业务车辆表 + BusSalesOrderVehicle orderVehicle = busSalesOrderVehicleFeign.details(vo.getSid()).getData(); + if (StringUtils.isNotBlank(orderVehicle.getLinkNo())) { + vo.setVin(orderVehicle.getLinkNo()); + } + String salesOrderSid = vo.getSalesOrderSid(); + BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(salesOrderSid).getData(); + if (null != salesOrder) { + //销售部门 + if (StringUtils.isNotBlank(salesOrder.getOrgName())) { + vo.setDepartment(salesOrder.getOrgName()); + } + //销售专员 + if (StringUtils.isNotBlank(salesOrder.getStaffName())) { + vo.setSalesman(salesOrder.getStaffName()); + } + //分公司 + if (StringUtils.isNotBlank(salesOrder.getUseOrgName())) { + vo.setCompany(salesOrder.getUseOrgName()); + } + //根据销售订单sid查询消贷合同表 + BusSalesOrderLoancontract loancontract = busSalesOrderLoancontractFeign.fetchDetailsByOrderSid(salesOrderSid).getData(); + if (null != loancontract) { + //消贷合同编号 + if (StringUtils.isNotBlank(loancontract.getLoanCotractNo())) { + vo.setContractId(loancontract.getLoanCotractNo()); + } + //贷款人 + if (StringUtils.isNotBlank(loancontract.getBorrowerName())) { + vo.setLenderName(loancontract.getBorrowerName()); + } + //资方 + if (StringUtils.isNotBlank(loancontract.getBankName())) { + vo.setBankName(loancontract.getBankName()); + } + } + } + } + } + return voList; + } + + /** + * 分页列表 + * + * @param pq + * @return + */ + public PagerVo listPage(PagerQuery pq) { + PagerVo pagerVo = new PagerVo<>(); + LoanMortgageInformationTransactQuery params = pq.getParams(); + // type “” 全部 1待抵押 2已抵押 + if (params.getType().equals("1")) { + List lastList = new ArrayList<>(); + List voList = pageToDo(params); + voList.removeAll(Collections.singleton(null)); + if (!voList.isEmpty()) { + lastList = this.pageBySubList(voList, (int) pq.getSize(), (int) pq.getCurrent()); + pagerVo.setRecords(lastList); + pagerVo.setTotal(voList.size()); + pagerVo.setCurrent(pq.getCurrent()); + pagerVo.setSize(pq.getSize()); + if (voList.size() % pq.getSize() != 0L) { + pagerVo.setPages((voList.size() / pq.getSize()) + 1); + } else { + pagerVo.setPages(voList.size() / pq.getSize()); + } + pagerVo.setMsg("当前共查询到" + voList.size() + "条记录"); + } + } else if (params.getType().equals("2")) { + List lastList = new ArrayList<>(); + List voList = listPageDo(pq); + voList.removeAll(Collections.singleton(null)); + if (!voList.isEmpty()) { + lastList = this.pageBySubList(voList, (int) pq.getSize(), (int) pq.getCurrent()); + pagerVo.setRecords(lastList); + pagerVo.setTotal(voList.size()); + pagerVo.setCurrent(pq.getCurrent()); + pagerVo.setSize(pq.getSize()); + if (voList.size() % pq.getSize() != 0L) { + pagerVo.setPages((voList.size() / pq.getSize()) + 1); + } else { + pagerVo.setPages(voList.size() / pq.getSize()); + } + pagerVo.setMsg("当前共查询到" + voList.size() + "条记录"); + } + } else { + List lastList = new ArrayList<>(); + List voListToDo = pageToDo(params); + List voListDo = listPageDo(pq); + List collect = Stream.concat(voListToDo.stream(), voListDo.stream()).collect(Collectors.toList()); + List pageVoList = new ArrayList<>(); + if (!collect.isEmpty()) { + if (StringUtils.isNotBlank(params.getNames())) { + String names = params.getNames(); + for (LoanMortgageInformationTransactVo vo : collect) { + if (vo.getVin().contains(names) || vo.getContractId().contains(names) || vo.getLenderName().contains(names)) { + pageVoList.add(vo); + } + } + lastList = this.pageBySubList(pageVoList, (int) pq.getSize(), (int) pq.getCurrent()); + lastList.sort((t1, t2) -> t2.getCreateTime().compareTo(t1.getCreateTime())); + pagerVo.setRecords(lastList); + pagerVo.setTotal(pageVoList.size()); + pagerVo.setCurrent(pq.getCurrent()); + pagerVo.setSize(pq.getSize()); + if (pageVoList.size() % pq.getSize() != 0L) { + pagerVo.setPages((pageVoList.size() / pq.getSize()) + 1); + } else { + pagerVo.setPages(pageVoList.size() / pq.getSize()); + } + pagerVo.setMsg("当前共查询到" + pageVoList.size() + "条记录"); + } else { + lastList = this.pageBySubList(collect, (int) pq.getSize(), (int) pq.getCurrent()); + lastList.sort((t1, t2) -> t2.getCreateTime().compareTo(t1.getCreateTime())); + pagerVo.setRecords(lastList); + pagerVo.setTotal(collect.size()); + pagerVo.setCurrent(pq.getCurrent()); + pagerVo.setSize(pq.getSize()); + if (collect.size() % pq.getSize() != 0L) { + pagerVo.setPages((collect.size() / pq.getSize()) + 1); + } else { + pagerVo.setPages(collect.size() / pq.getSize()); + } + pagerVo.setMsg("当前共查询到" + collect.size() + "条记录"); + } + } + } + return pagerVo; + } + + /** + * 保存修改 + * + * @param dto + * @return + */ + @Transactional(rollbackFor = Exception.class) + public ResultBean saveMortgageInfo(LoanMortgageInformationTransactDto dto) { + ResultBean rb = ResultBean.fireFail(); + LoanMortgageInformationTransact entity = baseMapper.fetchByBusVinSid(dto.getBusVinSid()); + // 修改 + if (null != entity) { + entity.setMortgageDate(dto.getMortgageDate()); + entity.setRemarks(dto.getRemarks()); + baseMapper.updateById(entity); + } else { + // 新增 + LoanMortgageInformationTransact saveEntity = new LoanMortgageInformationTransact(); + //根据业务车辆sid查询 销售订单业务车辆表 + BusSalesOrderVehicle orderVehicle = busSalesOrderVehicleFeign.details(dto.getBusVinSid()).getData(); + if (null != orderVehicle) { + String salesOrderSid = orderVehicle.getSalesOrderSid(); + BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(salesOrderSid).getData(); + if (null != salesOrder) { + //创建人sid + if (StringUtils.isNotBlank(salesOrder.getCreateBySid())) { + saveEntity.setCreateBySid(salesOrder.getCreateBySid()); + } + //组织全路径 + if (StringUtils.isNotBlank(salesOrder.getOrgSidPath())) { + saveEntity.setOrgSidPath(salesOrder.getOrgSidPath()); + ResultBean orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(salesOrder.getOrgSidPath()); + if (orgSidByPath.getSuccess()) { + String userOrgSid = orgSidByPath.getData(); + saveEntity.setUseOrgSid(userOrgSid); + ResultBean organizationVo = sysOrganizationFeign.fetchBySid(userOrgSid); + if (organizationVo.getSuccess()) { + SysOrganizationVo organizationVoData = organizationVo.getData(); + if (null != organizationVoData) { + saveEntity.setUseOrgName(organizationVoData.getName()); + } + } + } + } + } + saveEntity.setMortgageDate(dto.getMortgageDate()); + saveEntity.setRemarks(dto.getRemarks()); + saveEntity.setSalesOrderSid(salesOrderSid); + saveEntity.setBusVinSid(dto.getBusVinSid()); + baseMapper.insert(saveEntity); + } + } + //删除附件表中关于该linkSid的文件 + loanFileService.deleteByLinkSid(dto.getBusVinSid()); + List registrationFiles1 = dto.getRegistrationFiles1(); + if (!registrationFiles1.isEmpty()) { + loanFileService.saveAll(dto.getBusVinSid(), registrationFiles1, LoanFileEnum.REGISTRATION_FILES_ONE.getAttachType()); + } + List registrationFiles2 = dto.getRegistrationFiles2(); + if (!registrationFiles2.isEmpty()) { + loanFileService.saveAll(dto.getBusVinSid(), registrationFiles2, LoanFileEnum.REGISTRATION_FILES_TWO.getAttachType()); + } + List taxiFiles = dto.getTaxiFiles(); + if (!taxiFiles.isEmpty()) { + loanFileService.saveAll(dto.getBusVinSid(), taxiFiles, LoanFileEnum.TAXI_FILES.getAttachType()); + } + List drivingFiles = dto.getDrivingFiles(); + if (!drivingFiles.isEmpty()) { + loanFileService.saveAll(dto.getBusVinSid(), drivingFiles, LoanFileEnum.DRIVING_CARD_FILES.getAttachType()); + } + return rb.success().setData(dto.getBusVinSid()); + } + + /** + * 提交 + * + * @param dto + * @return + */ + @Transactional(rollbackFor = Exception.class) + public ResultBean submitMortgageInfo(LoanMortgageInformationTransactDto dto) { + ResultBean rb = ResultBean.fireFail(); + ResultBean resultBean = saveMortgageInfo(dto); + if (resultBean.getSuccess()) { + baseVehicleStateFeign.updateBusStateByBusSid(dto.getBusVinSid(), "308"); + LoanMortgageInformationTransact loanMortgageInformationTransact = baseMapper.fetchByBusVinSid(dto.getBusVinSid()); + LoanWarrantInformation warrantInformation = new LoanWarrantInformation(); + warrantInformation.setBusVinSid(dto.getBusVinSid()); + warrantInformation.setAuditStateKey("001"); + warrantInformation.setAuditStateValue("待审核"); + warrantInformation.setRemarks(loanMortgageInformationTransact.getRemarks()); + //根据业务车辆sid查询 销售订单业务车辆表 + BusSalesOrderVehicle orderVehicle = busSalesOrderVehicleFeign.details(dto.getBusVinSid()).getData(); + if (null != orderVehicle) { + if (StringUtils.isNotBlank(orderVehicle.getLinkNo())) { + warrantInformation.setVinNo(orderVehicle.getLinkNo()); + } + String salesOrderSid = orderVehicle.getSalesOrderSid(); + warrantInformation.setSalesOrderSid(salesOrderSid); + BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(salesOrderSid).getData(); + if (null != salesOrder) { + //组织全路径 + if (StringUtils.isNotBlank(salesOrder.getOrgSidPath())) { + warrantInformation.setOrgSidPath(salesOrder.getOrgSidPath()); + ResultBean orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(salesOrder.getOrgSidPath()); + if (orgSidByPath.getSuccess()) { + String userOrgSid = orgSidByPath.getData(); + warrantInformation.setUseOrgSid(userOrgSid); + ResultBean organizationVo = sysOrganizationFeign.fetchBySid(userOrgSid); + if (organizationVo.getSuccess()) { + SysOrganizationVo organizationVoData = organizationVo.getData(); + if (null != organizationVoData) { + warrantInformation.setUseOrgName(organizationVoData.getName()); + } + } + } + } + //创建人sid + if (StringUtils.isNotBlank(salesOrder.getCreateBySid())) { + warrantInformation.setCreateBySid(salesOrder.getCreateBySid()); + } + //销售部门 + if (StringUtils.isNotBlank(salesOrder.getOrgName())) { + warrantInformation.setDepartment(salesOrder.getOrgName()); + } + //销售专员 + if (StringUtils.isNotBlank(salesOrder.getStaffName())) { + warrantInformation.setSalesman(salesOrder.getStaffName()); + } + //根据销售订单sid查询消贷合同表 + BusSalesOrderLoancontract loancontract = busSalesOrderLoancontractFeign.fetchDetailsByOrderSid(salesOrderSid).getData(); + if (null != loancontract) { + //消贷合同编号 + if (StringUtils.isNotBlank(loancontract.getLoanCotractNo())) { + warrantInformation.setContractNo(loancontract.getLoanCotractNo()); + } + //贷款人 + if (StringUtils.isNotBlank(loancontract.getBorrowerName())) { + warrantInformation.setBorrowerName(loancontract.getBorrowerName()); + } + //资方 + if (StringUtils.isNotBlank(loancontract.getBankName())) { + warrantInformation.setBankName(loancontract.getBankName()); + } + } + } + } + loanWarrantInformationService.insert(warrantInformation); + } + return rb.success().setData(dto.getBusVinSid()); + } + + public ResultBean getMortgageInfo(String busVinSid) { + ResultBean rb = ResultBean.fireFail(); + LoanMortgageInformationTransactDetailsVo vo = baseMapper.getMortgageInfo(busVinSid); + if (StringUtils.isBlank(vo.getMortgageDate())) { + vo.setMortgageDate("-"); + } + //根据业务车辆sid查询 销售订单业务车辆表 + BusSalesOrderVehicle orderVehicle = busSalesOrderVehicleFeign.details(busVinSid).getData(); + if (null != orderVehicle) { + if (StringUtils.isNotBlank(orderVehicle.getLinkNo())) { + vo.setVinNo(orderVehicle.getLinkNo()); + } + String salesOrderSid = orderVehicle.getSalesOrderSid(); + //根据销售订单sid查询消贷合同表 + BusSalesOrderLoancontract loancontract = busSalesOrderLoancontractFeign.fetchDetailsByOrderSid(salesOrderSid).getData(); + if (null != loancontract) { + //消贷合同编号 + if (StringUtils.isNotBlank(loancontract.getLoanCotractNo())) { + vo.setContractId(loancontract.getLoanCotractNo()); + } + //贷款人 + if (StringUtils.isNotBlank(loancontract.getBorrowerName())) { + vo.setBorrowerName(loancontract.getBorrowerName()); + } + } + //登记证 1-2页 + List fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.REGISTRATION_FILES_ONE.getAttachType()); + fileList.removeAll(Collections.singleton(null)); + if (!fileList.isEmpty()) { + List registrationFiles1 = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()). + collect(Collectors.toList()); + vo.setRegistrationFiles1(registrationFiles1); + } + //登记证 3-4页 + fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.REGISTRATION_FILES_TWO.getAttachType()); + fileList.removeAll(Collections.singleton(null)); + if (!fileList.isEmpty()) { + List registrationFiles2 = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList()); + vo.setRegistrationFiles2(registrationFiles2); + } + //营运证 + fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.TAXI_FILES.getAttachType()); + fileList.removeAll(Collections.singleton(null)); + if (!fileList.isEmpty()) { + List taxiFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList()); + vo.setTaxiFiles(taxiFiles); + } + //行驶证 + fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.DRIVING_CARD_FILES.getAttachType()); + fileList.removeAll(Collections.singleton(null)); + if (!fileList.isEmpty()) { + List drivingFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList()); + vo.setDrivingFiles(drivingFiles); + } + } + return rb.success().setData(vo); + } +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsRest.java index 17b543d1a5..fa65345e96 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsRest.java @@ -90,6 +90,11 @@ public class LoanSolutionsRest implements LoanSolutionsFeign { return loanSolutionsService.selectDetails2(busSid); } + @Override + public ResultBean selectDetails3(String busSid) { + return loanSolutionsService.selectDetails3(busSid); + } + @Override public ResultBean details2(SolutionssQuery query) { return loanSolutionsService.details2(query); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java index 69cadc4478..f1226205fa 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java @@ -2185,6 +2185,90 @@ public class LoanSolutionsService extends MybatisBaseService selectDetails3(String busSid) { + ResultBean rb = ResultBean.fireFail(); + SolutionssVo solutionssVo = new SolutionssVo(); + //根据关联sid查询是否存在金融方案 + LoanSolutions loanSolutions = baseMapper.selectByApplySid(busSid); + boolean isTrue = false; + if (loanSolutions != null) { + BeanUtil.copyProperties(loanSolutions, solutionssVo); + if (loanSolutions.getTrailerAmount() != null) { + solutionssVo.setGcPrice(loanSolutions.getTrailerAmount().toString()); + } + 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); + } + isTrue = true; + } + //全款且为三方金融 + if(StringUtils.isBlank(loanSolutions.getTypeKey())){ + solutionssVo.setShowMore(true); + solutionssVo.setFactoryDiscountUse("抵利息"); + if (isTrue) { + if (StringUtils.isNotBlank(loanSolutions.getPolicySid()) && loanSolutions.getOtherPolicyState() == 0) { + LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(loanSolutions.getPolicySid()); + if (loanFinOtherPolicy != null) { + solutionssVo.setOtherPolicyName(loanFinOtherPolicy.getOtherPolicyName()); + 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); + } + } + } + }else{ + if ("2".equals(loanSolutions.getTypeKey())) { + solutionssVo.setFactoryDiscountUse("抵车款"); + if (isTrue) { + if ("02".equals(loanSolutions.getTypeKey())) { + solutionssVo.setShowMore(false); + } else { + solutionssVo.setShowMore(true); + } + } else { + solutionssVo.setShowMore(false); + } + }else{ + solutionssVo.setShowMore(true); + solutionssVo.setFactoryDiscountUse("抵利息"); + if (isTrue) { + if (StringUtils.isNotBlank(loanSolutions.getPolicySid()) && loanSolutions.getOtherPolicyState() == 0) { + LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(loanSolutions.getPolicySid()); + if (loanFinOtherPolicy != null) { + solutionssVo.setOtherPolicyName(loanFinOtherPolicy.getOtherPolicyName()); + 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); + } + } + } + } + } + if (isTrue) { + List formList = getFormList(solutionssVo); + solutionssVo.setFinanceForms(formList); + } + solutionssVo.setBusSid(busSid); + return rb.success().setData(solutionssVo); + } + diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationMapper.java new file mode 100644 index 0000000000..bc9f84445f --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationMapper.java @@ -0,0 +1,30 @@ +package com.yxt.anrui.riskcenter.biz.loanwarrantinformation; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.riskcenter.api.loanwarrantinformation.LoanWarrantInformation; +import com.yxt.anrui.riskcenter.api.loanwarrantinformation.LoanWarrantInformationDetailsVo; +import com.yxt.anrui.riskcenter.api.loanwarrantinformation.LoanWarrantInformationVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + + +/** + * @description: + * @author: fan + * @date: 2023/8/21 + **/ +@Mapper +public interface LoanWarrantInformationMapper extends BaseMapper { + + + LoanWarrantInformation fetchByBusVinSid(String busVinSid); + + LoanWarrantInformationDetailsVo getMortgageInfo(String busVinSid); + + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationMapper.xml new file mode 100644 index 0000000000..b2d5c266d1 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationRest.java new file mode 100644 index 0000000000..87c36e18d2 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationRest.java @@ -0,0 +1,58 @@ +package com.yxt.anrui.riskcenter.biz.loanwarrantinformation; + +import com.yxt.anrui.riskcenter.api.loanwarrantinformation.*; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @description: + * @author: fan + * @date: 2023/8/21 + **/ +@Api(tags = "权证资料管理") +@RestController +@RequestMapping("v1/loanwarrantinformation") +public class LoanWarrantInformationRest implements LoanWarrantInformationFeign { + + @Autowired + private LoanWarrantInformationService loanMortgageInformationTransactService; + + @Override + public ResultBean> listPage(PagerQuery pq) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo page = loanMortgageInformationTransactService.listPage(pq); + return rb.success().setData(page); + } + + @Override + public ResultBean getAuditInfo(String sid) { + return loanMortgageInformationTransactService.getAuditInfo(sid); + } + + @Override + public ResultBean saveWarrantInfo(LoanAuditInfoDto dto) { + return loanMortgageInformationTransactService.saveWarrantInfo(dto); + } + + + @Override + public ResultBean approvedWarrantInfo(LoanAuditInfoDto dto) { + return loanMortgageInformationTransactService.approvedWarrantInfo(dto); + } + + @Override + public ResultBean transferInfo(String[] sids) { + return loanMortgageInformationTransactService.transferInfo(sids); + } + + @Override + public ResultBean saveTransferInfo(LoanTransferInfoDto dto) { + return loanMortgageInformationTransactService.saveTransferInfo(dto); + } + +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationService.java new file mode 100644 index 0000000000..ca0b2b1f32 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationService.java @@ -0,0 +1,337 @@ +package com.yxt.anrui.riskcenter.biz.loanwarrantinformation; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateTime; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; +import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontract; +import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractFeign; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; +import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; +import com.yxt.anrui.riskcenter.api.loanmortgageinformationtransact.*; +import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameter; +import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterQuery; +import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo; +import com.yxt.anrui.riskcenter.api.loanwarrantinformation.*; +import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService; +import com.yxt.common.base.config.component.FileUploadComponent; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import lombok.SneakyThrows; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.stream.Collectors; +import java.util.stream.Stream; + + +/** + * @description: + * @author: fan + * @date: 2023/8/21 + **/ +@Service +public class LoanWarrantInformationService extends MybatisBaseService { + + @Autowired + private SysUserFeign sysUserFeign; + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + private SysOrganizationFeign sysOrganizationFeign; + @Autowired + private BaseVehicleStateFeign baseVehicleStateFeign; + @Autowired + private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign; + @Autowired + private BusSalesOrderFeign busSalesOrderFeign; + @Autowired + private BusSalesOrderLoancontractFeign busSalesOrderLoancontractFeign; + @Autowired + private LoanFileService loanFileService; + @Autowired + private FileUploadComponent fileUploadComponent; + + public PagerVo listPage(PagerQuery pq) { + IPage page = PagerUtil.queryToPage(pq); + LoanWarrantInformationQuery pagerQuery = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + //======================= + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(pagerQuery.getOrgPath()); + privilegeQuery.setMenuSid(pagerQuery.getMenuSid()); + privilegeQuery.setMenuUrl(pagerQuery.getMenuUrl()); + privilegeQuery.setUserSid(pagerQuery.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = pagerQuery.getOrgPath(); + 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("orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("createBySid", pagerQuery.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + //======================= + //分公司 + if (StringUtils.isNotBlank(pagerQuery.getCompany())) { + qw.like("useOrgName", pagerQuery.getCompany()); + } + //销售部门 + if (StringUtils.isNotBlank(pagerQuery.getDepartment())) { + qw.like("department", pagerQuery.getDepartment()); + } + //销售专员 + if (StringUtils.isNotBlank(pagerQuery.getSalesman())) { + qw.like("salesman", pagerQuery.getSalesman()); + } + //消贷合同号 + if (StringUtils.isNotBlank(pagerQuery.getContractNo())) { + qw.like("contractNo", pagerQuery.getContractNo()); + } + //贷款人 + if (StringUtils.isNotBlank(pagerQuery.getBorrowerName())) { + qw.like("borrowerName", pagerQuery.getBorrowerName()); + } + //车架号 + if (StringUtils.isNotBlank(pagerQuery.getVinNo())) { + qw.like("vinNo", pagerQuery.getVinNo()); + } + //资方 + if (StringUtils.isNotBlank(pagerQuery.getAuditStateKey())) { + qw.eq("auditStateKey", pagerQuery.getAuditStateKey()); + } + String createStartTime = pagerQuery.getStartTime(); + String createEndTime = pagerQuery.getEndTime(); + qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (transferDate,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(createEndTime), "date_format (transferDate,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + ); + qw.eq("isDelete", 0); + qw.orderByDesc("createTime"); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + /** + * 审核回显 + * + * @param sid + * @return + */ + public ResultBean getAuditInfo(String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanAuditInfoVo vo = new LoanAuditInfoVo(); + LoanWarrantInformation loanWarrantInformation = fetchBySid(sid); + if (null != loanWarrantInformation) { + BeanUtil.copyProperties(loanWarrantInformation, vo); + String busVinSid = loanWarrantInformation.getBusVinSid(); + //登记证 1-2页 + List fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.REGISTRATION_FILES_ONE.getAttachType()); + fileList.removeAll(Collections.singleton(null)); + if (!fileList.isEmpty()) { + List registrationFiles1 = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()). + collect(Collectors.toList()); + vo.setRegistrationFiles1(registrationFiles1); + } + //登记证 3-4页 + fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.REGISTRATION_FILES_TWO.getAttachType()); + fileList.removeAll(Collections.singleton(null)); + if (!fileList.isEmpty()) { + List registrationFiles2 = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList()); + vo.setRegistrationFiles2(registrationFiles2); + } + //营运证 + fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.TAXI_FILES.getAttachType()); + fileList.removeAll(Collections.singleton(null)); + if (!fileList.isEmpty()) { + List taxiFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList()); + vo.setTaxiFiles(taxiFiles); + } + //行驶证 + fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.DRIVING_CARD_FILES.getAttachType()); + fileList.removeAll(Collections.singleton(null)); + if (!fileList.isEmpty()) { + List drivingFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList()); + vo.setDrivingFiles(drivingFiles); + } + } + return rb.success().setData(vo); + } + + /** + * 审核保存 + * + * @param dto + * @return + */ + @Transactional(rollbackFor = Exception.class) + public ResultBean saveWarrantInfo(LoanAuditInfoDto dto) { + ResultBean rb = ResultBean.fireFail(); + LoanWarrantInformation entity = fetchBySid(dto.getSid()); + BeanUtil.copyProperties(dto, entity); + String busVinSid = entity.getBusVinSid(); + baseMapper.updateById(entity); + //删除附件表中关于该linkSid的文件 + loanFileService.deleteByLinkSid(busVinSid); + List registrationFiles1 = dto.getRegistrationFiles1(); + if (!registrationFiles1.isEmpty()) { + loanFileService.saveAll(busVinSid, registrationFiles1, LoanFileEnum.REGISTRATION_FILES_ONE.getAttachType()); + } + List registrationFiles2 = dto.getRegistrationFiles2(); + if (!registrationFiles2.isEmpty()) { + loanFileService.saveAll(busVinSid, registrationFiles2, LoanFileEnum.REGISTRATION_FILES_TWO.getAttachType()); + } + List taxiFiles = dto.getTaxiFiles(); + if (!taxiFiles.isEmpty()) { + loanFileService.saveAll(busVinSid, taxiFiles, LoanFileEnum.TAXI_FILES.getAttachType()); + } + List drivingFiles = dto.getDrivingFiles(); + if (!drivingFiles.isEmpty()) { + loanFileService.saveAll(busVinSid, drivingFiles, LoanFileEnum.DRIVING_CARD_FILES.getAttachType()); + } + return rb.success().setData(dto.getSid()); + } + + /** + * 审核保存 + * + * @param dto + * @return + */ + @Transactional(rollbackFor = Exception.class) + public ResultBean approvedWarrantInfo(LoanAuditInfoDto dto) { + ResultBean rb = ResultBean.fireFail(); + ResultBean resultBean = saveWarrantInfo(dto); + if (resultBean.getSuccess()) { + LoanWarrantInformation entity = fetchBySid(dto.getSid()); + entity.setAuditStateKey("002"); + entity.setAuditStateValue("已审核未移交"); + baseMapper.updateById(entity); + } + return rb.success().setData(dto.getSid()); + } + + /** + * 移交回显 + * + * @param sids + * @return + */ + public ResultBean transferInfo(String[] sids) { + ResultBean rb = ResultBean.fireFail(); + LoanTransferInfoVo vo = new LoanTransferInfoVo(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + StringBuffer sbVinNo = new StringBuffer(); + StringBuffer sbConNo = new StringBuffer(); + HashSet hashSet = new HashSet<>(); + for (String sid : sids) { + LoanWarrantInformation entity = fetchBySid(sid); + if (StringUtils.isNotBlank(entity.getVinNo())) { + sbVinNo.append(entity.getVinNo()).append("，"); + } + if (StringUtils.isNotBlank(entity.getContractNo())) { + hashSet.add(entity.getContractNo()); + } + if (StringUtils.isNotBlank(entity.getTransferRemarks())) { + vo.setTransferRemarks(entity.getTransferRemarks()); + } + if (StringUtils.isNotBlank(entity.getBankName())) { + vo.setBankName(entity.getBankName()); + } + if (StringUtils.isNotBlank(entity.getTransferInformation())) { + vo.setTransferInformation(entity.getTransferInformation()); + } + if (StringUtils.isNotBlank(entity.getTransferWayKey())) { + vo.setTransferWayKey(entity.getTransferWayKey()); + } + if (StringUtils.isNotBlank(entity.getTransferWayValue())) { + vo.setTransferWayValue(entity.getTransferWayValue()); + } + if (StringUtils.isNotBlank(entity.getTrackingNo())) { + vo.setTrackingNo(entity.getTrackingNo()); + } + if (StringUtils.isNotBlank(entity.getRecipient())) { + vo.setRecipient(entity.getRecipient()); + } + if (null != entity.getDeliveryDate()) { + vo.setDeliveryDate(sdf.format(entity.getDeliveryDate())); + } + } + if (sbVinNo.length() > 0) { + sbVinNo.delete(sbVinNo.length() - 1, sbVinNo.length()); + vo.setVinNo(sbVinNo.toString()); + } + if (!hashSet.isEmpty()) { + for (String s : hashSet) { + sbConNo.append(s).append("，"); + } + } + if (sbVinNo.length() > 0) { + sbConNo.delete(sbConNo.length() - 1, sbConNo.length()); + vo.setContractNo(sbConNo.toString()); + } + return rb.success().setData(vo); + } + + + /** + * 移交保存 + * + * @param dto + * @return + */ + @Transactional(rollbackFor = Exception.class) + public ResultBean saveTransferInfo(LoanTransferInfoDto dto) { + ResultBean rb = ResultBean.fireFail(); + String[] sids = dto.getSids(); + for (String sid : sids) { + LoanWarrantInformation entity = fetchBySid(sid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + entity.setTransferDate(new DateTime()); + entity.setAuditStateKey("003"); + entity.setAuditStateValue("已移交"); + int i = baseMapper.updateById(entity); + } + return rb.success(); + } +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java index ffbc7b5840..35afd35fbc 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java @@ -57,6 +57,8 @@ public class AdvanceInvoiceDto implements Dto { private List fjApplicationAppendxs; @ApiModelProperty("证件") private List idCardImages; + @ApiModelProperty("车辆买卖合同") + private List carBuyContractImages; @ApiModelProperty("客户开票申请书") private List customerInvoiceApplyImages; @ApiModelProperty("车辆登记合同") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java index 5fbcdb8b05..5f6a43492d 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java @@ -62,6 +62,8 @@ public class AdvanceInvoiceInfoVo implements Vo { private List fjApplicationAppendxs; @ApiModelProperty("证件") private List idCardImages; + @ApiModelProperty("车辆买卖合同") + private List carBuyContractImages; @ApiModelProperty("客户开票申请书") private List customerInvoiceApplyImages; @ApiModelProperty("车辆登记合同") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java index 495054a619..9bb38f8354 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java @@ -51,6 +51,8 @@ public class BillApplicationIInfoDto implements Dto { private List finBillTrailers; // 开票挂车信息 @ApiModelProperty("证件") private List idCardImages; + @ApiModelProperty("车辆买卖合同") + private List carBuyContractImages; @ApiModelProperty("客户开票申请书") private List customerInvoiceApplyImages; @ApiModelProperty("车辆登记合同") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java index d21c65fdad..cb929f2d28 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java @@ -51,6 +51,8 @@ public class BillApplicationIInfoVo implements Vo { private List finBillTrailers; // 开票挂车信息 @ApiModelProperty("证件") private List idCardImages; + @ApiModelProperty("车辆买卖合同") + private List carBuyContractImages; @ApiModelProperty("客户开票申请书") private List customerInvoiceApplyImages; @ApiModelProperty("车辆登记合同") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/flowable/InvoicedDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/flowable/InvoicedDto.java index 5e9aa9d6ec..286a1f54e5 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/flowable/InvoicedDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/flowable/InvoicedDto.java @@ -38,6 +38,8 @@ public class InvoicedDto implements Dto { @ApiModelProperty("证件") private List idCardImages; + @ApiModelProperty("车辆买卖合同") + private List carBuyContractImages; @ApiModelProperty("客户开票申请书") private List customerInvoiceApplyImages; @ApiModelProperty("车辆登记合同") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CarModelVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CarModelVo.java index 4e77c50a7f..59f5e45415 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CarModelVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CarModelVo.java @@ -4,6 +4,8 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * @description: * @author: dimengzhe @@ -31,4 +33,14 @@ public class CarModelVo implements Vo { private String json; private String requestCode; + + private String pluginName; + + private String aRouterClass; + + private String aRouterMethod; + + private List aRouterParamType; + + private List aRouterParamValue; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitCustomerVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitCustomerVo.java index 126876bf60..f5aa72fed4 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitCustomerVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitCustomerVo.java @@ -66,6 +66,4 @@ public class AppLoanHomeVisitInvestigateInitCustomerVo implements Vo { private String emergencyContactType; @ApiModelProperty("紧急联系人类型key") private String emergencyContactTypeKey; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitJFJZVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitJFJZVo.java index 56c0f3e1f0..c54ebfd2ba 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitJFJZVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitJFJZVo.java @@ -20,6 +20,4 @@ public class AppLoanHomeVisitInvestigateInitJFJZVo implements Vo { private List indoor; @ApiModelProperty("合影照等") private List groupPhoto; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOperVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOperVo.java index 613052d35c..c367c9d900 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOperVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOperVo.java @@ -18,6 +18,4 @@ public class AppLoanHomeVisitInvestigateInitOperVo implements Vo { private String operationType; @ApiModelProperty("运营方式key") private String operationKey; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOtherPeoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOtherPeoVo.java index 8418441037..1fe00f91b4 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOtherPeoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOtherPeoVo.java @@ -26,6 +26,4 @@ public class AppLoanHomeVisitInvestigateInitOtherPeoVo implements Vo { private String company; @ApiModelProperty("职业") private String job; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitPropVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitPropVo.java index 96e4f4c48c..b13b800618 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitPropVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitPropVo.java @@ -36,6 +36,4 @@ public class AppLoanHomeVisitInvestigateInitPropVo implements Vo { private String otherIncomeKey; @ApiModelProperty("其他收入来源") private String otherIncome; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitReportStateVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitReportStateVo.java index 866aa48681..b585dcb6c4 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitReportStateVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitReportStateVo.java @@ -17,6 +17,4 @@ public class AppLoanHomeVisitInvestigateInitReportStateVo implements Vo { private String transportState; @ApiModelProperty("资产情况") private String assetsState; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitTranVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitTranVo.java index fb19fda477..67233d4d7a 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitTranVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitTranVo.java @@ -38,6 +38,4 @@ public class AppLoanHomeVisitInvestigateInitTranVo implements Vo { private String income; @ApiModelProperty("净收入") private String netIncome; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZCLVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZCLVo.java index 4ed58adfce..9cd19c1b16 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZCLVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZCLVo.java @@ -16,6 +16,4 @@ public class AppLoanHomeVisitInvestigateInitZCLVo implements Vo { private List houseProperty; @ApiModelProperty("车辆") private List carProperty; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZMWJVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZMWJVo.java index 10e71b6a7e..67329aeff4 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZMWJVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZMWJVo.java @@ -28,6 +28,4 @@ public class AppLoanHomeVisitInvestigateInitZMWJVo implements Vo { private List guarantorIdCard; @ApiModelProperty("担保人户口本") private List guarantorAccount; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveCustomerDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveCustomerDto.java index 3874859d69..c79bfe89af 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveCustomerDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveCustomerDto.java @@ -67,6 +67,4 @@ public class AppLoanHomeVisitInvestigateSaveCustomerDto implements Dto { private String emergencyContactType; @ApiModelProperty("紧急联系人类型key") private String emergencyContactTypeKey; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveJFJZDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveJFJZDto.java index acaac42f3a..6c8a6d2327 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveJFJZDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveJFJZDto.java @@ -20,6 +20,4 @@ public class AppLoanHomeVisitInvestigateSaveJFJZDto implements Vo { private List indoor; @ApiModelProperty("合影照等") private List groupPhoto; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveOperDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveOperDto.java index d7371d2f0c..0ab64c8f7a 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveOperDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveOperDto.java @@ -18,6 +18,4 @@ public class AppLoanHomeVisitInvestigateSaveOperDto implements Vo { private String operationType; @ApiModelProperty("运营方式key") private String operationKey; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveOrderDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveOrderDto.java index 6eff82637f..3ff300831d 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveOrderDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveOrderDto.java @@ -28,6 +28,4 @@ public class AppLoanHomeVisitInvestigateSaveOrderDto implements Vo { private String paymentRatiokey; @ApiModelProperty("金融首付比例备注") private String paymentRemarks; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSavePropDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSavePropDto.java index 75c8e84e27..8fad74b47d 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSavePropDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSavePropDto.java @@ -36,6 +36,4 @@ public class AppLoanHomeVisitInvestigateSavePropDto implements Vo { private String otherIncomeKey; @ApiModelProperty("其他收入来源") private String otherIncome; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveTranDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveTranDto.java index 3df43cea0d..38a1e7b17a 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveTranDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveTranDto.java @@ -38,6 +38,4 @@ public class AppLoanHomeVisitInvestigateSaveTranDto implements Vo { private String income; @ApiModelProperty("净收入") private String netIncome; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveZCLDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveZCLDto.java index 8bd14c37eb..d43a9c2f74 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveZCLDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveZCLDto.java @@ -16,6 +16,4 @@ public class AppLoanHomeVisitInvestigateSaveZCLDto implements Vo { private List houseProperty; @ApiModelProperty("车辆") private List carProperty; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveZMWJDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveZMWJDto.java index b87b8cef94..aef5078e30 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveZMWJDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveZMWJDto.java @@ -28,6 +28,4 @@ public class AppLoanHomeVisitInvestigateSaveZMWJDto implements Vo { private List guarantorIdCard; @ApiModelProperty("担保人户口本") private List guarantorAccount; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/mortgage/AppMortgageInformationTransactDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/mortgage/AppMortgageInformationTransactDetailsVo.java new file mode 100644 index 0000000000..9b4233a315 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/mortgage/AppMortgageInformationTransactDetailsVo.java @@ -0,0 +1,42 @@ +package com.yxt.anrui.terminal.api.risk.mortgage; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/8/28 10:41 + */ +@Data +public class AppMortgageInformationTransactDetailsVo implements Vo { + @ApiModelProperty("业务车辆sid") + @JsonProperty("sid") + private String busVinSid; + @ApiModelProperty("消贷合同编号") + private String contractId; + @ApiModelProperty("贷款人") + @JsonProperty("lenderName") + private String borrowerName; + @ApiModelProperty("车架号") + @JsonProperty("vin") + private String vinNo; + @ApiModelProperty("抵押日期") + @JsonProperty("disbursementDate") + private String mortgageDate; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("登记证 1-2页") + private List registrationFiles1 = new ArrayList<>(); + @ApiModelProperty("登记证 3-4页") + private List registrationFiles2 = new ArrayList<>(); + @ApiModelProperty("营运证") + private List taxiFiles = new ArrayList<>(); + @ApiModelProperty("行驶证") + private List drivingFiles = new ArrayList<>(); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/mortgage/AppMortgageInformationTransactDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/mortgage/AppMortgageInformationTransactDto.java new file mode 100644 index 0000000000..28379d1b6c --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/mortgage/AppMortgageInformationTransactDto.java @@ -0,0 +1,35 @@ +package com.yxt.anrui.terminal.api.risk.mortgage; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/8/28 10:41 + */ +@Data +public class AppMortgageInformationTransactDto implements Dto { + @ApiModelProperty("业务车辆sid") + @JsonProperty("sid") + private String busVinSid; + @ApiModelProperty("抵押日期") + @JsonProperty("disbursementDate") + private Date mortgageDate; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("登记证 1-2页") + private List registrationFiles1 = new ArrayList<>(); + @ApiModelProperty("登记证 3-4页") + private List registrationFiles2 = new ArrayList<>(); + @ApiModelProperty("营运证") + private List taxiFiles = new ArrayList<>(); + @ApiModelProperty("行驶证") + private List drivingFiles = new ArrayList<>(); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/mortgage/AppMortgageInformationTransactQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/mortgage/AppMortgageInformationTransactQuery.java new file mode 100644 index 0000000000..fdc54aaa12 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/mortgage/AppMortgageInformationTransactQuery.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.terminal.api.risk.mortgage; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/8/28 10:35 + */ +@Data +public class AppMortgageInformationTransactQuery implements Query { + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("“” 全部 1待抵押 2已抵押") + private String type; + + @ApiModelProperty("合同编号/贷款人姓名/车架号") + private String names; + + @ApiModelProperty("当前组织机构全路径sid") + private String orgPath; + + @ApiModelProperty("菜单sid") + private String menuSid; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/mortgage/AppMortgageInformationTransactVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/mortgage/AppMortgageInformationTransactVo.java new file mode 100644 index 0000000000..2fa9445f00 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/mortgage/AppMortgageInformationTransactVo.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.terminal.api.risk.mortgage; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/8/28 10:33 + */ +@Data +public class AppMortgageInformationTransactVo implements Vo { + @ApiModelProperty("抵押日期") + private String disbursementDate; + @ApiModelProperty("业务车辆sid") + private String sid; + @ApiModelProperty("消贷合同编号") + private String contractId; + @ApiModelProperty("分公司") + private String company; + @ApiModelProperty("销售部门") + private String department; + @ApiModelProperty("销售专员") + private String salesman; + @ApiModelProperty("贷款人") + private String lenderName; + @ApiModelProperty("车架号") + private String vin; + @ApiModelProperty("资方") + private String bankName; + private boolean showHandleBtn; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/mortgage/MortgageFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/mortgage/MortgageFeign.java new file mode 100644 index 0000000000..4cfe945c98 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/mortgage/MortgageFeign.java @@ -0,0 +1,66 @@ +package com.yxt.anrui.terminal.api.risk.mortgage; + + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +/** + * @Author + * @Date + * @Description + */ +@Api(tags = "抵押办理") +@FeignClient( + contextId = "terminal-Mortgage", + name = "anrui-terminal", + path = "/riskcenter/v1/mortgage", + fallback = MortgageFeignFallback.class) +public interface MortgageFeign { + + /** + * 根据条件分页查询数据的列表（已测试） + * + * @param pq + */ + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/getMortgageList") + @ResponseBody + public ResultBean> getMortgageList(@RequestBody PagerQuery pq); + + /** + * 保存 抵押办理 + * + * @param + */ + @ApiOperation("保存抵押办理") + @PostMapping("/saveMortgageInfo") + @ResponseBody + public ResultBean saveMortgageInfo(@RequestBody AppMortgageInformationTransactDto dto); + + + /** + * 保存 抵押办理 + * + * @param + */ + @ApiOperation("提交") + @PostMapping("/submitMortgageInfo") + @ResponseBody + public ResultBean submitMortgageInfo(@RequestBody AppMortgageInformationTransactDto dto); + + + /** + * 初始化详情 + * + * @param + */ + @ApiOperation("初始化详情") + @GetMapping("/getMortgageInfo") + @ResponseBody + public ResultBean getMortgageInfo(@RequestParam("sid") String sid); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/mortgage/MortgageFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/mortgage/MortgageFeignFallback.java new file mode 100644 index 0000000000..c88c8d8293 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/mortgage/MortgageFeignFallback.java @@ -0,0 +1,35 @@ +package com.yxt.anrui.terminal.api.risk.mortgage; + +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; + +/** + * @Author dimengzhe + * @Date 2023/3/21 15:19 + * @Description + */ +@Component +public class MortgageFeignFallback implements MortgageFeign { + + @Override + public ResultBean> getMortgageList(PagerQuery pq) { + return null; + } + + @Override + public ResultBean saveMortgageInfo(AppMortgageInformationTransactDto dto) { + return null; + } + + @Override + public ResultBean submitMortgageInfo(AppMortgageInformationTransactDto dto) { + return null; + } + + @Override + public ResultBean getMortgageInfo(String busVinSid) { + return null; + } +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java index 2e857a47ce..38873e946f 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java @@ -76,9 +76,9 @@ public class InvoicedService { billApplicationPageVo.setSid(record.getSid()); billApplicationPageVo.setBillState(record.getBillStateValue()); billApplicationPageVo.setNodeState(record.getNodeState()); - if (record.getNodeState().equals("待提交")){ + if (record.getNodeState().equals("待提交")) { billApplicationPageVo.setShowUpData(true); - }else { + } else { billApplicationPageVo.setShowUpData(false); } billApplicationPageVo.setVinNo(record.getVinNo()); @@ -140,10 +140,10 @@ public class InvoicedService { //挂车信息 List finBillTrailers = finBillApplicationDetailsVo.getFinBillTrailers(); List finBillTrailerVos = new ArrayList<>(); - if (finBillTrailers != null && finBillTrailers.size() > 0){ + if (finBillTrailers != null && finBillTrailers.size() > 0) { for (com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo finBillTrailer : finBillTrailers) { FinBillTrailerVo finBillTrailerVo = new FinBillTrailerVo(); - BeanUtil.copyProperties(finBillTrailer,finBillTrailerVo); + BeanUtil.copyProperties(finBillTrailer, finBillTrailerVo); List hgzImageUrl = finBillTrailer.getHgzImageUrl(); finBillTrailerVo.setFiles(hgzImageUrl); finBillTrailerVo.setOneBillMoney(finBillTrailer.getOneBillMoney()); @@ -152,43 +152,51 @@ public class InvoicedService { } vo.setFinBillTrailers(finBillTrailerVos); //附件信息 + List carBuyContractImages = finBillApplicationDetailsVo.getCarBuyContractImages(); List khkpsqsApplicationAppendxs = finBillApplicationDetailsVo.getKhkpsqsApplicationAppendxs(); List kpxxqrsApplicationAppendxs = finBillApplicationDetailsVo.getKpxxqrsApplicationAppendxs(); List cldjhtApplicationAppendxs = finBillApplicationDetailsVo.getCldjhtApplicationAppendxs(); List zjApplicationAppendxs = finBillApplicationDetailsVo.getZjApplicationAppendxs(); + List appCarBuyContractImages = new ArrayList<>();//客户开票申请书 List customerInvoiceApplyImages = new ArrayList<>();//客户开票申请书 List invoiceApplyConfirmImages = new ArrayList<>();//开票信息确认书 List registerContractImages = new ArrayList<>();//车辆登记合同 List idCardImages = new ArrayList<>(); - if (zjApplicationAppendxs.size() > 0){ + if (carBuyContractImages.size() > 0) { + for (FinBillFileVo carBuyContractImage : carBuyContractImages) { + appCarBuyContractImages.add(carBuyContractImage.getFileUrl()); + } + } + if (zjApplicationAppendxs.size() > 0) { for (FinBillFileVo zjApplicationAppendx : zjApplicationAppendxs) { idCardImages.add(zjApplicationAppendx.getFileUrl()); } } - if (khkpsqsApplicationAppendxs.size() > 0){ + if (khkpsqsApplicationAppendxs.size() > 0) { for (FinBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) { customerInvoiceApplyImages.add(khkpsqsApplicationAppendx.getFileUrl()); } } - if (kpxxqrsApplicationAppendxs.size() > 0){ + if (kpxxqrsApplicationAppendxs.size() > 0) { for (FinBillFileVo kpxxqrsApplicationAppendx : kpxxqrsApplicationAppendxs) { invoiceApplyConfirmImages.add(kpxxqrsApplicationAppendx.getFileUrl()); } } - if (cldjhtApplicationAppendxs.size() > 0){ + if (cldjhtApplicationAppendxs.size() > 0) { for (FinBillFileVo cldjhtApplicationAppendx : cldjhtApplicationAppendxs) { registerContractImages.add(cldjhtApplicationAppendx.getFileUrl()); } } + vo.setCarBuyContractImages(appCarBuyContractImages); vo.setCustomerInvoiceApplyImages(customerInvoiceApplyImages); vo.setInvoiceApplyConfirmImages(invoiceApplyConfirmImages); vo.setRegisterContractImages(registerContractImages); vo.setIdCardImages(idCardImages); BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(finBillApplicationDetailsVo.getContractNo()).getData(); - if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())){ + if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) { vo.setIsCanEdit(false); vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney()); - }else { + } else { vo.setIsCanEdit(true); } return rb.success().setData(vo); @@ -196,7 +204,7 @@ public class InvoicedService { public ResultBean saveInvoicedApplyInfo(BillApplicationIInfoDto dto) { FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto(); - BeanUtil.copyProperties(dto, finBillApplicationDto); + BeanUtil.copyProperties(dto, finBillApplicationDto, "carBuyContractImages"); String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); finBillApplicationDto.setUseOrgSid(useOrgSid); finBillApplicationDto.setCreateBySid(dto.getUserSid()); @@ -227,7 +235,7 @@ public class InvoicedService { List vinList = dto.getVinList(); List finBillVehicleDtos = new ArrayList<>(); for (VinListDto vinListDto : vinList) { - if (StringUtils.isBlank(vinListDto.getInvoiceInfo())){ + if (StringUtils.isBlank(vinListDto.getInvoiceInfo())) { return new ResultBean().fail().setMsg("开票信息不能为空"); } FinBillVehicleDto finBillVehicleDto = new FinBillVehicleDto(); @@ -246,7 +254,7 @@ public class InvoicedService { //开票挂车信息 List finBillTrailers = dto.getFinBillTrailers(); List finBillTrailerDtos = new ArrayList<>(); - if (finBillTrailers != null && finBillTrailers.size() > 0){ + if (finBillTrailers != null && finBillTrailers.size() > 0) { for (FinBillTrailerDto finBillTrailer : finBillTrailers) { com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto finBillTrailerDto = new com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto(); BeanUtil.copyProperties(finBillTrailer, finBillTrailerDto); @@ -255,42 +263,52 @@ public class InvoicedService { } finBillApplicationDto.setFinBillTrailers(finBillTrailerDtos); //附件信息 + List appCarBuyContractImages = dto.getCarBuyContractImages();//车辆买卖合同 List customerInvoiceApplyImages = dto.getCustomerInvoiceApplyImages();//客户开票申请书 List invoiceApplyConfirmImages = dto.getInvoiceApplyConfirmImages();//开票信息确认书 List registerContractImages = dto.getRegisterContractImages();//车辆登记合同 List idCardImages = dto.getIdCardImages();//证件 + List carBuyContractImages = new ArrayList<>(); // 车辆买卖合同 List khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息 List kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息 List cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息 List idCardImagesPC = new ArrayList<>();//证件 - if (customerInvoiceApplyImages != null){ + if (appCarBuyContractImages != null) { + for (String appCarBuyContractImage : appCarBuyContractImages) { + FinBillFileDto finBillFileDto = new FinBillFileDto(); + finBillFileDto.setFileUrl(appCarBuyContractImage); + carBuyContractImages.add(finBillFileDto); + } + } + if (customerInvoiceApplyImages != null) { for (String customerInvoiceApplyImage : customerInvoiceApplyImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); finBillFileDto.setFileUrl(customerInvoiceApplyImage); khkpsqsApplicationAppendxs.add(finBillFileDto); } } - if (invoiceApplyConfirmImages != null){ + if (invoiceApplyConfirmImages != null) { for (String invoiceApplyConfirmImage : invoiceApplyConfirmImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); finBillFileDto.setFileUrl(invoiceApplyConfirmImage); kpxxqrsApplicationAppendxs.add(finBillFileDto); } } - if (registerContractImages != null){ + if (registerContractImages != null) { for (String registerContractImage : registerContractImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); finBillFileDto.setFileUrl(registerContractImage); cldjhtApplicationAppendxs.add(finBillFileDto); } } - if (idCardImages != null){ + if (idCardImages != null) { for (String idCardImage : idCardImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); finBillFileDto.setFileUrl(idCardImage); idCardImagesPC.add(finBillFileDto); } } + finBillApplicationDto.setCarBuyContractImages(carBuyContractImages); finBillApplicationDto.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs); finBillApplicationDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs); finBillApplicationDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs); @@ -376,7 +394,7 @@ public class InvoicedService { public ResultBean submitInvoicedInfo(SubmitInvoicedInfoDto dto) { ResultBean rb = ResultBean.fireFail(); SubmitFinBillApplicationDto submitBillApplicationDto = new SubmitFinBillApplicationDto(); - BeanUtil.copyProperties(dto, submitBillApplicationDto); + BeanUtil.copyProperties(dto, submitBillApplicationDto, "carBuyContractImages"); String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); submitBillApplicationDto.setUseOrgSid(useOrgSid); submitBillApplicationDto.setCreateBySid(dto.getUserSid()); @@ -423,7 +441,7 @@ public class InvoicedService { //开票挂车信息 List finBillTrailers = dto.getFinBillTrailers(); List finBillTrailerDtos = new ArrayList<>(); - if (finBillTrailers != null && finBillTrailers.size() > 0){ + if (finBillTrailers != null && finBillTrailers.size() > 0) { for (FinBillTrailerDto finBillTrailer : finBillTrailers) { com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto finBillTrailerDto = new com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto(); BeanUtil.copyProperties(finBillTrailer, finBillTrailerDto); @@ -432,42 +450,52 @@ public class InvoicedService { } submitBillApplicationDto.setFinBillTrailers(finBillTrailerDtos); //附件信息 + List appCarBuyContractImages = dto.getCarBuyContractImages();//车辆买卖合同 List customerInvoiceApplyImages = dto.getCustomerInvoiceApplyImages();//客户开票申请书 List invoiceApplyConfirmImages = dto.getInvoiceApplyConfirmImages();//开票信息确认书 List registerContractImages = dto.getRegisterContractImages();//车辆登记合同 List idCardImages = dto.getIdCardImages();//证件 + List carBuyContractImages = new ArrayList<>(); // 车辆买卖合同 List khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息 List kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息 List cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息 List idCardImagesPC = new ArrayList<>();//证件 - if (customerInvoiceApplyImages != null){ + if (appCarBuyContractImages != null) { + for (String appCarBuyContractImage : appCarBuyContractImages) { + FinBillFileDto finBillFileDto = new FinBillFileDto(); + finBillFileDto.setFileUrl(appCarBuyContractImage); + carBuyContractImages.add(finBillFileDto); + } + } + if (customerInvoiceApplyImages != null) { for (String customerInvoiceApplyImage : customerInvoiceApplyImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); finBillFileDto.setFileUrl(customerInvoiceApplyImage); khkpsqsApplicationAppendxs.add(finBillFileDto); } } - if (invoiceApplyConfirmImages != null){ + if (invoiceApplyConfirmImages != null) { for (String invoiceApplyConfirmImage : invoiceApplyConfirmImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); finBillFileDto.setFileUrl(invoiceApplyConfirmImage); kpxxqrsApplicationAppendxs.add(finBillFileDto); } } - if (registerContractImages != null){ + if (registerContractImages != null) { for (String registerContractImage : registerContractImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); finBillFileDto.setFileUrl(registerContractImage); cldjhtApplicationAppendxs.add(finBillFileDto); } } - if (idCardImages != null){ + if (idCardImages != null) { for (String idCardImage : idCardImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); finBillFileDto.setFileUrl(idCardImage); idCardImagesPC.add(finBillFileDto); } } + submitBillApplicationDto.setCarBuyContractImages(carBuyContractImages); submitBillApplicationDto.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs); submitBillApplicationDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs); submitBillApplicationDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs); @@ -485,42 +513,52 @@ public class InvoicedService { BeanUtil.copyProperties(dto, finBillCompleteDto); finBillCompleteDto.setOrgSidPath(dto.getOrgPath()); //附件信息 + List appCarBuyContractImages = dto.getCarBuyContractImages();//车辆买卖合同 List customerInvoiceApplyImages = dto.getCustomerInvoiceApplyImages();//客户开票申请书 List invoiceApplyConfirmImages = dto.getInvoiceApplyConfirmImages();//开票信息确认书 List registerContractImages = dto.getRegisterContractImages();//车辆登记合同 List idCardImages = dto.getIdCardImages();//证件 + List carBuyContractImages = new ArrayList<>(); // 车辆买卖合同 List khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息 List kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息 List cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息 List idCardImagesPC = new ArrayList<>();//证件 - if (customerInvoiceApplyImages != null){ + if (appCarBuyContractImages != null) { + for (String appCarBuyContractImage : appCarBuyContractImages) { + FinBillFileDto finBillFileDto = new FinBillFileDto(); + finBillFileDto.setFileUrl(appCarBuyContractImage); + carBuyContractImages.add(finBillFileDto); + } + } + if (customerInvoiceApplyImages != null) { for (String customerInvoiceApplyImage : customerInvoiceApplyImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); finBillFileDto.setFileUrl(customerInvoiceApplyImage); khkpsqsApplicationAppendxs.add(finBillFileDto); } } - if (invoiceApplyConfirmImages != null){ + if (invoiceApplyConfirmImages != null) { for (String invoiceApplyConfirmImage : invoiceApplyConfirmImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); finBillFileDto.setFileUrl(invoiceApplyConfirmImage); kpxxqrsApplicationAppendxs.add(finBillFileDto); } } - if (registerContractImages != null){ + if (registerContractImages != null) { for (String registerContractImage : registerContractImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); finBillFileDto.setFileUrl(registerContractImage); cldjhtApplicationAppendxs.add(finBillFileDto); } } - if (idCardImages != null){ + if (idCardImages != null) { for (String idCardImage : idCardImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); finBillFileDto.setFileUrl(idCardImage); idCardImagesPC.add(finBillFileDto); } } + finBillCompleteDto.setCarBuyContractImages(carBuyContractImages); finBillCompleteDto.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs); finBillCompleteDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs); finBillCompleteDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs); @@ -555,10 +593,12 @@ public class InvoicedService { FinBillApplicationDetailsVo finBillApplicationDetailsVo = resultBean.getData(); if (finBillApplicationDetailsVo != null) { //附件信息 + List carBuyContractImages = finBillApplicationDetailsVo.getCarBuyContractImages(); List khkpsqsApplicationAppendxs = finBillApplicationDetailsVo.getKhkpsqsApplicationAppendxs(); List kpxxqrsApplicationAppendxs = finBillApplicationDetailsVo.getKpxxqrsApplicationAppendxs(); List cldjhtApplicationAppendxs = finBillApplicationDetailsVo.getCldjhtApplicationAppendxs(); List zjApplicationAppendxs = finBillApplicationDetailsVo.getZjApplicationAppendxs(); + List appCarBuyContractImages = new ArrayList<>(); List customerInvoiceApplyImages = new ArrayList<>();//客户开票申请书 List invoiceApplyConfirmImages = new ArrayList<>();//开票信息确认书 List registerContractImages = new ArrayList<>();//车辆登记合同 @@ -576,7 +616,19 @@ public class InvoicedService { itemEditTextInfo.setFilesPath(idCardImages); itemEditTextInfos.add(itemEditTextInfo); } - if (khkpsqsApplicationAppendxs != null) { + if (carBuyContractImages != null) { + for (FinBillFileVo carBuyContractImage : carBuyContractImages) { + appCarBuyContractImages.add(carBuyContractImage.getFileUrl()); + } + ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo(); + itemEditTextInfo.setTitle("车辆买卖合同"); + itemEditTextInfo.setType(1); + itemEditTextInfo.setNullAble(false); + itemEditTextInfo.setKey("carBuyContractImages"); + itemEditTextInfo.setFilesPath(appCarBuyContractImages); + itemEditTextInfos.add(itemEditTextInfo); + } + /*if (khkpsqsApplicationAppendxs != null) { for (FinBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) { customerInvoiceApplyImages.add(khkpsqsApplicationAppendx.getFileUrl()); } @@ -587,8 +639,8 @@ public class InvoicedService { itemEditTextInfo.setKey("customerInvoiceApplyImages"); itemEditTextInfo.setFilesPath(customerInvoiceApplyImages); itemEditTextInfos.add(itemEditTextInfo); - } - if (kpxxqrsApplicationAppendxs != null) { + }*/ + /*if (kpxxqrsApplicationAppendxs != null) { for (FinBillFileVo kpxxqrsApplicationAppendx : kpxxqrsApplicationAppendxs) { invoiceApplyConfirmImages.add(kpxxqrsApplicationAppendx.getFileUrl()); } @@ -599,7 +651,7 @@ public class InvoicedService { itemEditTextInfo.setKey("invoiceApplyConfirmImages"); itemEditTextInfo.setFilesPath(invoiceApplyConfirmImages); itemEditTextInfos.add(itemEditTextInfo); - } + }*/ if (cldjhtApplicationAppendxs != null) { for (FinBillFileVo cldjhtApplicationAppendx : cldjhtApplicationAppendxs) { registerContractImages.add(cldjhtApplicationAppendx.getFileUrl()); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java index 884a7a5bf3..c605978e84 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java @@ -104,6 +104,15 @@ public class CommonService { appSubVersionVo.setJson(JSONObject.toJSONString(map)); BeanUtil.copyProperties(appSubVersionVo, carModelVo); carModelVo.setRequestCode("1002"); + carModelVo.setPluginName("autoservice"); + carModelVo.setARouterClass("com.anrui.android.plugin.autoservice.manager.ARouterManager"); + carModelVo.setARouterMethod("DETAIL_SALE_ORDER"); + List aRouterParamType = new ArrayList<>(); + aRouterParamType.add("STRING"); + List aRouterParamValue = new ArrayList<>(); + aRouterParamValue.add(saleOrderSid); + carModelVo.setARouterParamType(aRouterParamType); + carModelVo.setARouterParamValue(aRouterParamValue); return rb.success().setData(carModelVo); } @@ -120,6 +129,16 @@ public class CommonService { appSubVersionVo.setJson(JSONObject.toJSONString(map)); BeanUtil.copyProperties(appSubVersionVo, carModelVo); carModelVo.setRequestCode("1003"); + carModelVo.setPluginName("autoservice"); + carModelVo.setARouterClass("com.anrui.android.plugin.autoservice.manager.ARouterManager"); + carModelVo.setARouterMethod("EDIT_SALE_ORDER_ONE_CAR_FINANCE"); + List aRouterParamType = new ArrayList<>(); + aRouterParamType.add("STRING"); + aRouterParamType.add("INT"); + List aRouterParamValue = new ArrayList<>(); + aRouterParamValue.add(orderSid); + carModelVo.setARouterParamType(aRouterParamType); + carModelVo.setARouterParamValue(aRouterParamValue); return rb.success().setData(carModelVo); } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/mortgage/MortgageRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/mortgage/MortgageRest.java new file mode 100644 index 0000000000..ede798ed37 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/mortgage/MortgageRest.java @@ -0,0 +1,45 @@ +package com.yxt.anrui.terminal.biz.risk.mortgage; + +import com.yxt.anrui.terminal.api.risk.mortgage.*; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + * @Author + * @Date 2023/3/25 9:39 + * @Description + */ +@Api(tags = "抵押办理") +@Controller +@RequestMapping("/riskcenter/v1/mortgage") +public class MortgageRest implements MortgageFeign { + + @Autowired + private MortgageService mortgageService; + + + @Override + public ResultBean> getMortgageList(PagerQuery pq) { + return mortgageService.getMortgageList(pq); + } + + @Override + public ResultBean saveMortgageInfo(AppMortgageInformationTransactDto dto) { + return mortgageService.saveMortgageInfo(dto); + } + + @Override + public ResultBean submitMortgageInfo(AppMortgageInformationTransactDto dto) { + return mortgageService.submitMortgageInfo(dto); + } + + @Override + public ResultBean getMortgageInfo(String sid) { + return mortgageService.getMortgageInfo(sid); + } +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/mortgage/MortgageService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/mortgage/MortgageService.java new file mode 100644 index 0000000000..dd32af068f --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/mortgage/MortgageService.java @@ -0,0 +1,72 @@ +package com.yxt.anrui.terminal.biz.risk.mortgage; + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.riskcenter.api.loanmortgageinformationtransact.*; +import com.yxt.anrui.terminal.api.risk.mortgage.AppMortgageInformationTransactDetailsVo; +import com.yxt.anrui.terminal.api.risk.mortgage.AppMortgageInformationTransactDto; +import com.yxt.anrui.terminal.api.risk.mortgage.AppMortgageInformationTransactQuery; +import com.yxt.anrui.terminal.api.risk.mortgage.AppMortgageInformationTransactVo; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @Author + * @Date 2023/3/25 9:40 + * @Description + */ +@Service +public class MortgageService { + + @Autowired + private LoanMortgageInformationTransactFeign loanMortgageInformationTransactFeign; + + public ResultBean> getMortgageList(PagerQuery pq) { + ResultBean> rb = ResultBean.fireFail(); + PagerQuery query = new PagerQuery<>(); + BeanUtil.copyProperties(pq, query); + ResultBean> voResultBean = loanMortgageInformationTransactFeign.listPage(query); + PagerVo vo = new PagerVo<>(); + if (voResultBean.getSuccess()) { + PagerVo data = voResultBean.getData(); + BeanUtil.copyProperties(data, vo); + } + return rb.success().setMsg("当前共查询到" + vo.getTotal() + "条记录").setData(vo); + } + + public ResultBean saveMortgageInfo(AppMortgageInformationTransactDto dto) { + ResultBean rb = ResultBean.fireFail(); + LoanMortgageInformationTransactDto loanMortgageInformationTransactDto = new LoanMortgageInformationTransactDto(); + BeanUtil.copyProperties(dto, loanMortgageInformationTransactDto); + ResultBean resultBean = loanMortgageInformationTransactFeign.saveMortgageInfo(loanMortgageInformationTransactDto); + if (resultBean.getSuccess()) { + return rb.success().setData(resultBean.getData()); + } + return rb.success(); + } + + public ResultBean submitMortgageInfo(AppMortgageInformationTransactDto dto) { + ResultBean rb = ResultBean.fireFail(); + LoanMortgageInformationTransactDto loanMortgageInformationTransactDto = new LoanMortgageInformationTransactDto(); + BeanUtil.copyProperties(dto, loanMortgageInformationTransactDto); + ResultBean resultBean = loanMortgageInformationTransactFeign.submitMortgageInfo(loanMortgageInformationTransactDto); + if (resultBean.getSuccess()) { + return rb.success().setData(resultBean.getData()); + } + return rb.success(); + } + + public ResultBean getMortgageInfo(String sid) { + ResultBean rb = ResultBean.fireFail(); + AppMortgageInformationTransactDetailsVo vo = new AppMortgageInformationTransactDetailsVo(); + ResultBean resultBean = loanMortgageInformationTransactFeign.getMortgageInfo(sid); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + LoanMortgageInformationTransactDetailsVo loanMortgageInformationTransactDetailsVo = resultBean.getData(); + BeanUtil.copyProperties(loanMortgageInformationTransactDetailsVo, vo); + return rb.success().setData(vo); + } +}