Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 2 years ago
parent
commit
0e115b8be3
  1. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java
  2. 96
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
  3. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java
  4. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml
  5. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateRest.java
  6. 10
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java
  7. 62
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
  8. 20
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrower.java
  9. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerDetailsVo.java
  10. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerDto.java
  11. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerQuery.java
  12. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerVo.java
  13. 7
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java
  14. 9
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java
  15. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java
  16. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java
  17. 151
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
  18. 1
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java
  19. 13
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml
  20. 64
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  21. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java
  22. 31
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  23. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.java
  24. 13
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java
  25. 14
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java
  26. 6
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java
  27. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml
  28. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java
  29. 10
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java
  30. 8
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
  31. 4
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowFeign.java
  32. 5
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowRest.java
  33. 24
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java
  34. 57
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamine.java
  35. 100
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineDetailsVo.java
  36. 59
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineDto.java
  37. 80
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineFeign.java
  38. 74
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineFeignFallback.java
  39. 81
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineQuery.java
  40. 81
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineVo.java
  41. 8
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomeVisitInvestigateInitCustomerVo.java
  42. 6
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomeVisitInvestigateSaveCustomerDto.java
  43. 14
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomeVisitInvestigateInitOrderVo.java
  44. 14
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomeVisitInvestigateSaveOrderDto.java
  45. 20
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrder.java
  46. 34
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderDetailsVo.java
  47. 34
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderDto.java
  48. 34
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderQuery.java
  49. 34
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderVo.java
  50. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomeVisitInvestigateInitOtherPeoVo.java
  51. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomeVisitInvestigateSaveOtherPeoDto.java
  52. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeo.java
  53. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoDetailsVo.java
  54. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoDto.java
  55. 4
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomeVisitInvestigateInitPropVo.java
  56. 4
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomeVisitInvestigateSavePropDto.java
  57. 30
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomevisitInvestigateProperty.java
  58. 8
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyDetailsVo.java
  59. 4
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyDto.java
  60. 4
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepVo.java
  61. 64
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineMapper.java
  62. 40
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineMapper.xml
  63. 100
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineRest.java
  64. 366
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java
  65. 8
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.xml
  66. 106
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java
  67. 3
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateoperations/LoanHomevisitInvestigateOperationsMapper.xml
  68. 18
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderMapper.xml
  69. 4
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.java
  70. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.xml
  71. 4
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoService.java
  72. 23
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyMapper.xml
  73. 3
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportMapper.xml
  74. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.java
  75. 22
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.xml
  76. 52
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java
  77. 58
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
  78. 8
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitCustomerVo.java
  79. 18
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOrderVo.java
  80. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOtherPeoVo.java
  81. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitPropVo.java
  82. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitReportStateVo.java
  83. 6
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveCustomerDto.java
  84. 14
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveOrderDto.java
  85. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveOtherPeoDto.java
  86. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSavePropDto.java
  87. 33
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitVo.java
  88. 12
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java

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

@ -33,4 +33,8 @@ public interface BaseVehicleStateFeign {
@PostMapping("selectOneQKKPByBusSid")
@ResponseBody
ResultBean<BaseVehicleState> selectOneQKKPByBusSid(@RequestParam("busSid") String sid);
@PostMapping("selectByVinSid")
@ResponseBody
ResultBean<BaseVehicleState> selectByVinSid(@RequestParam("vehSid") String vehSid);
}

96
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java

@ -52,6 +52,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGression;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
@ -156,9 +157,9 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
}
qw.orderByDesc("sv.createTime");
//分公司
if(StringUtils.isNotBlank(params.getOrgPath())){
if (StringUtils.isNotBlank(params.getOrgPath())) {
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData();
qw.eq("sv.useOrgSid",useOrgSid);
qw.eq("sv.useOrgSid", useOrgSid);
}
}
qw.eq("sv.createBySid", params.getUserSid());
@ -178,7 +179,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
if (StringUtils.isBlank(sid)) {
BigDecimal salesMoney = BigDecimal.ZERO;
BigDecimal payMoney = BigDecimal.ZERO;
if(scmVehicleActualSalesDto.getDetailsList().size()>0){
if (scmVehicleActualSalesDto.getDetailsList().size() > 0) {
salesMoney = scmVehicleActualSalesDto.getDetailsList().stream().map(BaseVehicleActualDetailsDto::getActualMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
}
if ("1".equals(scmVehicleActualSalesDto.getIsPay())) {
@ -186,15 +187,15 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
payMoney = scmVehicleActualSalesDto.getDetailsPayList().stream().map(BaseVehicleActualPayDto::getPayAccount).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
}
}
if(payMoney.compareTo(salesMoney)>0){
if (payMoney.compareTo(salesMoney) > 0) {
return rb.setMsg("付款合计不允许大于买断金额合计");
}
//新增
//=======================================
String orgSidPath = "";
if(StringUtils.isNotBlank(scmVehicleActualSalesDto.getOrgPath())){
if (StringUtils.isNotBlank(scmVehicleActualSalesDto.getOrgPath())) {
orgSidPath = scmVehicleActualSalesDto.getOrgPath();
}else{
} else {
orgSidPath = scmVehicleActualSalesDto.getOrgSidPath();
}
if (StringUtils.isBlank(orgSidPath)) {
@ -249,7 +250,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
}
BigDecimal salesMoney = BigDecimal.ZERO;
BigDecimal payMoney = BigDecimal.ZERO;
if(scmVehicleActualSalesDto.getDetailsList().size()>0){
if (scmVehicleActualSalesDto.getDetailsList().size() > 0) {
salesMoney = scmVehicleActualSalesDto.getDetailsList().stream().map(BaseVehicleActualDetailsDto::getActualMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
}
if ("1".equals(scmVehicleActualSalesDto.getIsPay())) {
@ -257,7 +258,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
payMoney = scmVehicleActualSalesDto.getDetailsPayList().stream().map(BaseVehicleActualPayDto::getPayAccount).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
}
}
if(payMoney.compareTo(salesMoney)>0){
if (payMoney.compareTo(salesMoney) > 0) {
return rb.setMsg("付款合计不允许大于买断金额合计");
}
@ -383,7 +384,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
ResultBean rb = ResultBean.fireFail();
BigDecimal salesMoney = BigDecimal.ZERO;
BigDecimal payMoney = BigDecimal.ZERO;
if(dto.getDetailsList().size()>0){
if (dto.getDetailsList().size() > 0) {
salesMoney = dto.getDetailsList().stream().map(BaseVehicleActualDetailsDto::getActualMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
}
if ("1".equals(dto.getIsPay())) {
@ -391,16 +392,16 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
payMoney = dto.getDetailsPayList().stream().map(BaseVehicleActualPayDto::getPayAccount).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
}
}
if(payMoney.compareTo(salesMoney)>0){
if (payMoney.compareTo(salesMoney) > 0) {
return rb.setMsg("付款合计不允许大于买断金额合计");
}
String useOrgSid = "";
String orgSidPath = "";
if(StringUtils.isNotBlank(dto.getOrgPath())){
if (StringUtils.isNotBlank(dto.getOrgPath())) {
useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
orgSidPath = dto.getOrgPath();
}else{
} else {
useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
@ -646,7 +647,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
finPaymentrecordDto.setPurchaseSystemName(baseVehicleActualSales.getPurchaseSystemName());
String manufacturerSid = baseVehicleBrandService.selectByManufacturerSid(baseVehicleActualSales.getCarBrandSid());
BaseManufacturer baseManufacturer = baseManufacturerService.fetchBySid(manufacturerSid);
if (baseManufacturer !=null){
if (baseManufacturer != null) {
finPaymentrecordDto.setPayCode(baseManufacturer.getManufacturerCode());
}
finPaymentrecordFeign.save(finPaymentrecordDto);
@ -745,34 +746,45 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
updateFlowFiled(map);
//极光推送
baseVehicleActualSales = fetchBySid(query.getBusinessSid());
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = baseVehicleActualSales.getProcInstId();
messageFlowVo.setProcInsId(procId);
messageFlowVo.setProcDefId(baseVehicleActualSales.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(query.getBusinessSid());
messageFlowableQuery.setModuleName("未售买断申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
String nextName = listResultBean.getData().get(0).getName_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseVehicleActualSales.getCreateBySid())) {
if ("未售买断申请".equals(nextName)) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
//更新未售买断状态为未买断
//更新车辆状态为未买断
String settlementStatus = VehicleState.BuyoutEnum.UN_BUYOUT.getCode();
String settlementStatusValue = VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks();
updateByVinNo(baseVehicleActualSales.getSid(), settlementStatus, settlementStatusValue);
} else {
messageFlowableQuery.setMsgContent(baseVehicleActualSales.getApplicationName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
}
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
BaseVehicleActualSales finalBaseVehicleActualSales = baseVehicleActualSales;
Future future1 = pool.submit(() -> {
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = finalBaseVehicleActualSales.getProcInstId();
messageFlowVo.setProcInsId(procId);
messageFlowVo.setProcDefId(finalBaseVehicleActualSales.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(query.getBusinessSid());
messageFlowableQuery.setModuleName("未售买断申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
String nextName = listResultBean.getData().get(0).getName_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if ("未售买断申请".equals(nextName)) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
//更新未售买断状态为未买断
//更新车辆状态为未买断
String settlementStatus = VehicleState.BuyoutEnum.UN_BUYOUT.getCode();
String settlementStatusValue = VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks();
updateByVinNo(finalBaseVehicleActualSales.getSid(), settlementStatus, settlementStatusValue);
} else {
messageFlowableQuery.setMsgContent(finalBaseVehicleActualSales.getApplicationName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
}
messageFlowableQuery.setMsgTitle("未售买断");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
messageFlowableQuery.setMsgTitle("未售买断");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
});
} catch (Exception e) {
e.printStackTrace();
}
return rb.success();
}
}
@ -839,7 +851,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
BaseVehicleActualSales baseVehicleActualSales = fetchBySid(query.getBusinessSid());
String businessTaskId = baseVehicleActualSales.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {
if(query.getUserSid().equals(baseVehicleActualSales.getCreateBySid())){
if (query.getUserSid().equals(baseVehicleActualSales.getCreateBySid())) {
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
@ -853,7 +865,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
String settlementStatusValue = VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks();
updateByVinNo(baseVehicleActualSales.getSid(), settlementStatus, settlementStatusValue);
return rb.success().setData(resultBean.getData());
}else{
} else {
if (businessTaskId.equals(query.getTaskId())) {
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);

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

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

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

@ -32,4 +32,12 @@
AND carryInvoiceState = '0'
AND busState = '401'
</select>
<select id="selectByVinSid" resultType="com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState">
SELECT *
FROM base_vehicle_state
WHERE vinSid = #{vehSid}
AND carryVehicleState = '0'
AND carryInvoiceState = '0'
</select>
</mapper>

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

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

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

@ -96,9 +96,9 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
}else if(BaseVehicleStateEnum.OperateTypeEnum.CKKP_DELETE.getTypeKey().equals(operateType)){
baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.CKKP_STATE_1.getStateKey());
}else if(BaseVehicleStateEnum.OperateTypeEnum.QKKPTJ.getTypeKey().equals(operateType)){
baseVehicleState.setCarryVehicleState("1");
baseVehicleState.setCarryInvoiceState("1");
}else if(BaseVehicleStateEnum.OperateTypeEnum.QKKPZZ.getTypeKey().equals(operateType)){
baseVehicleState.setCarryVehicleState("0");
baseVehicleState.setCarryInvoiceState("0");
}
baseMapper.updateById(baseVehicleState);
}else{
@ -180,4 +180,10 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
BaseVehicleState baseVehicleState = baseMapper.selectOneQKKPByBusSid(sid);
return rb.success().setData(baseVehicleState);
}
public ResultBean<BaseVehicleState> selectByVinSid(String vehSid) {
ResultBean<BaseVehicleState> rb = ResultBean.fireFail();
BaseVehicleState baseVehicleState = baseMapper.selectByVinSid(vehSid);
return rb.success().setData(baseVehicleState);
}
}

62
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@ -864,31 +864,41 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
Map<String, Object> map = BeanUtil.beanToMap(ufVo);
//更新业务中的流程相关的参数
updateFlowFiled(map);
//极光推送
busVehicleApply = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = busVehicleApply.getProcInstId();
messageFlowVo.setProcInsId(procId);
messageFlowVo.setProcDefId(busVehicleApply.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("厂家采购申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextName = listResultBean.getData().get(0).getName_();
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busVehicleApply.getCreateBySid())) {
if ("发起申请".equals(nextName)) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
messageFlowableQuery.setMsgContent(busVehicleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
BusVehicleApply finalBusVehicleApply = busVehicleApply;
Future future1 = pool.submit(() -> {
//极光推送
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = finalBusVehicleApply.getProcInstId();
messageFlowVo.setProcInsId(procId);
messageFlowVo.setProcDefId(finalBusVehicleApply.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("厂家采购申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextName = listResultBean.getData().get(0).getName_();
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if ("发起申请".equals(nextName)) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
messageFlowableQuery.setMsgContent(finalBusVehicleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
}
messageFlowableQuery.setMsgTitle("厂家采购");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
});
} catch (Exception e) {
e.printStackTrace();
}
messageFlowableQuery.setMsgTitle("厂家采购");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
return rb.success();
}
}
@ -1050,7 +1060,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
public ResultBean pushApply(BusApplyPushDto dto) {
ResultBean rb = ResultBean.fireFail();
BusVehicleApply busVehicleApply = new BusVehicleApply();
BeanUtil.copyProperties(dto,busVehicleApply,"sid");
BeanUtil.copyProperties(dto, busVehicleApply, "sid");
String billNo = getApplyCode(dto.getOrgSidPath());
busVehicleApply.setApplicationCode(billNo);
String manufacturerSid = baseVehicleBrandService.selectByManufacturerSid(dto.getCarBrandSid());
@ -1062,8 +1072,8 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
BeanUtil.copyProperties(busVehicleApplyDetailDto, busVehicleApplyDetail, "sid");
busVehicleApplyDetail.setApplySid(busVehicleApply.getSid());
//内部编码
BaseVehmodelConfig baseVehmodelConfig = baseVehicleModelService.selectDetailss(busVehicleApplyDetail.getVehicleSid(),busVehicleApplyDetail.getConfigSid(),busVehicleApply.getCreateOrgSid());
if(baseVehmodelConfig != null){
BaseVehmodelConfig baseVehmodelConfig = baseVehicleModelService.selectDetailss(busVehicleApplyDetail.getVehicleSid(), busVehicleApplyDetail.getConfigSid(), busVehicleApply.getCreateOrgSid());
if (baseVehmodelConfig != null) {
busVehicleApplyDetail.setInsideCode(baseVehmodelConfig.getInsideCode());
}
busVehicleApplyDetailService.insert(busVehicleApplyDetail);

20
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrower.java

@ -51,26 +51,26 @@ public class BusSalesOrderBorrower extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("销售订单sid")
private String salesOrderSid; // 销售订单sid
@ApiModelProperty("借款人sid(客户sid")
private String borrowerSid; // 借款人sid(客户sid)
private String salesOrderSid;
@ApiModelProperty("客户sid")
private String customSid;
@ApiModelProperty("借款人名称")
private String borrowerName; // 借款人名称
private String borrowerName;
@ApiModelProperty("手机号码")
private String mobile; // 手机号码
private String mobile;
@ApiModelProperty("台数")
private Integer vehCount; // 台数
private Integer vehCount;
@ApiModelProperty("资方sid")
private String bankSid;
@ApiModelProperty("资方名称")
private String bankName;
@ApiModelProperty("金融产品名称")
private String policyName; // 金融产品名称
private String policyName;
@ApiModelProperty("业务阶段编码")
private String busNo; // 业务阶段编码
private String busNo;
@ApiModelProperty("业务阶段名称")
private String busName; // 业务阶段名称
private String busName;
@ApiModelProperty("业务状态码")
private String busState; // 业务状态码
private String busState;
}

4
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerDetailsVo.java

@ -53,8 +53,8 @@ public class BusSalesOrderBorrowerDetailsVo implements Vo {
@ApiModelProperty("销售订单sid")
private String salesOrderSid; // 销售订单sid
@ApiModelProperty("借款人sid(客户sid")
private String borrowerSid; // 借款人sid(客户sid)
@ApiModelProperty("客户sid")
private String customSid;
@ApiModelProperty("借款人名称")
private String borrowerName; // 借款人名称
@ApiModelProperty("手机号码")

4
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerDto.java

@ -53,8 +53,8 @@ public class BusSalesOrderBorrowerDto implements Dto {
@ApiModelProperty("销售订单sid")
private String salesOrderSid; // 销售订单sid
@ApiModelProperty("借款人sid(客户sid")
private String borrowerSid; // 借款人sid(客户sid)
@ApiModelProperty("客户sid")
private String customSid;
@ApiModelProperty("借款人名称")
private String borrowerName; // 借款人名称
@ApiModelProperty("手机号码")

4
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerQuery.java

@ -51,8 +51,8 @@ public class BusSalesOrderBorrowerQuery implements Query {
@ApiModelProperty("销售订单sid")
private String salesOrderSid; // 销售订单sid
@ApiModelProperty("借款人sid(客户sid")
private String borrowerSid; // 借款人sid(客户sid)
@ApiModelProperty("客户sid")
private String customSid;
@ApiModelProperty("借款人名称")
private String borrowerName; // 借款人名称
@ApiModelProperty("手机号码")

4
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerVo.java

@ -53,8 +53,8 @@ public class BusSalesOrderBorrowerVo implements Vo {
@ApiModelProperty("销售订单sid")
private String salesOrderSid; // 销售订单sid
@ApiModelProperty("借款人sid(客户sid")
private String borrowerSid; // 借款人sid(客户sid)
@ApiModelProperty("客户sid")
private String customSid;
@ApiModelProperty("借款人名称")
private String borrowerName; // 借款人名称
@ApiModelProperty("手机号码")

7
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java

@ -64,7 +64,7 @@ public interface BusSalesOrderLoancontractFeign {
@ApiOperation("新增或修改")
@PostMapping("/save")
@ResponseBody
public ResultBean save(@RequestBody BusSalesOrderLoancontractDto dto);
public ResultBean<String> save(@RequestBody BusSalesOrderLoancontractDto dto);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@ -75,4 +75,9 @@ public interface BusSalesOrderLoancontractFeign {
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean<BusSalesOrderLoancontractDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
@ApiOperation("根据贷款人sid查询贷款人下消贷合同编号")
@GetMapping("/selectByBorrowerSid/{saleOrderBorrowerSid}")
@ResponseBody
ResultBean<List<BusSalesOrderLoancontractDetailsVo>> selectByBorrowerSid(@PathVariable("saleOrderBorrowerSid") String saleOrderBorrowerSid);
}

9
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java

@ -55,8 +55,8 @@ public class BusSalesOrderLoancontractFeignFallback implements BusSalesOrderLoan
}
@Override
public ResultBean save(BusSalesOrderLoancontractDto dto){
return ResultBean.fireFail().setMsg("接口anrui-buscenter/bussalesorderloancontract/save无法访问");
public ResultBean<String> save(BusSalesOrderLoancontractDto dto) {
return null;
}
@Override
@ -69,4 +69,9 @@ public class BusSalesOrderLoancontractFeignFallback implements BusSalesOrderLoan
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-buscenter/bussalesorderloancontract/fetchDetailsBySid无法访问");
}
@Override
public ResultBean<List<BusSalesOrderLoancontractDetailsVo>> selectByBorrowerSid(String saleOrderBorrowerSid) {
return null;
}
}

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

@ -120,4 +120,9 @@ public interface BusSalesOrderVehicleFeign {
@PostMapping("/selectListByvinNo")
@ResponseBody
ResultBean<List<String>> selectListByvinNo(@RequestParam("vinNo") String vinNo);
@ApiOperation("更新订单车辆的贷款人sid和消贷合同sid")
@PostMapping("/updateXDCon")
@ResponseBody
ResultBean updateXDCon(@RequestParam("sid") String sid,@RequestParam("borrowerSid") String borrowerSid,@RequestParam("loanContractSid") String loanContractSid);
}

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

@ -113,4 +113,9 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe
return null;
}
@Override
public ResultBean updateXDCon(String sid, String borrowerSid, String loanContractSid) {
return null;
}
}

151
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java

@ -14,6 +14,7 @@ import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign;
import com.yxt.anrui.base.api.basetrailer.TrailerVo;
import com.yxt.anrui.base.api.basetrailer.TraliveredVo;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehicleactualsales.BaseVehicleActualSales;
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto;
@ -27,6 +28,7 @@ import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
import com.yxt.anrui.base.api.commoncontract.CommonContract;
import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
import com.yxt.anrui.base.common.enums.BillTypeEnum;
import com.yxt.anrui.base.common.enums.VehicleState;
import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast;
import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.base.common.utils.domain.BillNo;
@ -459,6 +461,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
return resultBean;
}
*/
/**
* 保存流程业务关联表 数据
*
@ -1393,9 +1396,9 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
}
//尚欠车款大写
if (StringUtils.isNotBlank(subscribtAllResultBean.getData())) {
if(sqMoney.compareTo(BigDecimal.ZERO) <= 0){
if (sqMoney.compareTo(BigDecimal.ZERO) <= 0) {
map.put("DyMoney", TransformMoney.transform(TransformMoney.getDecimalStr(Double.valueOf(String.valueOf(BigDecimal.ZERO)).doubleValue())));
}else{
} else {
map.put("DyMoney", TransformMoney.transform(TransformMoney.getDecimalStr(Double.valueOf(sqMoney.toString()).doubleValue())));
}
@ -1720,11 +1723,11 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
List<String> contractNoList = baseMapper.selectSid(dto.getContractId());
for (AdCarListVo adCarListDto : carList) {
String vinSid = adCarListDto.getCarSid();
if(contractNoList.contains(vinSid)){
if (contractNoList.contains(vinSid)) {
vinNoLists.add(adCarListDto.getVin());
}
}
if(!vinNoLists.isEmpty()){
if (!vinNoLists.isEmpty()) {
return rb.setMsg(String.join(",", vinNoLists) + "已存在发起流程的申请");
}
//查询该申请中的车架号是否被锁定
@ -1761,7 +1764,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
Map<String, Object> appMap = new HashMap<>();
//需和移动端沟通业务sid保存的属性具体值:appMap中sid不是固定的。移动端提供具体字段。
appMap.put("sid", businessSid);
appMap.put("contractNO",busArrearsCarryVehicleApply.getContractNo());
appMap.put("contractNO", busArrearsCarryVehicleApply.getContractNo());
variables.put("app", appMap);
if (StringUtils.isNotBlank(dto.getIsFinance())) {
variables.put("jinrong", "1".equals(dto.getIsFinance()));
@ -1777,7 +1780,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
variables = flowableFeign.getMap(flowProcessMapQuery).getData();
bv.setFormVariables(variables);
if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean =flowFeign.startProcess(bv);
ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
if (!voResultBean.getSuccess()) {
return rb.setMsg(voResultBean.getMsg());
}
@ -1918,7 +1921,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", bv.getBusinessSid());
appMap.put("contractNO",busArrearsCarryVehicleApply.getContractNo());
appMap.put("contractNO", busArrearsCarryVehicleApply.getContractNo());
variables.put("app", appMap);
if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getIsFinance())) {
variables.put("jinrong", "1".equals(busArrearsCarryVehicleApply.getIsFinance()));
@ -2075,7 +2078,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", bv.getBusinessSid());
appMap.put("contractNO",busArrearsCarryVehicleApply.getContractNo());
appMap.put("contractNO", busArrearsCarryVehicleApply.getContractNo());
variables.put("app", appMap);
//=================================
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
@ -2258,7 +2261,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
}
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", query.getBusinessSid());
appMap.put("contractNO",busArrearsCarryVehicleApply.getContractNo());
appMap.put("contractNO", busArrearsCarryVehicleApply.getContractNo());
variables.put("app", appMap);
//=================================
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
@ -2277,26 +2280,68 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
//更新业务中的流程相关的参数
updateFlowFiled(map);
busArrearsCarryVehicleApply = fetchBySid(query.getBusinessSid());
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = busArrearsCarryVehicleApply.getProcInstId();
ufVo.setProcInsId(procId);
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(query.getBusinessSid());
messageFlowableQuery.setModuleName("欠款提车申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
String nextName = listResultBean.getData().get(0).getName_();
ResultBean<List<LatestTaskVo>> listResultBeans = flowTaskFeign.getLatestTasks(busArrearsCarryVehicleApply.getProcInstId());
String nextNodeUserSids = listResultBeans.getData().get(0).getASSIGNEE_();
String nextName = listResultBeans.getData().get(0).getName_();
if ("发起申请".equals(nextName)) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
baseVehicleTempstateFeign.delByBusSid(busArrearsCarryVehicleApply.getSid());
} else {
messageFlowableQuery.setMsgContent(busArrearsCarryVehicleApply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
BusArrearsCarryVehicleApply finalBusArrearsCarryVehicleApply = busArrearsCarryVehicleApply;
Future future1 = pool.submit(() -> {
List<BaseVehicleStateDto> dtoList = new ArrayList<>();
List<String> vinSidList = baseMapper.selectByNo(finalBusArrearsCarryVehicleApply.getSid());
vinSidList.removeAll(Collections.singleton(null));
if (!vinSidList.isEmpty()) {
vinSidList.stream().forEach(v -> {
BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.QKTCZZ.getTypeKey());
baseVehicleStateDto.setBusSid(v);
dtoList.add(baseVehicleStateDto);
});
ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
BusArrearsCarryVehicleApply finalBusArrearsCarryVehicleApply = busArrearsCarryVehicleApply;
Future future1 = pool.submit(() -> {
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = finalBusArrearsCarryVehicleApply.getProcInstId();
ufVo.setProcInsId(procId);
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(query.getBusinessSid());
messageFlowableQuery.setModuleName("欠款提车申请");
/* ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
String nextName = listResultBean.getData().get(0).getName_();*/
if ("发起申请".equals(nextName)) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
baseVehicleTempstateFeign.delByBusSid(finalBusArrearsCarryVehicleApply.getSid());
} else {
messageFlowableQuery.setMsgContent(finalBusArrearsCarryVehicleApply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
}
messageFlowableQuery.setMsgTitle("欠款提车申请");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
});
} catch (Exception e) {
e.printStackTrace();
}
messageFlowableQuery.setMsgTitle("欠款提车申请");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
return rb.success();
}
}
@ -2322,7 +2367,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
}
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", query.getBusinessSid());
appMap.put("contractNO",busArrearsCarryVehicleApply.getContractNo());
appMap.put("contractNO", busArrearsCarryVehicleApply.getContractNo());
variables.put("app", appMap);
//=================================
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
@ -2336,14 +2381,46 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
if (!resultBean.getSuccess()) {
return rb.setMsg("操作失败!");
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
String nextNodeUserSids = resultBean.getData().getNextNodeUserSids();
busArrearsCarryVehicleApply = fetchBySid(query.getBusinessSid());
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(busArrearsCarryVehicleApply.getProcInstId());
/* ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(busArrearsCarryVehicleApply.getProcInstId());
String nextName = listResultBean.getData().get(0).getName_();
if ("发起申请".equals(nextName)) {
baseVehicleTempstateFeign.delByBusSid(busArrearsCarryVehicleApply.getSid());
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
*/
ResultBean<List<LatestTaskVo>> listResultBeans = flowTaskFeign.getLatestTasks(busArrearsCarryVehicleApply.getProcInstId());
// String nextNodeUserSids = listResultBeans.getData().get(0).getASSIGNEE_();
String nextName = listResultBeans.getData().get(0).getName_();
if ("发起申请".equals(nextName)) {
baseVehicleTempstateFeign.delByBusSid(busArrearsCarryVehicleApply.getSid());
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
BusArrearsCarryVehicleApply finalBusArrearsCarryVehicleApply = busArrearsCarryVehicleApply;
Future future1 = pool.submit(() -> {
List<BaseVehicleStateDto> dtoList = new ArrayList<>();
List<String> vinSidList = baseMapper.selectByNo(finalBusArrearsCarryVehicleApply.getSid());
vinSidList.removeAll(Collections.singleton(null));
if (!vinSidList.isEmpty()) {
vinSidList.stream().forEach(v -> {
BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.QKTCZZ.getTypeKey());
baseVehicleStateDto.setBusSid(v);
dtoList.add(baseVehicleStateDto);
});
ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
return rb.success().setData(resultBean.getData());
}
}
@ -2660,7 +2737,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
return rb.success().setData(url);
}
public ResultBean<String> printApplyPdf(String sid,String name) {
public ResultBean<String> printApplyPdf(String sid, String name) {
ResultBean<String> rb = ResultBean.fireFail();
Map<String, Object> map = new HashMap<>();
/* ResultBean<AppArrearsCarryInfoVo> resultBean = details(sid);
@ -2791,7 +2868,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
List<PCHistTaskListAndCommentList> flowRecordVo = flowableFeignPro.flowRecordAndComment(busArrearsCarryVehicleApply.getProcInstId(), "1").getData();
List<BusArrearsCarryVehicleFlowableVo> busArrearsCarryVehicleFlowableVos = new ArrayList<>();
flowRecordVo.removeAll(Collections.singleton(null));
if(!flowRecordVo.isEmpty()){
if (!flowRecordVo.isEmpty()) {
for (PCHistTaskListAndCommentList flowTask : flowRecordVo) {
if (flowTask.getFlowableRecordVo() != null) {
Map<String, Object> flowableRecordVo = flowTask.getFlowableRecordVo();
@ -2802,9 +2879,9 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
String comment1 = (String) comment.get("comment");
busArrearsCarryVehicleFlowableVo.setName(assigneeName);
busArrearsCarryVehicleFlowableVo.setComment(comment1);
if(flowableRecordVo.get("finishTime") != null && flowableRecordVo.get("finishTime") != ""){
if (flowableRecordVo.get("finishTime") != null && flowableRecordVo.get("finishTime") != "") {
busArrearsCarryVehicleFlowableVo.setSpsj(flowableRecordVo.get("finishTime").toString());
}else{
} else {
busArrearsCarryVehicleFlowableVo.setSpsj(null);
}
busArrearsCarryVehicleFlowableVos.add(busArrearsCarryVehicleFlowableVo);
@ -2856,11 +2933,11 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
// busArrearsCarryVehicleFlowableVos.sort(Comparator.comparing(BusArrearsCarryVehicleFlowableVo::getSpsj, Comparator.nullsLast(LocalDate::compareTo)));
// Collections.sort(busArrearsCarryVehicleFlowableVos, Comparator.nullsLast(Comparator.comparing(BusArrearsCarryVehicleFlowableVo::getSpsj)));
busArrearsCarryVehicleFlowableVos.sort(Comparator.nullsLast(Comparator.comparing(BusArrearsCarryVehicleFlowableVo::getSpsj,nullComparator)));
busArrearsCarryVehicleFlowableVos.sort(Comparator.nullsLast(Comparator.comparing(BusArrearsCarryVehicleFlowableVo::getSpsj, nullComparator)));
map.put("lcList", busArrearsCarryVehicleFlowableVos);
map.put("photoPath64", photoList);
map.put("downName",name);
map.put("downTime",DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
map.put("downName", name);
map.put("downTime", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
//============================================================================

1
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java

@ -103,6 +103,7 @@ public interface BusDeliveredApplyMapper extends BaseMapper<BusDeliveredApply> {
IPage<AppDeliveredApplyPageVo> getRetrievalApplyList(IPage<AppDeliveredApplyPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppDeliveredApplyPageQuery> qw, @Param("name") String name);
List<String> selectVinNo(@Param("contractId") String contractId, @Param("list") List<String> vinSid);
List<String> selectVinNosss(@Param("contractId") String contractId, @Param("list") List<String> vinSid);
String selectNum(String billNo);

13
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml

@ -110,6 +110,19 @@
</foreach>
</select>
<select id="selectVinNosss" resultType="java.lang.String">
select RIGHT(bv.linkNo, 8)
from bus_sales_order_vehicle bv
left join bus_sales_order bo on bv.salesOrderSid = bo.sid
left join anrui_base.base_vehicle_state bs on bs.busSid = bv.sid
where bo.contractNo = #{contractId}
and bs.busState != '401' and (bs.finState != '1' or bs.carryVehicleState != '1')
and bv.linkSid in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</select>
<select id="selectNum" resultType="java.lang.String">
select RIGHT(billNo, 4)
from bus_delivered_apply

64
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@ -51,6 +51,7 @@ import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign;
import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
import com.yxt.anrui.base.common.enums.CertificState;
import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApply;
import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsVo;
import com.yxt.anrui.buscenter.api.busdelivered.BusDelivered;
import com.yxt.anrui.buscenter.api.busdelivered.DeliveredDictVo;
@ -372,7 +373,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
if (busDeliveredApply == null) {
return rb.setMsg("该申请不存在");
}
List<BaseVehicleStateDto> stateDtoList = new ArrayList<>();
/*List<BaseVehicleStateDto> stateDtoList = new ArrayList<>();
List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(dtoSid);
vinSidList.removeAll(Collections.singleton(null));
if (!vinSidList.isEmpty()) {
@ -383,7 +384,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
stateDtoList.add(baseVehicleStateDto);
});
ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(stateDtoList);
}
}*/
List<BusDeliveredApplyDetailsDto> dtoList = dto.getDetailsList();
if (dtoList.size() > 0) {
busDeliveredApplyDetailsService.saveList(dtoList, busDeliveredApply.getSid());
@ -522,7 +523,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
}*/
if (sidsList.size() > 0) {
for (int i = 0; i < sidsList.size(); i++) {
List<BaseVehicleStateDto> stateDtoList = new ArrayList<>();
/*List<BaseVehicleStateDto> stateDtoList = new ArrayList<>();
List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(sidsList.get(i));
vinSidList.removeAll(Collections.singleton(null));
if (!vinSidList.isEmpty()) {
@ -533,7 +534,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
stateDtoList.add(baseVehicleStateDto);
});
ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(stateDtoList);
}
}*/
busDeliveredApplyDetailsService.deleteByApplySid(sidsList.get(i));
busDeliveredUseMessageService.deleteByApplySid(sidsList.get(i));
busDeliveredDetailsDiscountService.deleteByApplySid(sidsList.get(i));
@ -1562,7 +1563,6 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(busDeliveredApply.getProcInstId());
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
String nextName = listResultBean.getData().get(0).getName_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if ("发起申请".equals(nextName)) {
List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(query.getBusinessSid());
//更新该合同的该车架号的状态为1
@ -1596,25 +1596,39 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
//极光推送
UpdateFlowFieldVo ufVo = resultBean.getData();
busDeliveredApply = fetchBySid(query.getBusinessSid());
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
messageFlowVo.setProcInsId(busDeliveredApply.getProcInstId());
messageFlowVo.setProcDefId(busDeliveredApply.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap((Map<String, Object>) variables.get("app"));
messageFlowableQuery.setBusinessSid(query.getBusinessSid());
messageFlowableQuery.setModuleName("出库申请");
ResultBean<List<LatestTaskVo>> listResultBean2 = flowTaskFeign.getLatestTasks(busDeliveredApply.getProcInstId());
String nextNodeUserSids2 = listResultBean2.getData().get(0).getASSIGNEE_();
String nextName2 = listResultBean2.getData().get(0).getName_();
if ("发起申请".equals(nextName2)) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
messageFlowableQuery.setMsgContent(busDeliveredApply.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
BusDeliveredApply finalBusDeliveredApply = busDeliveredApply;
Map<String, Object> finalVariables = variables;
Future future1 = pool.submit(() -> {
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
messageFlowVo.setProcInsId(finalBusDeliveredApply.getProcInstId());
messageFlowVo.setProcDefId(finalBusDeliveredApply.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap((Map<String, Object>) finalVariables.get("app"));
messageFlowableQuery.setBusinessSid(query.getBusinessSid());
messageFlowableQuery.setModuleName("出库申请");
ResultBean<List<LatestTaskVo>> listResultBean2 = flowTaskFeign.getLatestTasks(finalBusDeliveredApply.getProcInstId());
String nextNodeUserSids2 = listResultBean2.getData().get(0).getASSIGNEE_();
String nextName2 = listResultBean2.getData().get(0).getName_();
if ("发起申请".equals(nextName2)) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
messageFlowableQuery.setMsgContent(finalBusDeliveredApply.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
}
messageFlowableQuery.setMsgTitle("出库申请");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
});
} catch (Exception e) {
e.printStackTrace();
}
messageFlowableQuery.setMsgTitle("出库申请");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
return rb.success();
}
@ -2416,6 +2430,10 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
return rb.setMsg(String.join(",", vinNoLists) + "已发起过出库流程");
}
}
List<String> vinNoListss = baseMapper.selectVinNosss(dto.getContractId(), vinSid);
if (!vinNoListss.isEmpty()) {
return rb.setMsg(String.join(",", vinNoListss) + "不符合出库的条件");
}
//判断是否存在优惠包超出的情况
int giveNumBySid = 0;
for (int i = 0; i < carList.size(); i++) {

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java

@ -168,7 +168,7 @@ public class BusDeliveredApplyDetailsService extends MybatisBaseService<BusDeliv
}
}
List<BaseVehicleStateDto> stateDtoList = new ArrayList<>();
/* List<BaseVehicleStateDto> stateDtoList = new ArrayList<>();
List<String> vinSidList = selectVinSidByApplySid(sid);
vinSidList.removeAll(Collections.singleton(null));
if (!vinSidList.isEmpty()) {
@ -179,7 +179,7 @@ public class BusDeliveredApplyDetailsService extends MybatisBaseService<BusDeliv
stateDtoList.add(baseVehicleStateDto);
});
ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(stateDtoList);
}
}*/
}
/**

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

@ -1951,21 +1951,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
if (StringUtils.isBlank(record.getClosingDate())) {
record.setClosingDate("-");
}
/*************再次发起按钮显示****************/
/* if (StringUtils.isNotBlank(pq.getParams().getType())) {
String type = pq.getParams().getType();
if (type.equals("2")) {
record.setShowRePublishBtn(true);
} else {
record.setShowRePublishBtn(false);
}
}*/
/**************************************/
ResultBean<CommonContractVo> commonContractVoResultBean = commonContractFeign.getContractBySalesOrderSid(record.getSaleOrderSid());
/* ResultBean<CommonContractVo> commonContractVoResultBean = commonContractFeign.getContractBySalesOrderSid(record.getSaleOrderSid());
if (commonContractVoResultBean.getData() != null) {
record.setContractId(commonContractVoResultBean.getData().getContractNo());
}
AppOrderDetailsVo appOrderDetailsVo = getSaleOrderDetails(record.getSaleOrderSid()).getData();
}*/
/*AppOrderDetailsVo appOrderDetailsVo = getSaleOrderDetails(record.getSaleOrderSid()).getData();
AppOrderModelInfoVo modelInfo = appOrderDetailsVo.getModelInfo();
List<String> vinSids = new ArrayList<>();
if (modelInfo != null) {
@ -1975,7 +1965,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
vinSids.add(vinListsVo.getVinSid());
}
}
}
}*/
List<String> vinSids = busSalesOrderVehicleService.selectBySalesOrderSid(record.getSaleOrderSid());
vinSids.removeAll(Collections.singleton(null));
if (vinSids.size() > 0) {
int i = busHandoverService.selectByCount(record.getContractId(), vinSids);
if (record.isShowStopBtn() && i < vinSids.size()) {
@ -7086,16 +7078,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
ResultBean<List<String>> rb = ResultBean.fireFail();
List<String> stringList = baseMapper.selectQKBusinessSid(userSid, useOrgSid);
stringList.removeAll(Collections.singleton(null));
List<String> busSids = new ArrayList<>();
for (String orderSid : stringList) {
SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetails(orderSid).getData();
if (solutionsDetailsVo != null) {
if ("02".equals(solutionsDetailsVo.getTypeKey())) {
busSids.add(orderSid);
}
}
}
return rb.success().setData(busSids);
return rb.success().setData(stringList);
}
public List<String> selectByContractNoToVin(String contractId) {

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.java

@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractDetailsVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@ -62,4 +63,7 @@ public interface BusSalesOrderLoancontractMapper extends BaseMapper<BusSalesOrde
@Select("select * from bus_sales_order_loancontract")
List<BusSalesOrderLoancontractVo> selectListVo();
@Select("select * from bus_sales_order_loancontract where borrowerSid = #{saleOrderBorrowerSid}")
List<BusSalesOrderLoancontractDetailsVo> selectByBorrowerSid(String saleOrderBorrowerSid);
}

13
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java

@ -74,10 +74,10 @@ public class BusSalesOrderLoancontractRest implements BusSalesOrderLoancontractF
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody BusSalesOrderLoancontractDto dto){
public ResultBean<String> save(@RequestBody BusSalesOrderLoancontractDto dto){
ResultBean rb = ResultBean.fireFail();
busSalesOrderLoancontractService.saveOrUpdateDto(dto);
return rb.success();
String sid = busSalesOrderLoancontractService.saveOrUpdateDto(dto);
return rb.success().setData(sid);
}
@Override
@ -97,4 +97,11 @@ public class BusSalesOrderLoancontractRest implements BusSalesOrderLoancontractF
BusSalesOrderLoancontractDetailsVo vo = busSalesOrderLoancontractService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
@Override
public ResultBean<List<BusSalesOrderLoancontractDetailsVo>> selectByBorrowerSid(String saleOrderBorrowerSid) {
ResultBean rb = ResultBean.fireFail();
List<BusSalesOrderLoancontractDetailsVo> busSalesOrderLoancontractDetailsVos = busSalesOrderLoancontractService.selectByBorrowerSid(saleOrderBorrowerSid);
return rb.success().setData(busSalesOrderLoancontractDetailsVos);
}
}

14
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java

@ -76,19 +76,21 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
return p;
}
public void saveOrUpdateDto(BusSalesOrderLoancontractDto dto){
public String saveOrUpdateDto(BusSalesOrderLoancontractDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
String sid = this.insertByDto(dto);
return sid;
}
this.updateByDto(dto);
return dtoSid;
}
public void insertByDto(BusSalesOrderLoancontractDto dto){
public String insertByDto(BusSalesOrderLoancontractDto dto){
BusSalesOrderLoancontract entity = new BusSalesOrderLoancontract();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
return entity.getSid();
}
public void updateByDto(BusSalesOrderLoancontractDto dto){
@ -107,4 +109,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
BeanUtil.copyProperties(entity, vo);
return vo;
}
public List<BusSalesOrderLoancontractDetailsVo> selectByBorrowerSid(String saleOrderBorrowerSid) {
return baseMapper.selectByBorrowerSid(saleOrderBorrowerSid);
}
}

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

@ -39,6 +39,7 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.QCarVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import java.util.List;
@ -141,4 +142,9 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
@Select("select * from bus_sales_order_vehicle where linkSid = #{vehSid} and salesOrderSid = #{orderSid}")
BusSalesOrderVehicle selectOneByVehSidAndOrderSid(@Param("vehSid") String vehSid, @Param("orderSid") String orderSid);
List<String> selectBySalesOrderSid(String saleOrderSid);
@Update("update bus_sales_order_vehicle set borrowerSid = #{borrowerSid},loanContractSid = #{loanContractSid} where sid = #{sid}")
void updateXDCon(@Param("sid") String sid, @Param("borrowerSid") String borrowerSid, @Param("loanContractSid") String loanContractSid);
}

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml

@ -216,4 +216,8 @@
AND bs.vinNo != ''
</where>
</select>
<select id="selectBySalesOrderSid" resultType="java.lang.String">
select linkSid from bus_sales_order_vehicle where salesOrderSid = #{saleOrderSid} and length(linkSid)>0
</select>
</mapper>

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

@ -128,5 +128,10 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
return busSalesOrderVehicleService.selectListByvinNo(vinNo);
}
@Override
public ResultBean updateXDCon(String sid, String borrowerSid, String loanContractSid) {
return busSalesOrderVehicleService.updateXDCon(sid,borrowerSid,loanContractSid);
}
}

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

@ -557,4 +557,14 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
return baseMapper.selectOneByVehSidAndOrderSid(vehSid,orderSid);
}
public ResultBean updateXDCon(String sid, String borrowerSid, String loanContractSid) {
ResultBean rb = ResultBean.fireFail();
baseMapper.updateXDCon(sid,borrowerSid,loanContractSid);
return rb.success();
}
public List<String> selectBySalesOrderSid(String saleOrderSid) {
return baseMapper.selectBySalesOrderSid(saleOrderSid);
}
}

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

@ -41,6 +41,7 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehicleappendix.BaseVehicleAppendixFeign;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign;
@ -2015,6 +2016,13 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
public ResultBean submitFinBillApplicationQK(SubmitFinBillApplicationDto dto) {
ResultBean rb = ResultBean.fireFail();
List<FinBillVehicleDto> finBillVehicles = dto.getFinBillVehicles();
for (FinBillVehicleDto finBillVehicle : finBillVehicles) {
BaseVehicleState baseVehicleState = baseVehicleStateFeign.selectByVinSid(finBillVehicle.getVehSid()).getData();
if (baseVehicleState == null){
return rb.setMsg("车架号" + finBillVehicle.getVinNo() + "已发起过欠款提车或欠款开票,请重新选择");
}
}
String contractNo = dto.getContractNo();
List<FinBillApplicationDetailsVo> finBillApplicationDetailsVos = baseMapper.selectByContractNo(contractNo);
if (finBillApplicationDetailsVos != null) {

4
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowFeign.java

@ -32,8 +32,4 @@ public interface FlowFeign {
@ResponseBody
ResultBean<UpdateFlowFieldVo> handleProsess(@RequestBody BusinessVariables bv);
@ApiOperation(value = "驳回流程")
@PostMapping(value = "/taskReject")
@ResponseBody
ResultBean<UpdateFlowFieldVo> taskReject(@RequestBody com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl);
}

5
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowRest.java

@ -100,10 +100,5 @@ public class FlowRest implements FlowFeign {
return updateFlowFieldVoResultBean;
}
@Override
public ResultBean<UpdateFlowFieldVo> taskReject(FlowTaskVo fl) {
return flowService.taskReject(fl);
}
}

24
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java

@ -747,28 +747,4 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> {
}
return rb.success().setMsg("抄送" + userName.toString() + "成功!");
}
public ResultBean<UpdateFlowFieldVo> taskReject(FlowTaskVo fl) {
ResultBean<UpdateFlowFieldVo> rb = ResultBean.fireFail();
UpdateFlowFieldVo vo = new UpdateFlowFieldVo();
//获取表单中的参数
Map<String, Object> formVariables = fl.getValues();
formVariables = formVariables == null ? new HashMap<>() : formVariables;
formVariables.put("businessSid", fl.getBusinessSid());
//当前任务task
Task task = taskService.createTaskQuery().taskId(fl.getTaskId()).singleResult();
if (task.isSuspended()) {
return rb.setMsg("任务处于挂起状态");
}
// 获取流程定义信息
ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(task.getProcessDefinitionId()).singleResult();
// 获取所有节点信息
Process process = repositoryService.getBpmnModel(processDefinition.getId()).getProcesses().get(0);
// 获取全部节点列表,包含子节点
Collection<FlowElement> allElements = FlowableUtils.getAllElements(process.getFlowElements(), null);
return null;
}
}

57
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamine.java

@ -0,0 +1,57 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-riskcenter(家访资料审核) <br/>
* File: LoanHomevisitFileexamine.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamine <br/>
* Description: 家访资料审核. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-08-24 09:29:41 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "家访资料审核", description = "家访资料审核")
@TableName("loan_homevisit_fileexamine")
public class LoanHomevisitFileexamine extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("家访考察sid")
private String homeVisitSid;
@ApiModelProperty("销售订单sid")
private String saleOrderSid;
}

100
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineDetailsVo.java

@ -0,0 +1,100 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: anrui-riskcenter(家访资料审核) <br/>
* File: LoanHomevisitFileexamineVo.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo <br/>
* Description: 家访资料审核 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-08-24 09:29:41 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "家访资料审核 视图数据详情", description = "家访资料审核 视图数据详情")
public class LoanHomevisitFileexamineDetailsVo implements Vo {
private String sid;
private String remarks;
private String homeVisitSid;
private String saleOrderSid;
@ApiModelProperty("定位信息")
private List<String> location;
@ApiModelProperty("房屋照片")
private List<String> house;
@ApiModelProperty("门口照片")
private List<String> doorway;
@ApiModelProperty("客厅卧室")
private List<String> indoor;
@ApiModelProperty("合影照等")
private List<String> groupPhoto;
@ApiModelProperty("贷款人身份证")
private List<String> lenderIdCard;
@ApiModelProperty("贷款人户口本")
private List<String> lenderAccount;
@ApiModelProperty("贷款人婚姻证明")
private List<String> lenderMarriageCertificate;
@ApiModelProperty("贷款人驾驶本")
private List<String> lenderDriverBook;
@ApiModelProperty("贷款人银行流水")
private List<String> lenderBankStatement;
@ApiModelProperty("配偶身份证")
private List<String> spouseIdCard;
@ApiModelProperty("配偶户口本")
private List<String> spouseAccount;
@ApiModelProperty("担保人身份证")
private List<String> guarantorIdCard;
@ApiModelProperty("担保人户口本")
private List<String> guarantorAccount;
@ApiModelProperty("银行卡")
private List<String> yhkImages;
@ApiModelProperty("房产")
private List<String> houseProperty;
@ApiModelProperty("车辆")
private List<String> carProperty;
@ApiModelProperty("消贷合同编号")
private List<String> loanCotractNos;
@ApiModelProperty("资方合同编号")
private List<String> bankContractNos;
}

59
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineDto.java

@ -0,0 +1,59 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-riskcenter(家访资料审核) <br/>
* File: LoanHomevisitFileexamineDto.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineDto <br/>
* Description: 家访资料审核 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-08-24 09:29:41 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "家访资料审核 数据传输对象", description = "家访资料审核 数据传输对象")
public class LoanHomevisitFileexamineDto implements Dto {
private String sid; // sid
private String remarks;
@ApiModelProperty("家访考察sid")
private String homeVisitSid;
@ApiModelProperty("销售订单sid")
private String saleOrderSid;
}

80
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineFeign.java

@ -0,0 +1,80 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateQuery;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: anrui-riskcenter(家访资料审核) <br/>
* File: LoanHomevisitFileexamineFeign.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineFeign <br/>
* Description: 家访资料审核. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-08-24 09:29:41 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "家访资料审核")
@FeignClient(
contextId = "anrui-riskcenter-LoanHomevisitFileexamine",
name = "anrui-riskcenter",
path = "v1/loanhomevisitfileexamine",
fallback = LoanHomevisitFileexamineFeignFallback.class)
public interface LoanHomevisitFileexamineFeign {
@ApiOperation("家访资料审核列表")
@PostMapping("/homeInforListPage")
@ResponseBody
public ResultBean<PagerVo<LoanHomevisitFileexamineVo>> homeInforListPage(@RequestBody PagerQuery<LoanHomevisitFileexamineQuery> pq);
@ApiOperation("新增或修改")
@PostMapping("/save")
@ResponseBody
public ResultBean save(@RequestBody LoanHomevisitFileexamineDto dto);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@ResponseBody
public ResultBean delBySids(@RequestBody String[] sids);
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean<LoanHomevisitFileexamineDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
}

74
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineFeignFallback.java

@ -0,0 +1,74 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateQuery;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* Project: anrui-riskcenter(家访资料审核) <br/>
* File: LoanHomevisitFileexamineFeignFallback.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineFeignFallback <br/>
* Description: 家访资料审核. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-08-24 09:29:41 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class LoanHomevisitFileexamineFeignFallback implements LoanHomevisitFileexamineFeign {
@Override
public ResultBean<PagerVo<LoanHomevisitFileexamineVo>> homeInforListPage(PagerQuery<LoanHomevisitFileexamineQuery> pq) {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-riskcenter/loanhomevisitfileexamine/homeInforListPage无法访问");
}
@Override
public ResultBean save(LoanHomevisitFileexamineDto dto){
return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanhomevisitfileexamine/save无法访问");
}
@Override
public ResultBean delBySids( String[] sids){
return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanhomevisitfileexamine/delBySids无法访问");
}
@Override
public ResultBean<LoanHomevisitFileexamineDetailsVo> fetchDetailsBySid(String sid){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-riskcenter/loanhomevisitfileexamine/fetchDetailsBySid无法访问");
}
}

81
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineQuery.java

@ -0,0 +1,81 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-riskcenter(家访资料审核) <br/>
* File: LoanHomevisitFileexamineQuery.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineQuery <br/>
* Description: 家访资料审核 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-08-24 09:29:41 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "家访资料审核 查询条件", description = "家访资料审核 查询条件")
public class LoanHomevisitFileexamineQuery implements Query {
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("分公司名称")
private String useOrgName;
@ApiModelProperty("销售部门名称")
private String saleDeptName;
@ApiModelProperty("销售专员名称")
private String staffName;
@ApiModelProperty("订单开始日期")
private String orderStartDate;
@ApiModelProperty("订单结束日期")
private String orderEndDate;
@ApiModelProperty("预约家访开始时间")
private String resHomeVisStartDate;
@ApiModelProperty("预约家访结束时间")
private String resHomeVisEndDate;
@ApiModelProperty("合同编号")
private String contractNo;
@ApiModelProperty("贷款人名称")
private String loanPeoName;
@ApiModelProperty("金融产品名称")
private String policyName;
@ApiModelProperty("家访专员姓名")
private String homeVisStaffName;
@ApiModelProperty("组织全路径")
private String orgSidPath;
private String menuUrl;
private String type;
private String names;
}

81
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineVo.java

@ -0,0 +1,81 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-riskcenter(家访资料审核) <br/>
* File: LoanHomevisitFileexamineVo.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo <br/>
* Description: 家访资料审核 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-08-24 09:29:41 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "家访资料审核 视图数据对象", description = "家访资料审核 视图数据对象")
public class LoanHomevisitFileexamineVo implements Vo {
private String sid; // sid
@ApiModelProperty("家访资料审核状态")
private String state;
@ApiModelProperty("订单日期")
private String createDate;
@ApiModelProperty("预约家访时间")
private String resHomeVisDate;
@ApiModelProperty("家访地点")
private String homeVisAddress;
@ApiModelProperty("分公司名称")
private String useOrgName;
@ApiModelProperty("销售部门名称")
private String orgName;
@ApiModelProperty("销售专员名称")
private String staffName;
@ApiModelProperty("合同编号")
private String contractNo;
@ApiModelProperty("贷款人名称")
private String borrowerName;
@ApiModelProperty("手机号码")
private String mobile;
@ApiModelProperty("金融产品名称")
private String policyName;
@ApiModelProperty("家访专员姓名")
private String homeVisStaffName;
@ApiModelProperty("考察结果value")
private String investigateValue;
}

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

@ -50,12 +50,14 @@ public class LoanHomeVisitInvestigateInitCustomerVo implements Vo {
private String spouseIdCard;
@ApiModelProperty("配偶电话")
private String spouseMobile;
@ApiModelProperty("配偶职业key")
private String spouseJobKey;
@ApiModelProperty("配偶职业")
private String spouseJob;
@ApiModelProperty("配偶户籍地址")
private String spouseDomAddress;
private String spouseRegisterAddress;
@ApiModelProperty("配偶现住址")
private String spousePreAddress;
private String spouseAddress;
@ApiModelProperty("其他人员")
private List<LoanHomeVisitInvestigateInitOtherPeoVo> otherPersonnel = new ArrayList<>();
@ApiModelProperty("紧急联系人姓名")
@ -66,4 +68,6 @@ public class LoanHomeVisitInvestigateInitCustomerVo implements Vo {
private String emergencyContactType;
@ApiModelProperty("紧急联系人类型key")
private String emergencyContactTypeKey;
@ApiModelProperty("家访考察表sid")
private String mainSid;
}

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

@ -50,8 +50,14 @@ public class LoanHomeVisitInvestigateSaveCustomerDto implements Dto {
private String spouseIdCard;
@ApiModelProperty("配偶电话")
private String spouseMobile;
@ApiModelProperty("配偶职业key")
private String spouseJobKey;
@ApiModelProperty("配偶职业")
private String spouseJob;
@ApiModelProperty("配偶户籍地址")
private String spouseRegisterAddress;
@ApiModelProperty("配偶现住址")
private String spouseAddress;
@ApiModelProperty("其他人员")
private List<LoanHomeVisitInvestigateSaveOtherPeoDto> otherPersonnel = new ArrayList<>();
@ApiModelProperty("紧急联系人姓名")

14
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomeVisitInvestigateInitOrderVo.java

@ -10,18 +10,24 @@ public class LoanHomeVisitInvestigateInitOrderVo implements Vo {
private String sid;
@ApiModelProperty("销售订单sid")
private String orderSid;
@ApiModelProperty("车辆信息是否确认")
@ApiModelProperty("车辆信息是否确认key")
private String carInfoKey;
@ApiModelProperty("车辆信息是否确认")
private String carInfoType;
@ApiModelProperty("车辆信息备注")
private String carInfoRemarks;
@ApiModelProperty("金融方案是否确认")
@ApiModelProperty("金融方案是否确认key")
private String financeKey;
@ApiModelProperty("金融方案是否确认")
private String financeType;
@ApiModelProperty("金融方案备注")
private String financeRemarks;
@ApiModelProperty("金融首付比例")
private String finDownPay;
private String paymentRatio;
@ApiModelProperty("金融首付比例key")
private String paymentRatiokey;
@ApiModelProperty("金融首付比例备注")
private String finDownPayRemarks;
private String paymentRemarks;
@ApiModelProperty("家访考察表sid")
private String mainSid;
}

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

@ -10,18 +10,24 @@ public class LoanHomeVisitInvestigateSaveOrderDto implements Vo {
private String sid;
@ApiModelProperty("销售订单sid")
private String orderSid;
@ApiModelProperty("车辆信息是否确认")
@ApiModelProperty("车辆信息是否确认key")
private String carInfoKey;
@ApiModelProperty("车辆信息是否确认")
private String carInfoType;
@ApiModelProperty("车辆信息备注")
private String carInfoRemarks;
@ApiModelProperty("金融方案是否确认")
@ApiModelProperty("金融方案是否确认key")
private String financeKey;
@ApiModelProperty("金融方案是否确认")
private String financeType;
@ApiModelProperty("金融方案备注")
private String financeRemarks;
@ApiModelProperty("金融首付比例")
private String finDownPay;
private String paymentRatio;
@ApiModelProperty("金融首付比例key")
private String paymentRatiokey;
@ApiModelProperty("金融首付比例备注")
private String finDownPayRemarks;
private String paymentRemarks;
@ApiModelProperty("家访考察表sid")
private String mainSid;
}

20
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrder.java

@ -50,19 +50,25 @@ import lombok.Data;
public class LoanHomevisitInvestigateOrder extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("车辆信息确认key")
private String carConfirmKey;
@ApiModelProperty("车辆信息确认")
private String carConfirm; // 车辆信息确认
private String carConfirm;
@ApiModelProperty("车辆信息确认备注")
private String carRemarks; // 车辆信息确认备注
private String carRemarks;
@ApiModelProperty("金融方案信息确认key")
private String finConfirmKey;
@ApiModelProperty("金融方案信息确认")
private String finConfirm; // 金融方案信息确认
private String finConfirm;
@ApiModelProperty("金融方案信息确认备注")
private String finRemarks; // 金融方案信息确认备注
private String finRemarks;
@ApiModelProperty("金融首付比例key")
private String finDownPayKey;
@ApiModelProperty("金融首付比例")
private String finDownPay; // 金融首付比例
private String finDownPay;
@ApiModelProperty("金融首付比例备注")
private String finDownPayRemarks; // 金融首付比例备注
private String finDownPayRemarks;
@ApiModelProperty("家访考察表sid")
private String mainSid; // 家访考察表sid
private String mainSid;
}

34
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderDetailsVo.java

@ -51,19 +51,25 @@ public class LoanHomevisitInvestigateOrderDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("车辆信息确认")
private String carConfirm; // 车辆信息确认
@ApiModelProperty("车辆信息确认备注")
private String carRemarks; // 车辆信息确认备注
@ApiModelProperty("金融方案信息确认")
private String finConfirm; // 金融方案信息确认
@ApiModelProperty("金融方案信息确认备注")
private String finRemarks; // 金融方案信息确认备注
@ApiModelProperty("金融首付比例")
private String finDownPay; // 金融首付比例
@ApiModelProperty("金融首付比例备注")
private String finDownPayRemarks; // 金融首付比例备注
@ApiModelProperty("家访考察表sid")
private String mainSid; // 家访考察表sid
@ApiModelProperty("车辆信息确认key")
private String carConfirmKey;
@ApiModelProperty("车辆信息确认")
private String carConfirm;
@ApiModelProperty("车辆信息确认备注")
private String carRemarks;
@ApiModelProperty("金融方案信息确认key")
private String finConfirmKey;
@ApiModelProperty("金融方案信息确认")
private String finConfirm;
@ApiModelProperty("金融方案信息确认备注")
private String finRemarks;
@ApiModelProperty("金融首付比例key")
private String finDownPayKey;
@ApiModelProperty("金融首付比例")
private String finDownPay;
@ApiModelProperty("金融首付比例备注")
private String finDownPayRemarks;
@ApiModelProperty("家访考察表sid")
private String mainSid;
}

34
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderDto.java

@ -51,19 +51,25 @@ public class LoanHomevisitInvestigateOrderDto implements Dto {
private String sid; // sid
@ApiModelProperty("车辆信息确认")
private String carConfirm; // 车辆信息确认
@ApiModelProperty("车辆信息确认备注")
private String carRemarks; // 车辆信息确认备注
@ApiModelProperty("金融方案信息确认")
private String finConfirm; // 金融方案信息确认
@ApiModelProperty("金融方案信息确认备注")
private String finRemarks; // 金融方案信息确认备注
@ApiModelProperty("金融首付比例")
private String finDownPay; // 金融首付比例
@ApiModelProperty("金融首付比例备注")
private String finDownPayRemarks; // 金融首付比例备注
@ApiModelProperty("家访考察表sid")
private String mainSid; // 家访考察表sid
@ApiModelProperty("车辆信息确认key")
private String carConfirmKey;
@ApiModelProperty("车辆信息确认")
private String carConfirm;
@ApiModelProperty("车辆信息确认备注")
private String carRemarks;
@ApiModelProperty("金融方案信息确认key")
private String finConfirmKey;
@ApiModelProperty("金融方案信息确认")
private String finConfirm;
@ApiModelProperty("金融方案信息确认备注")
private String finRemarks;
@ApiModelProperty("金融首付比例key")
private String finDownPayKey;
@ApiModelProperty("金融首付比例")
private String finDownPay;
@ApiModelProperty("金融首付比例备注")
private String finDownPayRemarks;
@ApiModelProperty("家访考察表sid")
private String mainSid;
}

34
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderQuery.java

@ -49,19 +49,25 @@ import lombok.Data;
@ApiModel(value = "家访考察-订单信息 查询条件", description = "家访考察-订单信息 查询条件")
public class LoanHomevisitInvestigateOrderQuery implements Query {
@ApiModelProperty("车辆信息确认")
private String carConfirm; // 车辆信息确认
@ApiModelProperty("车辆信息确认备注")
private String carRemarks; // 车辆信息确认备注
@ApiModelProperty("金融方案信息确认")
private String finConfirm; // 金融方案信息确认
@ApiModelProperty("金融方案信息确认备注")
private String finRemarks; // 金融方案信息确认备注
@ApiModelProperty("金融首付比例")
private String finDownPay; // 金融首付比例
@ApiModelProperty("金融首付比例备注")
private String finDownPayRemarks; // 金融首付比例备注
@ApiModelProperty("家访考察表sid")
private String mainSid; // 家访考察表sid
@ApiModelProperty("车辆信息确认key")
private String carConfirmKey;
@ApiModelProperty("车辆信息确认")
private String carConfirm;
@ApiModelProperty("车辆信息确认备注")
private String carRemarks;
@ApiModelProperty("金融方案信息确认key")
private String finConfirmKey;
@ApiModelProperty("金融方案信息确认")
private String finConfirm;
@ApiModelProperty("金融方案信息确认备注")
private String finRemarks;
@ApiModelProperty("金融首付比例key")
private String finDownPayKey;
@ApiModelProperty("金融首付比例")
private String finDownPay;
@ApiModelProperty("金融首付比例备注")
private String finDownPayRemarks;
@ApiModelProperty("家访考察表sid")
private String mainSid;
}

34
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderVo.java

@ -51,19 +51,25 @@ public class LoanHomevisitInvestigateOrderVo implements Vo {
private String sid; // sid
@ApiModelProperty("车辆信息确认")
private String carConfirm; // 车辆信息确认
@ApiModelProperty("车辆信息确认备注")
private String carRemarks; // 车辆信息确认备注
@ApiModelProperty("金融方案信息确认")
private String finConfirm; // 金融方案信息确认
@ApiModelProperty("金融方案信息确认备注")
private String finRemarks; // 金融方案信息确认备注
@ApiModelProperty("金融首付比例")
private String finDownPay; // 金融首付比例
@ApiModelProperty("金融首付比例备注")
private String finDownPayRemarks; // 金融首付比例备注
@ApiModelProperty("家访考察表sid")
private String mainSid; // 家访考察表sid
@ApiModelProperty("车辆信息确认key")
private String carConfirmKey;
@ApiModelProperty("车辆信息确认")
private String carConfirm;
@ApiModelProperty("车辆信息确认备注")
private String carRemarks;
@ApiModelProperty("金融方案信息确认key")
private String finConfirmKey;
@ApiModelProperty("金融方案信息确认")
private String finConfirm;
@ApiModelProperty("金融方案信息确认备注")
private String finRemarks;
@ApiModelProperty("金融首付比例key")
private String finDownPayKey;
@ApiModelProperty("金融首付比例")
private String finDownPay;
@ApiModelProperty("金融首付比例备注")
private String finDownPayRemarks;
@ApiModelProperty("家访考察表sid")
private String mainSid;
}

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomeVisitInvestigateInitOtherPeoVo.java

@ -19,7 +19,7 @@ public class LoanHomeVisitInvestigateInitOtherPeoVo implements Vo {
@ApiModelProperty("身份证")
private String idCard;
@ApiModelProperty("户籍地址")
private String peoDomAddress;
private String residentAddress;
@ApiModelProperty("现住址")
private String address;
@ApiModelProperty("公司")

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

@ -19,7 +19,7 @@ public class LoanHomeVisitInvestigateSaveOtherPeoDto implements Vo {
@ApiModelProperty("身份证")
private String idCard;
@ApiModelProperty("户籍地址")
private String peoDomAddress;
private String residentAddress;
@ApiModelProperty("现住址")
private String address;
@ApiModelProperty("公司")

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeo.java

@ -50,6 +50,8 @@ import lombok.Data;
public class LoanHomevisitInvestigateOtherpeo extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("人员身份key")
private String peoTypeKey;
@ApiModelProperty("人员身份")
private String peoType; // 人员身份
@ApiModelProperty("姓名")

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoDetailsVo.java

@ -51,6 +51,8 @@ public class LoanHomevisitInvestigateOtherpeoDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("人员身份key")
private String peoTypeKey;
@ApiModelProperty("人员身份")
private String peoType; // 人员身份
@ApiModelProperty("姓名")

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoDto.java

@ -51,6 +51,8 @@ public class LoanHomevisitInvestigateOtherpeoDto implements Dto {
private String sid; // sid
@ApiModelProperty("人员身份key")
private String peoTypeKey;
@ApiModelProperty("人员身份")
private String peoType; // 人员身份
@ApiModelProperty("姓名")

4
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomeVisitInvestigateInitPropVo.java

@ -28,8 +28,12 @@ public class LoanHomeVisitInvestigateInitPropVo implements Vo {
private String carLoanKey;
@ApiModelProperty("车辆备注")
private String carRemarks;
@ApiModelProperty("首付来源key")
private String downPaymentKey;
@ApiModelProperty("首付来源")
private String downPayment;
@ApiModelProperty("其他收入来源key")
private String otherIncomeKey;
@ApiModelProperty("其他收入来源")
private String otherIncome;
@ApiModelProperty("家访考察表sid")

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

@ -28,8 +28,12 @@ public class LoanHomeVisitInvestigateSavePropDto implements Vo {
private String carLoanKey;
@ApiModelProperty("车辆备注")
private String carRemarks;
@ApiModelProperty("首付来源key")
private String downPaymentKey;
@ApiModelProperty("首付来源")
private String downPayment;
@ApiModelProperty("其他收入来源key")
private String otherIncomeKey;
@ApiModelProperty("其他收入来源")
private String otherIncome;
@ApiModelProperty("家访考察表sid")

30
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomevisitInvestigateProperty.java

@ -51,30 +51,34 @@ public class LoanHomevisitInvestigateProperty extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("是否是房产")
private Boolean isRealEstate; // 是否是房产
private Boolean isRealEstate;
@ApiModelProperty("产权类型")
private int propertyType; // 产权类型
private int propertyType;
@ApiModelProperty("房产贷款情况key")
private String realLoanSituationKey;
@ApiModelProperty("房产贷款情况")
private String realLoanSituation; // 房产贷款情况
private String realLoanSituation;
@ApiModelProperty("房产备注")
private String realRemarks; // 房产备注
private String realRemarks;
@ApiModelProperty("是否是车辆")
private Boolean isCar; // 是否是车辆
private Boolean isCar;
@ApiModelProperty("车辆类型")
private int carType; // 车辆类型
private int carType;
@ApiModelProperty("车辆贷款情况key")
private String carLoanSituationKey;
@ApiModelProperty("车辆贷款情况")
private String carLoanSituation; // 车辆贷款情况
private String carLoanSituation;
@ApiModelProperty("车辆备注")
private String carRemarks; // 车辆备注
private String carRemarks;
@ApiModelProperty("首付来源key")
private String downPaySourceKey; // 首付来源key
private String downPaySourceKey;
@ApiModelProperty("首付来源value")
private String downPaySourceValue; // 首付来源value
private String downPaySourceValue;
@ApiModelProperty("其他收入来源key")
private String otherSourceKey; // 其他收入来源key
private String otherSourceKey;
@ApiModelProperty("其他收入来源value")
private String otherSourceValue; // 其他收入来源value
private String otherSourceValue;
@ApiModelProperty("家访考察表sid")
private String mainSid; // 家访考察表sid
private String mainSid;
}

8
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyDetailsVo.java

@ -55,14 +55,18 @@ public class LoanHomevisitInvestigatePropertyDetailsVo implements Vo {
private Boolean isRealEstate; // 是否是房产
@ApiModelProperty("产权类型")
private int propertyType; // 产权类型
@ApiModelProperty("房产贷款情况")
private String realLoanSituation; // 房产贷款情况
@ApiModelProperty("房产贷款情况key")
private String realLoanSituationKey;
@ApiModelProperty("房产贷款情况")
private String realLoanSituation;
@ApiModelProperty("房产备注")
private String realRemarks; // 房产备注
@ApiModelProperty("是否是车辆")
private Boolean isCar; // 是否是车辆
@ApiModelProperty("车辆类型")
private int carType; // 车辆类型
@ApiModelProperty("车辆贷款情况key")
private String carLoanSituationKey;
@ApiModelProperty("车辆贷款情况")
private String carLoanSituation; // 车辆贷款情况
@ApiModelProperty("车辆备注")

4
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyDto.java

@ -55,6 +55,8 @@ public class LoanHomevisitInvestigatePropertyDto implements Dto {
private Boolean isRealEstate; // 是否是房产
@ApiModelProperty("产权类型")
private int propertyType; // 产权类型
@ApiModelProperty("房产贷款情况key")
private String realLoanSituationKey;
@ApiModelProperty("房产贷款情况")
private String realLoanSituation; // 房产贷款情况
@ApiModelProperty("房产备注")
@ -63,6 +65,8 @@ public class LoanHomevisitInvestigatePropertyDto implements Dto {
private Boolean isCar; // 是否是车辆
@ApiModelProperty("车辆类型")
private int carType; // 车辆类型
@ApiModelProperty("车辆贷款情况key")
private String carLoanSituationKey;
@ApiModelProperty("车辆贷款情况")
private String carLoanSituation; // 车辆贷款情况
@ApiModelProperty("车辆备注")

4
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepVo.java

@ -68,7 +68,9 @@ public class LoanHomevisitPrepVo implements Vo {
@ApiModelProperty("合同编号")
private String contractNo;
@ApiModelProperty("台数")
private String vehCount;
private Integer vehCount;
@ApiModelProperty("贷款人sid")
private String borrowerSid;
@ApiModelProperty("贷款人名称")
private String borrowerName;
@ApiModelProperty("手机号码")

64
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineMapper.java

@ -0,0 +1,64 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.riskcenter.biz.loanhomevisitfileexamine;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigate;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamine;
import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo;
import java.util.List;
/**
* Project: anrui-riskcenter(家访资料审核) <br/>
* File: LoanHomevisitFileexamineMapper.java <br/>
* Class: com.yxt.anrui.riskcenter.biz.loanhomevisitfileexamine.LoanHomevisitFileexamineMapper <br/>
* Description: 家访资料审核. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-08-24 09:29:41 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface LoanHomevisitFileexamineMapper extends BaseMapper<LoanHomevisitFileexamine> {
IPage<LoanHomevisitFileexamineVo> selectPageVo(IPage<LoanHomevisitFileexamine> page, @Param(Constants.WRAPPER) Wrapper<LoanHomevisitFileexamine> qw);
List<LoanHomevisitFileexamineVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<LoanHomevisitFileexamine> qw);
@Select("select * from loan_homevisit_fileexamine")
List<LoanHomevisitFileexamineVo> selectListVo();
}

40
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineMapper.xml

@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.riskcenter.biz.loanhomevisitfileexamine.LoanHomevisitFileexamineMapper">
<select id="selectPageVo"
resultType="com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo">
SELECT
lf.`sid`,
lf.state,
bo.createDate,
li.`resHomeVisDate`,
li.`homeVisAddress`,
bo.`useOrgName`,
bo.`orgName`,
bo.`staffName`,
bo.`contractNo`,
bb.`borrowerName`,
bb.`mobile`,
bb.`policyName`,
li.`homeVisStaffName`,
li.investigateValue
FROM loan_homevisit_fileexamine lf
LEFT JOIN loan_homevisit_investigate li
ON lf.homeVisitSid = li.sid
LEFT JOIN anrui_buscenter.`bus_sales_order_borrower` bb
ON li.`saleOrderBorrowerSid` = bb.`sid`
LEFT JOIN anrui_buscenter.`bus_sales_order` bo
ON li.`saleOrderSid` = bo.`sid`
<where>
${ew.sqlSegment}
</where>
</select>
<select id="selectListAllVo"
resultType="com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo">
SELECT * FROM loan_homevisit_fileexamine
<where>
${ew.sqlSegment}
</where>
</select>
</mapper>

100
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineRest.java

@ -0,0 +1,100 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.riskcenter.biz.loanhomevisitfileexamine;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateQuery;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateVo;
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.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamine;
import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineQuery;
import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo;
import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineDetailsVo;
import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineDto;
import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineFeign;
/**
* Project: anrui-riskcenter(家访资料审核) <br/>
* File: LoanHomevisitFileexamineFeignFallback.java <br/>
* Class: com.yxt.anrui.riskcenter.biz.loanhomevisitfileexamine.LoanHomevisitFileexamineRest <br/>
* Description: 家访资料审核. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-08-24 09:29:41 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "家访资料审核")
@RestController("com.yxt.anrui.riskcenter.biz.loanhomevisitfileexamine.LoanHomevisitFileexamineRest")
@RequestMapping("v1/loanhomevisitfileexamine")
public class LoanHomevisitFileexamineRest implements LoanHomevisitFileexamineFeign {
@Autowired
private LoanHomevisitFileexamineService loanHomevisitFileexamineService;
@Override
public ResultBean<PagerVo<LoanHomevisitFileexamineVo>> homeInforListPage(PagerQuery<LoanHomevisitFileexamineQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<LoanHomevisitFileexamineVo> pv = loanHomevisitFileexamineService.homeInforListPage(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody LoanHomevisitFileexamineDto dto){
ResultBean rb = ResultBean.fireFail();
loanHomevisitFileexamineService.saveOrUpdateDto(dto);
return rb.success();
}
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
loanHomevisitFileexamineService.delBySids(sids);
return rb.success();
}
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<LoanHomevisitFileexamineDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
LoanHomevisitFileexamineDetailsVo vo = loanHomevisitFileexamineService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
}

366
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java

@ -0,0 +1,366 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.riskcenter.biz.loanhomevisitfileexamine;
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.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractFeign;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigate;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateDetailsVo;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateQuery;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateVo;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanAttachTypeEnum;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDetailsVo;
import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigate.LoanHomevisitInvestigateService;
import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileService;
import org.apache.commons.lang3.StringUtils;
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 com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamine;
import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineQuery;
import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo;
import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineDetailsVo;
import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineDto;
import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
* Project: anrui-riskcenter(家访资料审核) <br/>
* File: LoanHomevisitFileexamineService.java <br/>
* Class: com.yxt.anrui.riskcenter.biz.loanhomevisitfileexamine.LoanHomevisitFileexamineService <br/>
* Description: 家访资料审核 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-08-24 09:29:41 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHomevisitFileexamineMapper, LoanHomevisitFileexamine> {
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private LoanHomevisitInvestigateFileService loanHomevisitInvestigateFileService;
@Autowired
private LoanHomevisitInvestigateService loanHomevisitInvestigateService;
@Autowired
private BusSalesOrderLoancontractFeign busSalesOrderLoancontractFeign;
public PagerVo<LoanHomevisitFileexamineVo> homeInforListPage(PagerQuery<LoanHomevisitFileexamineQuery> pq) {
LoanHomevisitFileexamineQuery query = pq.getParams();
QueryWrapper<LoanHomevisitFileexamine> qw = new QueryWrapper<>();
qw.eq("li.state", query.getType());
qw.eq("bb.busNo", 303);
if (StringUtils.isNotBlank(query.getMenuUrl())) {
//=======================
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgSidPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgSidPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("bo.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("bo.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("bo.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("bo.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("bo.createBySid", query.getUserSid());
} else {
PagerVo<LoanHomevisitFileexamineVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<LoanHomevisitFileexamineVo> p = new PagerVo<>();
return p;
}
}
if (StringUtils.isNotBlank(query.getUseOrgName())) {
qw.like("bo.useOrgName", query.getUseOrgName());
}
if (StringUtils.isNotBlank(query.getSaleDeptName())) {
qw.like("bo.orgName", query.getSaleDeptName());
}
if (StringUtils.isNotBlank(query.getStaffName())) {
qw.like("bo.staffName", query.getStaffName());
}
if (StringUtils.isNotBlank(query.getContractNo())) {
qw.like("bo.contractNo", query.getContractNo());
}
if (StringUtils.isNotBlank(query.getLoanPeoName())) {
qw.like("bb.borrowerName", query.getLoanPeoName());
}
if (StringUtils.isNotBlank(query.getPolicyName())) {
qw.like("bb.policyName", query.getPolicyName());
}
if (StringUtils.isNotBlank(query.getHomeVisStaffName())) {
qw.like("li.homeVisStaffName", query.getHomeVisStaffName());
}
String orderStartDate = query.getOrderStartDate();
String orderEndDate = query.getOrderEndDate();
qw.apply(StringUtils.isNotBlank(orderStartDate), "date_format (bo.createDate,'%Y-%m-%d') >= date_format('" + orderStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(orderEndDate), "date_format (bo.createDate,'%Y-%m-%d') <= date_format('" + orderEndDate + "','%Y-%m-%d')"
);
String resHomeVisStartDate = query.getResHomeVisStartDate();
String resHomeVisEndDate = query.getResHomeVisEndDate();
qw.apply(StringUtils.isNotBlank(resHomeVisStartDate), "date_format (li.resHomeVisDate,'%Y-%m-%d') >= date_format('" + resHomeVisStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(resHomeVisEndDate), "date_format (li.resHomeVisDate,'%Y-%m-%d') <= date_format('" + resHomeVisEndDate + "','%Y-%m-%d')"
);
IPage<LoanHomevisitFileexamine> page = PagerUtil.queryToPage(pq);
IPage<LoanHomevisitFileexamineVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<LoanHomevisitFileexamineVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(LoanHomevisitFileexamineDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
public void insertByDto(LoanHomevisitFileexamineDto dto){
LoanHomevisitFileexamine entity = new LoanHomevisitFileexamine();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(LoanHomevisitFileexamineDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
LoanHomevisitFileexamine entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public LoanHomevisitFileexamineDetailsVo fetchDetailsVoBySid(String sid){
LoanHomevisitFileexamineDetailsVo vo = new LoanHomevisitFileexamineDetailsVo();
LoanHomevisitFileexamine loanHomevisitFileexamine = fetchBySid(sid);
BeanUtil.copyProperties(loanHomevisitFileexamine,vo);
LoanHomevisitInvestigateDetailsVo loanHomevisitInvestigateDetailsVo = loanHomevisitInvestigateService.fetchDetailsVoBySid(loanHomevisitFileexamine.getHomeVisitSid());
List<BusSalesOrderLoancontractDetailsVo> busSalesOrderLoancontractDetailsVos = busSalesOrderLoancontractFeign.selectByBorrowerSid(loanHomevisitInvestigateDetailsVo.getSaleOrderBorrowerSid()).getData();
List<String> loanCotractNos = new ArrayList<>();
List<String> bankContractNos = new ArrayList<>();
for (BusSalesOrderLoancontractDetailsVo busSalesOrderLoancontractDetailsVo : busSalesOrderLoancontractDetailsVos) {
loanCotractNos.add("消贷合同号" + "(" +busSalesOrderLoancontractDetailsVo.getLoanCotractNo() + ")");
if (StringUtils.isBlank(busSalesOrderLoancontractDetailsVo.getBankContractNo())){
bankContractNos.add("资方合同号(暂无)");
}else {
bankContractNos.add("资方合同号" + "(" +busSalesOrderLoancontractDetailsVo.getLoanCotractNo() + ")");
}
}
vo.setLoanCotractNos(loanCotractNos);
vo.setBankContractNos(bankContractNos);
//定位信息
List<LoanHomevisitInvestigateFileDetailsVo> dwxxImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DWXX.getAttachType());
List<String> location = new ArrayList<>();
if (dwxxImages != null && dwxxImages.size() > 0){
for (LoanHomevisitInvestigateFileDetailsVo dwxxImage : dwxxImages) {
location.add(dwxxImage.getFileUrl());
}
}
vo.setLocation(location);
//房屋照片
List<LoanHomevisitInvestigateFileDetailsVo> fwzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.FWZP.getAttachType());
List<String> house = new ArrayList<>();
if (fwzpImages != null && fwzpImages.size() > 0){
for (LoanHomevisitInvestigateFileDetailsVo fwzpImage : fwzpImages) {
house.add(fwzpImage.getFileUrl());
}
}
vo.setHouse(house);
//门口照片
List<LoanHomevisitInvestigateFileDetailsVo> mkzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.MKZP.getAttachType());
List<String> doorway = new ArrayList<>();
if (mkzpImages != null && mkzpImages.size() > 0){
for (LoanHomevisitInvestigateFileDetailsVo mkzpImage : mkzpImages) {
doorway.add(mkzpImage.getFileUrl());
}
}
vo.setDoorway(doorway);
//客厅卧室照片
List<LoanHomevisitInvestigateFileDetailsVo> ktwszpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.KTWSZP.getAttachType());
List<String> indoor = new ArrayList<>();
if (ktwszpImages != null && ktwszpImages.size() > 0){
for (LoanHomevisitInvestigateFileDetailsVo ktwszpImage : ktwszpImages) {
indoor.add(ktwszpImage.getFileUrl());
}
}
vo.setIndoor(indoor);
//合影照等
List<LoanHomevisitInvestigateFileDetailsVo> hyzdImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.HYZD.getAttachType());
List<String> groupPhoto = new ArrayList<>();
if (hyzdImages != null && hyzdImages.size() > 0){
for (LoanHomevisitInvestigateFileDetailsVo hyzdImage : hyzdImages) {
groupPhoto.add(hyzdImage.getFileUrl());
}
}
vo.setGroupPhoto(groupPhoto);
//贷款人身份证
List<LoanHomevisitInvestigateFileDetailsVo> dkrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRSFZ.getAttachType());
List<String> lenderIdCard = new ArrayList<>();
if (dkrsfzImages != null && dkrsfzImages.size() > 0){
for (LoanHomevisitInvestigateFileDetailsVo dkrsfzImage : dkrsfzImages) {
lenderIdCard.add(dkrsfzImage.getFileUrl());
}
}
vo.setLenderIdCard(lenderIdCard);
//贷款人户口本
List<LoanHomevisitInvestigateFileDetailsVo> dkrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRHKB.getAttachType());
List<String> lenderAccount = new ArrayList<>();
if (dkrhkbImages != null && dkrhkbImages.size() > 0){
for (LoanHomevisitInvestigateFileDetailsVo dkrhkbImage : dkrhkbImages) {
lenderAccount.add(dkrhkbImage.getFileUrl());
}
}
vo.setLenderAccount(lenderAccount);
//贷款人婚姻证明
List<LoanHomevisitInvestigateFileDetailsVo> dkrhyzmImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRHYZM.getAttachType());
List<String> lenderMarriageCertificate = new ArrayList<>();
if (dkrhyzmImages != null && dkrhyzmImages.size() > 0){
for (LoanHomevisitInvestigateFileDetailsVo dkrhyzmImage : dkrhyzmImages) {
lenderMarriageCertificate.add(dkrhyzmImage.getFileUrl());
}
}
vo.setLenderMarriageCertificate(lenderMarriageCertificate);
//贷款人驾驶本
List<LoanHomevisitInvestigateFileDetailsVo> dkrjsbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRJSB.getAttachType());
List<String> lenderDriverBook = new ArrayList<>();
if (dkrjsbImages != null && dkrjsbImages.size() > 0){
for (LoanHomevisitInvestigateFileDetailsVo dkrjsbImage : dkrjsbImages) {
lenderDriverBook.add(dkrjsbImage.getFileUrl());
}
}
vo.setLenderDriverBook(lenderDriverBook);
//贷款人银行流水
List<LoanHomevisitInvestigateFileDetailsVo> dkryhlsImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRYHLS.getAttachType());
List<String> lenderBankStatement = new ArrayList<>();
if (dkryhlsImages != null && dkryhlsImages.size() > 0){
for (LoanHomevisitInvestigateFileDetailsVo dkryhlsImage : dkryhlsImages) {
lenderBankStatement.add(dkryhlsImage.getFileUrl());
}
}
vo.setLenderBankStatement(lenderBankStatement);
//配偶身份证
List<LoanHomevisitInvestigateFileDetailsVo> posfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.POSFZ.getAttachType());
List<String> spouseIdCard = new ArrayList<>();
if (posfzImages != null && posfzImages.size() > 0){
for (LoanHomevisitInvestigateFileDetailsVo posfzImage : posfzImages) {
spouseIdCard.add(posfzImage.getFileUrl());
}
}
vo.setSpouseIdCard(spouseIdCard);
//配偶户口本
List<LoanHomevisitInvestigateFileDetailsVo> pohkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.POHKB.getAttachType());
List<String> spouseAccount = new ArrayList<>();
if (pohkbImages != null && pohkbImages.size() > 0){
for (LoanHomevisitInvestigateFileDetailsVo pohkbImage : pohkbImages) {
spouseAccount.add(pohkbImage.getFileUrl());
}
}
vo.setSpouseAccount(spouseAccount);
//担保人身份证
List<LoanHomevisitInvestigateFileDetailsVo> dbrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRSFZ.getAttachType());
List<String> pohkbImage = new ArrayList<>();
if (dbrsfzImages != null && dbrsfzImages.size() > 0){
for (LoanHomevisitInvestigateFileDetailsVo dbrsfzImage : dbrsfzImages) {
pohkbImage.add(dbrsfzImage.getFileUrl());
}
}
vo.setGuarantorIdCard(pohkbImage);
//担保人户口本
List<LoanHomevisitInvestigateFileDetailsVo> dbrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRHKB.getAttachType());
List<String> guarantorAccount = new ArrayList<>();
if (dbrhkbImages != null && dbrhkbImages.size() > 0){
for (LoanHomevisitInvestigateFileDetailsVo dbrhkbImage : dbrhkbImages) {
guarantorAccount.add(dbrhkbImage.getFileUrl());
}
}
vo.setGuarantorAccount(guarantorAccount);
//银行卡
List<LoanHomevisitInvestigateFileDetailsVo> yhkImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType());
List<String> yhkImagess = new ArrayList<>();
if (yhkImages != null && yhkImages.size() > 0){
for (LoanHomevisitInvestigateFileDetailsVo yhkImage : yhkImages) {
yhkImagess.add(yhkImage.getFileUrl());
}
}
vo.setYhkImages(yhkImagess);
//房产
List<LoanHomevisitInvestigateFileDetailsVo> fcImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.FC.getAttachType());
List<String> houseProperty = new ArrayList<>();
if (fcImages != null && fcImages.size() > 0){
for (LoanHomevisitInvestigateFileDetailsVo fcImage : fcImages) {
houseProperty.add(fcImage.getFileUrl());
}
}
vo.setHouseProperty(houseProperty);
//车辆
List<LoanHomevisitInvestigateFileDetailsVo> clImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.CL.getAttachType());
List<String> carProperty = new ArrayList<>();
if (clImages != null && clImages.size() > 0){
for (LoanHomevisitInvestigateFileDetailsVo clImage : clImages) {
carProperty.add(clImage.getFileUrl());
}
}
vo.setCarProperty(carProperty);
return vo;
}
}

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

@ -60,13 +60,15 @@
spouseName,
spouseIdNumber AS spouseIdCard,
spouseMobile,
spouseCareerKey AS spouseJobKey,
spouseCareerValue AS spouseJob,
spouseDomAddress,
spousePreAddress,
spouseDomAddress AS spouseRegisterAddress,
spousePreAddress AS spouseAddress,
emergencyContact AS emergencyContactName,
emergencyMobile AS emergencyContactMobile,
relationshipKey AS emergencyContactTypeKey,
relationshipValue AS emergencyContactType
relationshipValue AS emergencyContactType,
mainSid
FROM loan_homevisit_investigate_customer
WHERE mainSid = #{sid}
</select>

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

@ -28,6 +28,11 @@ package com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigate;
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.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.*;
@ -45,6 +50,8 @@ import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitI
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomevisitInvestigateOrderDetailsVo;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomevisitInvestigateOrderDto;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomeVisitInvestigateInitOtherPeoVo;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomeVisitInvestigateSaveOtherPeoDto;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoDto;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateSavePropDto;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateInitPropVo;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomevisitInvestigatePropertyDetailsVo;
@ -93,6 +100,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private CrmCustomerTempFeign crmCustomerTempFeign;
@Autowired
private BusSalesOrderBorrowerFeign busSalesOrderBorrowerFeign;
@Autowired
private LoanHomevisitInvestigateCustomerService loanHomevisitInvestigateCustomerService;
@Autowired
private LoanHomevisitInvestigateOrderService loanHomevisitInvestigateOrderService;
@ -449,6 +460,16 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
public ResultBean<LoanHomeVisitInvestigateInitCustomerVo> getHomeVisitCustomerInfo(String sid) {
ResultBean rb = ResultBean.fireFail();
LoanHomeVisitInvestigateInitCustomerVo loanHomeVisitInvestigateInitCustomerVo = baseMapper.getHomeVisitCustomerInfo(sid);
if (loanHomeVisitInvestigateInitCustomerVo == null){
loanHomeVisitInvestigateInitCustomerVo = new LoanHomeVisitInvestigateInitCustomerVo();
LoanHomevisitInvestigate loanHomevisitInvestigate = fetchBySid(sid);
BusSalesOrderBorrowerDetailsVo busSalesOrderBorrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(loanHomevisitInvestigate.getSaleOrderBorrowerSid()).getData();
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busSalesOrderBorrowerDetailsVo.getCustomSid()).getData();
loanHomeVisitInvestigateInitCustomerVo.setLenderSid(busSalesOrderBorrowerDetailsVo.getSid());
loanHomeVisitInvestigateInitCustomerVo.setLenderNam(busSalesOrderBorrowerDetailsVo.getBorrowerName());
loanHomeVisitInvestigateInitCustomerVo.setIdNumber(crmCustomerTempVo.getIDNumber());
loanHomeVisitInvestigateInitCustomerVo.setMobile(busSalesOrderBorrowerDetailsVo.getMobile());
}
//银行卡附件
List<LoanHomevisitInvestigateFileDetailsVo> loanHomevisitInvestigateFileDetailsVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType());
List<String> bankCardImages = new ArrayList<>();
@ -467,6 +488,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
public ResultBean saveHomeVisitCustomerInfo(LoanHomeVisitInvestigateSaveCustomerDto dto) {
ResultBean rb = ResultBean.fireFail();
LoanHomevisitInvestigateCustomerDto loanHomevisitInvestigateCustomerDto = new LoanHomevisitInvestigateCustomerDto();
List<LoanHomeVisitInvestigateSaveOtherPeoDto> otherPersonnel = dto.getOtherPersonnel();
BeanUtil.copyProperties(dto,loanHomevisitInvestigateCustomerDto);
loanHomevisitInvestigateCustomerDto.setIsConfirmRealBuyer(dto.getActualBuyer());
loanHomevisitInvestigateCustomerDto.setBorrowerSid(dto.getLenderSid());
@ -483,20 +505,51 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
loanHomevisitInvestigateCustomerDto.setBorrowerPreAddress(dto.getAddress());
loanHomevisitInvestigateCustomerDto.setBankCardNo(dto.getBankNumber());
loanHomevisitInvestigateCustomerDto.setDepositBank(dto.getInvoBank());
loanHomevisitInvestigateCustomerDto.setSpouseIdNumber(dto.getSpouseIdCard());
loanHomevisitInvestigateCustomerDto.setSpouseCareerValue(dto.getSpouseJob());
if (!"0004".equals(dto.getMarriageTypeKey())){
loanHomevisitInvestigateCustomerDto.setSpouseName("");
loanHomevisitInvestigateCustomerDto.setSpouseMobile("");
loanHomevisitInvestigateCustomerDto.setSpouseIdNumber("");
loanHomevisitInvestigateCustomerDto.setSpouseCareerKey("");
loanHomevisitInvestigateCustomerDto.setSpouseCareerValue("");
loanHomevisitInvestigateCustomerDto.setSpouseDomAddress("");
loanHomevisitInvestigateCustomerDto.setSpousePreAddress("");
}else {
loanHomevisitInvestigateCustomerDto.setSpouseIdNumber(dto.getSpouseIdCard());
loanHomevisitInvestigateCustomerDto.setSpouseCareerKey(dto.getSpouseJobKey());
loanHomevisitInvestigateCustomerDto.setSpouseCareerValue(dto.getSpouseJob());
loanHomevisitInvestigateCustomerDto.setSpouseDomAddress(dto.getSpouseRegisterAddress());
loanHomevisitInvestigateCustomerDto.setSpousePreAddress(dto.getSpouseAddress());
}
loanHomevisitInvestigateCustomerDto.setEmergencyContact(dto.getEmergencyContactName());
loanHomevisitInvestigateCustomerDto.setEmergencyMobile(dto.getEmergencyContactMobile());
loanHomevisitInvestigateCustomerDto.setRelationshipKey(dto.getEmergencyContactTypeKey());
loanHomevisitInvestigateCustomerDto.setRelationshipValue(dto.getEmergencyContactType());
loanHomevisitInvestigateCustomerService.saveOrUpdateDto(loanHomevisitInvestigateCustomerDto);
loanHomevisitInvestigateOtherpeoService.delByMainSid(dto.getMainSid());
for (LoanHomeVisitInvestigateSaveOtherPeoDto loanHomeVisitInvestigateSaveOtherPeoDto : otherPersonnel) {
LoanHomevisitInvestigateOtherpeoDto loanHomevisitInvestigateOtherpeoDto = new LoanHomevisitInvestigateOtherpeoDto();
BeanUtil.copyProperties(loanHomeVisitInvestigateSaveOtherPeoDto,loanHomevisitInvestigateOtherpeoDto);
loanHomevisitInvestigateOtherpeoDto.setPeoTypeKey(loanHomeVisitInvestigateSaveOtherPeoDto.getPersonnelKey());
loanHomevisitInvestigateOtherpeoDto.setPeoType(loanHomeVisitInvestigateSaveOtherPeoDto.getPersonnelType());
loanHomevisitInvestigateOtherpeoDto.setPeoName(loanHomeVisitInvestigateSaveOtherPeoDto.getName());
loanHomevisitInvestigateOtherpeoDto.setIdNumber(loanHomeVisitInvestigateSaveOtherPeoDto.getIdCard());
loanHomevisitInvestigateOtherpeoDto.setPeoDomAddress(loanHomeVisitInvestigateSaveOtherPeoDto.getResidentAddress());
loanHomevisitInvestigateOtherpeoDto.setPeoPreAddress(loanHomeVisitInvestigateSaveOtherPeoDto.getAddress());
loanHomevisitInvestigateOtherpeoDto.setWorkUnit(loanHomeVisitInvestigateSaveOtherPeoDto.getCompany());
loanHomevisitInvestigateOtherpeoDto.setPeoCareerValue(loanHomeVisitInvestigateSaveOtherPeoDto.getJob());
loanHomevisitInvestigateOtherpeoDto.setMainSid(dto.getMainSid());
loanHomevisitInvestigateOtherpeoService.saveOrUpdateDto(loanHomevisitInvestigateOtherpeoDto);
}
return rb.success();
}
public ResultBean<LoanHomeVisitInvestigateInitOrderVo> getHomeVisitOrderInfo(String sid) {
ResultBean rb = ResultBean.fireFail();
LoanHomeVisitInvestigateInitOrderVo loanHomeVisitInvestigateInitOrderVos = loanHomevisitInvestigateOrderService.getHomeVisitOrderInfo(sid);
loanHomeVisitInvestigateInitOrderVos.setMainSid(sid);
if (loanHomeVisitInvestigateInitOrderVos == null){
loanHomeVisitInvestigateInitOrderVos = new LoanHomeVisitInvestigateInitOrderVo();
loanHomeVisitInvestigateInitOrderVos.setMainSid(sid);
}
return rb.success().setData(loanHomeVisitInvestigateInitOrderVos);
}
@ -515,7 +568,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
public ResultBean<LoanHomeVisitInvestigateInitOperVo> getHomeVisitOperationInfo(String sid) {
ResultBean rb = ResultBean.fireFail();
LoanHomeVisitInvestigateInitOperVo loanHomeVisitInvestigateInitOperVo = loanHomevisitInvestigateOperationsService.getHomeVisitOperationInfo(sid);
loanHomeVisitInvestigateInitOperVo.setMainSid(sid);
if (loanHomeVisitInvestigateInitOperVo == null){
loanHomeVisitInvestigateInitOperVo = new LoanHomeVisitInvestigateInitOperVo();
loanHomeVisitInvestigateInitOperVo.setMainSid(sid);
}
return rb.success().setData(loanHomeVisitInvestigateInitOperVo);
}
@ -535,7 +591,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
public ResultBean<LoanHomeVisitInvestigateInitTranVo> getHomeVisitTransportInfo(String sid) {
ResultBean rb = ResultBean.fireFail();
LoanHomeVisitInvestigateInitTranVo loanHomeVisitInvestigateInitTranVo = loanHomevisitInvestigateTransportService.getHomeVisitTransportInfo(sid);
loanHomeVisitInvestigateInitTranVo.setMainSid(sid);
if (loanHomeVisitInvestigateInitTranVo == null){
loanHomeVisitInvestigateInitTranVo = new LoanHomeVisitInvestigateInitTranVo();
loanHomeVisitInvestigateInitTranVo.setMainSid(sid);
}
return rb.success().setData(loanHomeVisitInvestigateInitTranVo);
}
@ -562,7 +621,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
public ResultBean<LoanHomeVisitInvestigateInitPropVo> getHomeVisitAssetsInfo(String sid) {
ResultBean rb = ResultBean.fireFail();
LoanHomeVisitInvestigateInitPropVo loanHomeVisitInvestigateInitPropVo = loanHomevisitInvestigatePropertyService.getHomeVisitAssetsInfo(sid);
loanHomeVisitInvestigateInitPropVo.setMainSid(sid);
if (loanHomeVisitInvestigateInitPropVo == null){
loanHomeVisitInvestigateInitPropVo = new LoanHomeVisitInvestigateInitPropVo();
loanHomeVisitInvestigateInitPropVo.setMainSid(sid);
}
return rb.success().setData(loanHomeVisitInvestigateInitPropVo);
}
@ -571,14 +633,32 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
LoanHomevisitInvestigatePropertyDto loanHomevisitInvestigatePropertyDto = new LoanHomevisitInvestigatePropertyDto();
BeanUtil.copyProperties(dto,loanHomevisitInvestigatePropertyDto);
loanHomevisitInvestigatePropertyDto.setIsRealEstate(dto.getHouseCheck());
loanHomevisitInvestigatePropertyDto.setPropertyType(dto.getHouseState());
loanHomevisitInvestigatePropertyDto.setRealLoanSituation(dto.getHouseLoanKey());
loanHomevisitInvestigatePropertyDto.setRealRemarks(dto.getHouseRemarks());
if (dto.getHouseCheck()){
loanHomevisitInvestigatePropertyDto.setPropertyType(dto.getHouseState());
loanHomevisitInvestigatePropertyDto.setRealLoanSituationKey(dto.getHouseLoanKey());
loanHomevisitInvestigatePropertyDto.setRealLoanSituation(dto.getHouseLoan());
loanHomevisitInvestigatePropertyDto.setRealRemarks(dto.getHouseRemarks());
}else {
loanHomevisitInvestigatePropertyDto.setPropertyType(0);
loanHomevisitInvestigatePropertyDto.setRealLoanSituationKey("");
loanHomevisitInvestigatePropertyDto.setRealLoanSituation("");
loanHomevisitInvestigatePropertyDto.setRealRemarks("");
}
loanHomevisitInvestigatePropertyDto.setIsCar(dto.getCarCheck());
loanHomevisitInvestigatePropertyDto.setCarType(dto.getCarState());
loanHomevisitInvestigatePropertyDto.setCarLoanSituation(dto.getCarLoanKey());
loanHomevisitInvestigatePropertyDto.setDownPaySourceKey(dto.getDownPayment());
loanHomevisitInvestigatePropertyDto.setOtherSourceKey(dto.getOtherIncome());
if (dto.getCarCheck()){
loanHomevisitInvestigatePropertyDto.setCarType(dto.getCarState());
loanHomevisitInvestigatePropertyDto.setCarLoanSituationKey(dto.getCarLoanKey());
loanHomevisitInvestigatePropertyDto.setCarLoanSituation(dto.getCarLoan());
}else {
loanHomevisitInvestigatePropertyDto.setCarType(0);
loanHomevisitInvestigatePropertyDto.setCarLoanSituationKey("");
loanHomevisitInvestigatePropertyDto.setCarLoanSituation("");
loanHomevisitInvestigatePropertyDto.setCarRemarks("");
}
loanHomevisitInvestigatePropertyDto.setDownPaySourceKey(dto.getDownPaymentKey());
loanHomevisitInvestigatePropertyDto.setDownPaySourceValue(dto.getDownPayment());
loanHomevisitInvestigatePropertyDto.setOtherSourceKey(dto.getOtherIncomeKey());
loanHomevisitInvestigatePropertyDto.setOtherSourceValue(dto.getOtherIncome());
loanHomevisitInvestigatePropertyService.saveOrUpdateDto(loanHomevisitInvestigatePropertyDto);
return rb.success();
}

3
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateoperations/LoanHomevisitInvestigateOperationsMapper.xml

@ -26,7 +26,8 @@
driveProTypeKey AS driveKey,
driveProTypeValue AS driveType,
beforeOpeTypeKey AS operationKey,
beforeOpeTypeValue AS operationType
beforeOpeTypeValue AS operationType,
mainSid
FROM loan_homevisit_investigate_operations
WHERE mainSid = #{sid}
</select>

18
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderMapper.xml

@ -22,13 +22,17 @@
<select id="getHomeVisitOrderInfo"
resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderVo">
SELECT lo.sid,
li.`saleOrderSid` AS orderSid, ,
lo.carConfirm AS carInfoKey,
lo.carRemarks AS carInfoRemarks,
lo.finConfirm AS financeKey,
lo.finRemarks AS financeRemarks,
lo.finDownPay,
lo.finDownPayRemarks
li.`saleOrderSid` AS orderSid,
lo.carConfirmKey AS carInfoKey,
lo.carConfirm AS carInfoType,
lo.carRemarks AS carInfoRemarks,
lo.finConfirmKey AS financeKey,
lo.finConfirm AS financeType,
lo.finRemarks AS financeRemarks,
lo.finDownPayKey AS paymentRatiokey,
lo.finDownPay AS paymentRatio,
lo.finDownPayRemarks AS paymentRemarks,
lo.mainSid
FROM loan_homevisit_investigate_order lo
LEFT JOIN loan_homevisit_investigate li
ON lo.`mainSid` = li.`sid`

4
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.java

@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomeVisitInvestigateInitOtherPeoVo;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoDetailsVo;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@ -66,4 +67,7 @@ public interface LoanHomevisitInvestigateOtherpeoMapper extends BaseMapper<LoanH
List<LoanHomevisitInvestigateOtherpeoVo> selectListVo();
List<LoanHomeVisitInvestigateInitOtherPeoVo> selByMainSid(String sid);
@Delete("DELETE FROM loan_homevisit_investigate_otherpeo WHERE mainSid = #{sid}")
void delByMainSid(String sid);
}

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.xml

@ -26,7 +26,7 @@
peoType AS personnelKey,
mobile,
idNumber AS idCard,
peoDomAddress,
peoDomAddress AS residentAddress,
peoPreAddress AS address,
workUnit AS company,
peoCareerValue AS job

4
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoService.java

@ -106,4 +106,8 @@ public class LoanHomevisitInvestigateOtherpeoService extends MybatisBaseService<
public List<LoanHomeVisitInvestigateInitOtherPeoVo> selByMainSid(String sid) {
return baseMapper.selByMainSid(sid);
}
public void delByMainSid(String sid) {
baseMapper.delByMainSid(sid);
}
}

23
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyMapper.xml

@ -22,16 +22,21 @@
<select id="getHomeVisitAssetsInfo"
resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateInitPropVo">
SELECT sid,
isRealEstate AS houseCheck,
propertyType AS houseState,
realLoanSituation AS houseLoanKey,
realRemarks AS houseRemarks,
isCar AS carCheck,
carType AS carState,
carLoanSituation AS carLoanKey,
isRealEstate AS houseCheck,
propertyType AS houseState,
realLoanSituationKey AS houseLoanKey,
realLoanSituation AS houseLoan,
realRemarks AS houseRemarks,
isCar AS carCheck,
carType AS carState,
carLoanSituationKey AS carLoanKey,
carLoanSituation AS carLoan,
carRemarks,
downPaySourceKey AS downPayment,
otherSourceKey AS otherIncome
downPaySourceKey AS downPaymentKey,
downPaySourceValue AS downPayment,
otherSourceKey AS otherIncomeKey,
otherSourceValue AS otherIncome,
mainSid
FROM loan_homevisit_investigate_property
WHERE mainSid = #{sid}
</select>

3
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportMapper.xml

@ -36,7 +36,8 @@
toll AS roadToll,
maintenance,
expectedRevenue AS income,
netIncome
netIncome,
mainSid
FROM loan_homevisit_investigate_transport
WHERE mainSid = #{sid}
</select>

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.java

@ -68,4 +68,6 @@ public interface LoanHomevisitPrepMapper extends BaseMapper<LoanHomevisitPrep> {
void visit(String sid);
String initConSetUp(String sid);
LoanHomevisitPrepVo selectDetails(String sid);
}

22
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.xml

@ -44,4 +44,26 @@
ON lp.`saleOrderBorrowerSid` = bb.`sid`
WHERE lp.sid = #{sid}
</select>
<select id="selectDetails" resultType="com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepVo">
SELECT lp.`sid`,
lp.saleOrderSid,
bo.createDate,
bo.`useOrgName`,
bo.`orgName`,
bo.`staffName`,
bo.`contractNo`,
bb.`vehCount`,
bb.borrowerSid,
bb.`borrowerName`,
bb.`mobile`,
bb.`bankName`,
bb.policyName
FROM loan_homevisit_prep lp
LEFT JOIN anrui_buscenter.`bus_sales_order_borrower` bb
ON lp.`saleOrderBorrowerSid` = bb.`sid`
LEFT JOIN anrui_buscenter.`bus_sales_order` bo
ON lp.`saleOrderSid` = bo.`sid`
WHERE lp.sid = #{sid}
</select>
</mapper>

52
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java

@ -28,6 +28,13 @@ package com.yxt.anrui.riskcenter.biz.loanhomevisitprep;
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.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractDto;
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.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderFeign;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApplyVo;
@ -67,6 +74,12 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private BusSalesOrderFeign busSalesOrderFeign;
@Autowired
private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
@Autowired
private BusSalesOrderLoancontractFeign busSalesOrderLoancontractFeign;
public PagerVo<LoanHomevisitPrepVo> listPageVo(PagerQuery<LoanHomevisitPrepQuery> pq) {
LoanHomevisitPrepQuery query = pq.getParams();
@ -190,8 +203,43 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
public ResultBean saveLoanCon(String sid, String conSetUpKey) {
ResultBean rb = ResultBean.fireFail();
if (conSetUpKey.equals("")){
LoanHomevisitPrepVo loanHomevisitPrepVo = baseMapper.selectDetails(sid);
List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.selectListByOrderSid(loanHomevisitPrepVo.getSaleOrderSid()).getData();
if (conSetUpKey.equals("001")) {//一车一合同
int i = 1;
for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
BusSalesOrderLoancontractDto busSalesOrderLoancontractDto = new BusSalesOrderLoancontractDto();
busSalesOrderLoancontractDto.setSalesOrderSid(loanHomevisitPrepVo.getSaleOrderSid());
busSalesOrderLoancontractDto.setBorrowerSid(loanHomevisitPrepVo.getSid());
busSalesOrderLoancontractDto.setBorrowerName(loanHomevisitPrepVo.getBorrowerName());
busSalesOrderLoancontractDto.setVehCount(loanHomevisitPrepVo.getVehCount());
BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanHomevisitPrepVo.getSaleOrderSid()).getData();
String num = String.format("%02d", i);
busSalesOrderLoancontractDto.setLoanCotractNo(busSalesOrder.getContractNo() + num);
i = i + 1;
busSalesOrderLoancontractDto.setBankName(loanHomevisitPrepVo.getBankName());
busSalesOrderLoancontractDto.setPolicyName(loanHomevisitPrepVo.getPolicyName());
busSalesOrderLoancontractDto.setBusNo("304");
busSalesOrderLoancontractDto.setBusName("资方终审确认");
String loanContractSid = busSalesOrderLoancontractFeign.save(busSalesOrderLoancontractDto).getData();
busSalesOrderVehicleFeign.updateXDCon(busSalesOrderVehicle.getSid(), loanHomevisitPrepVo.getBorrowerSid(), loanContractSid);
}
} else if (conSetUpKey.equals("002")) {//一人一合同
BusSalesOrderLoancontractDto busSalesOrderLoancontractDto = new BusSalesOrderLoancontractDto();
busSalesOrderLoancontractDto.setSalesOrderSid(loanHomevisitPrepVo.getSaleOrderSid());
busSalesOrderLoancontractDto.setBorrowerSid(loanHomevisitPrepVo.getSid());
busSalesOrderLoancontractDto.setBorrowerName(loanHomevisitPrepVo.getBorrowerName());
busSalesOrderLoancontractDto.setVehCount(loanHomevisitPrepVo.getVehCount());
BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanHomevisitPrepVo.getSaleOrderSid()).getData();
busSalesOrderLoancontractDto.setLoanCotractNo(busSalesOrder.getContractNo() + "-01");
busSalesOrderLoancontractDto.setBankName(loanHomevisitPrepVo.getBankName());
busSalesOrderLoancontractDto.setPolicyName(loanHomevisitPrepVo.getPolicyName());
busSalesOrderLoancontractDto.setBusNo("304");
busSalesOrderLoancontractDto.setBusName("资方终审确认");
String loanContractSid = busSalesOrderLoancontractFeign.save(busSalesOrderLoancontractDto).getData();
for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
busSalesOrderVehicleFeign.updateXDCon(busSalesOrderVehicle.getSid(), loanHomevisitPrepVo.getSid(), loanContractSid);
}
}
return rb.success();
}

58
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@ -1090,7 +1090,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
} catch (Exception e) {
e.printStackTrace();
}
}else{
} else {
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
@ -1192,29 +1192,41 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
//更新业务中的流程相关的参数
updateFlowFiled(map);
scmVehicleGression = fetchBySid(query.getBusinessSid());
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = scmVehicleGression.getProcInstId();
messageFlowVo.setProcInsId(procId);
messageFlowVo.setProcDefId(scmVehicleGression.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(query.getBusinessSid());
messageFlowableQuery.setModuleName("存放地点变更申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
String nextName = listResultBean.getData().get(0).getName_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if ("发起申请".equals(nextName)) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
//清除临时车辆表状态
baseVehicleTempstateFeign.delByBusSid(query.getBusinessSid());
} else {
messageFlowableQuery.setMsgContent(scmVehicleGression.getApplicantName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
ScmVehicleGression finalScmVehicleGression = scmVehicleGression;
Future future1 = pool.submit(() -> {
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = finalScmVehicleGression.getProcInstId();
messageFlowVo.setProcInsId(procId);
messageFlowVo.setProcDefId(finalScmVehicleGression.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(query.getBusinessSid());
messageFlowableQuery.setModuleName("存放地点变更申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
String nextName = listResultBean.getData().get(0).getName_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if ("发起申请".equals(nextName)) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
//清除临时车辆表状态
baseVehicleTempstateFeign.delByBusSid(query.getBusinessSid());
} else {
messageFlowableQuery.setMsgContent(finalScmVehicleGression.getApplicantName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
}
messageFlowableQuery.setMsgTitle("存放地点变更");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
});
} catch (Exception e) {
e.printStackTrace();
}
messageFlowableQuery.setMsgTitle("存放地点变更");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
return rb.success();
}
}

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

@ -48,12 +48,14 @@ public class AppLoanHomeVisitInvestigateInitCustomerVo implements Vo {
private String spouseIdCard;
@ApiModelProperty("配偶电话")
private String spouseMobile;
@ApiModelProperty("配偶职业key")
private String spouseJobKey;
@ApiModelProperty("配偶职业")
private String spouseJob;
@ApiModelProperty("配偶户籍地址")
private String spouseDomAddress;
private String spouseRegisterAddress;
@ApiModelProperty("配偶现住址")
private String spousePreAddress;
private String spouseAddress;
@ApiModelProperty("其他人员")
private List<AppLoanHomeVisitInvestigateInitOtherPeoVo> otherPersonnel;
@ApiModelProperty("紧急联系人姓名")
@ -64,4 +66,6 @@ public class AppLoanHomeVisitInvestigateInitCustomerVo implements Vo {
private String emergencyContactType;
@ApiModelProperty("紧急联系人类型key")
private String emergencyContactTypeKey;
@ApiModelProperty("家访考察表sid")
private String mainSid;
}

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

@ -12,18 +12,28 @@ public class AppLoanHomeVisitInvestigateInitOrderVo implements Vo {
private String sid;
@ApiModelProperty("销售订单sid")
private String orderSid;
@ApiModelProperty("车辆信息是否确认")
@ApiModelProperty("车辆信息是否确认key")
private String carInfoKey;
@ApiModelProperty("车辆信息是否确认")
private String carInfoType;
@ApiModelProperty("车辆信息备注")
private String carInfoRemarks;
@ApiModelProperty("金融方案是否确认")
@ApiModelProperty("金融方案是否确认key")
private String financeKey;
@ApiModelProperty("金融方案是否确认")
private String financeType;
@ApiModelProperty("金融方案备注")
private String financeRemarks;
@ApiModelProperty("金融首付比例")
private String finDownPay;
private String paymentRatio;
@ApiModelProperty("金融首付比例key")
private String paymentRatiokey;
@ApiModelProperty("金融首付比例备注")
private String finDownPayRemarks;
private String paymentRemarks;
@ApiModelProperty("家访考察表sid")
private String mainSid;
@ApiModelProperty("金融方案详情页面")
private AppLoanHomeVisitVo finPage;
@ApiModelProperty("销售订单页面")
private AppLoanHomeVisitVo orderPage;
}

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

@ -19,11 +19,13 @@ public class AppLoanHomeVisitInvestigateInitOtherPeoVo implements Vo {
@ApiModelProperty("身份证")
private String idCard;
@ApiModelProperty("户籍地址")
private String peoDomAddress;
private String residentAddress;
@ApiModelProperty("现住址")
private String address;
@ApiModelProperty("公司")
private String company;
@ApiModelProperty("职业")
private String job;
@ApiModelProperty("家访考察表sid")
private String mainSid;
}

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

@ -28,8 +28,12 @@ public class AppLoanHomeVisitInvestigateInitPropVo implements Vo {
private String carLoanKey;
@ApiModelProperty("车辆备注")
private String carRemarks;
@ApiModelProperty("首付来源key")
private String downPaymentKey;
@ApiModelProperty("首付来源")
private String downPayment;
@ApiModelProperty("其他收入来源key")
private String otherIncomeKey;
@ApiModelProperty("其他收入来源")
private String otherIncome;
@ApiModelProperty("家访考察表sid")

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

@ -17,4 +17,6 @@ public class AppLoanHomeVisitInvestigateInitReportStateVo implements Vo {
private String transportState;
@ApiModelProperty("资产情况")
private String assetsState;
@ApiModelProperty("家访考察表sid")
private String mainSid;
}

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

@ -49,12 +49,14 @@ public class AppLoanHomeVisitInvestigateSaveCustomerDto implements Dto {
private String spouseIdCard;
@ApiModelProperty("配偶电话")
private String spouseMobile;
@ApiModelProperty("配偶职业key")
private String spouseJobKey;
@ApiModelProperty("配偶职业")
private String spouseJob;
@ApiModelProperty("配偶户籍地址")
private String spouseDomAddress;
private String spouseRegisterAddress;
@ApiModelProperty("配偶现住址")
private String spousePreAddress;
private String spouseAddress;
@ApiModelProperty("其他人员")
private List<AppLoanHomeVisitInvestigateSaveOtherPeoDto> otherPersonnel = new ArrayList<>();
@ApiModelProperty("紧急联系人姓名")

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

@ -10,18 +10,24 @@ public class AppLoanHomeVisitInvestigateSaveOrderDto implements Vo {
private String sid;
@ApiModelProperty("销售订单sid")
private String orderSid;
@ApiModelProperty("车辆信息是否确认")
@ApiModelProperty("车辆信息是否确认key")
private String carInfoKey;
@ApiModelProperty("车辆信息是否确认")
private String carInfoType;
@ApiModelProperty("车辆信息备注")
private String carInfoRemarks;
@ApiModelProperty("金融方案是否确认")
@ApiModelProperty("金融方案是否确认key")
private String financeKey;
@ApiModelProperty("金融方案是否确认")
private String financeType;
@ApiModelProperty("金融方案备注")
private String financeRemarks;
@ApiModelProperty("金融首付比例")
private String finDownPay;
private String paymentRatio;
@ApiModelProperty("金融首付比例key")
private String paymentRatiokey;
@ApiModelProperty("金融首付比例备注")
private String finDownPayRemarks;
private String paymentRemarks;
@ApiModelProperty("家访考察表sid")
private String mainSid;
}

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

@ -19,7 +19,7 @@ public class AppLoanHomeVisitInvestigateSaveOtherPeoDto implements Vo {
@ApiModelProperty("身份证")
private String idCard;
@ApiModelProperty("户籍地址")
private String peoDomAddress;
private String residentAddress;
@ApiModelProperty("现住址")
private String address;
@ApiModelProperty("公司")

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

@ -28,8 +28,12 @@ public class AppLoanHomeVisitInvestigateSavePropDto implements Vo {
private String carLoanKey;
@ApiModelProperty("车辆备注")
private String carRemarks;
@ApiModelProperty("首付来源key")
private String downPaymentKey;
@ApiModelProperty("首付来源")
private String downPayment;
@ApiModelProperty("其他收入来源key")
private String otherIncomeKey;
@ApiModelProperty("其他收入来源")
private String otherIncome;
@ApiModelProperty("家访考察表sid")

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

@ -0,0 +1,33 @@
package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2022/8/26 10:51
* @Description
*/
@Data
public class AppLoanHomeVisitVo implements Vo {
@ApiModelProperty("版本编码")
private Integer moduleVersion;
@ApiModelProperty("apk下载地址")
private String path;
@ApiModelProperty("0.内置Activity 1.内置WebView 2.RePlugin插件")
private String type;
@ApiModelProperty("插件名称")
private String modulePluginName;
@ApiModelProperty("地址")
private String moduleAction;
private String json;
private String requestCode;
}

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

@ -51,12 +51,14 @@ import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVis
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateInitPropVo;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateSaveTranDto;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranVo;
import com.yxt.anrui.terminal.api.base.common.CarModelVo;
import com.yxt.anrui.terminal.api.risk.creditreview.ShareholderDetailsVo;
import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.*;
import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable.CompleteHomeAppealDto;
import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable.HomeAppealQuery;
import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable.HomeAppealTaskQuery;
import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable.SubmitHomeAppealApplyDto;
import com.yxt.anrui.terminal.biz.base.common.CommonService;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@ -76,7 +78,7 @@ public class LoanHomeVisitInvestigateService {
@Autowired
private LoanHomevisitAppealFeign loanHomevisitAppealFeign;
@Autowired
private SysUserFeign sysUserFeign;
private CommonService commonService;
public ResultBean<PagerVo<LoanHomeVisitInvestigatePageVo>> getHomeVisitList(PagerQuery<LoanHomeVisitInvestigatePageQuery> pagerQuery) {
ResultBean<PagerVo<LoanHomeVisitInvestigatePageVo>> rb = ResultBean.fireFail();
@ -165,6 +167,14 @@ public class LoanHomeVisitInvestigateService {
LoanHomeVisitInvestigateInitOrderVo data = loanHomevisitInvestigateFeign.getHomeVisitOrderInfo(sid).getData();
AppLoanHomeVisitInvestigateInitOrderVo appLoanHomeVisitInvestigateInitOrderVo = new AppLoanHomeVisitInvestigateInitOrderVo();
BeanUtil.copyProperties(data,appLoanHomeVisitInvestigateInitOrderVo);
CarModelVo finPage1 = commonService.getLoanSolution(data.getOrderSid()).getData();
AppLoanHomeVisitVo finPage2 = new AppLoanHomeVisitVo();
BeanUtil.copyProperties(finPage1,finPage2);
CarModelVo orderPage1 = commonService.getOrder(data.getOrderSid()).getData();
AppLoanHomeVisitVo orderPage2 = new AppLoanHomeVisitVo();
BeanUtil.copyProperties(orderPage1,orderPage2);
appLoanHomeVisitInvestigateInitOrderVo.setFinPage(finPage2);
appLoanHomeVisitInvestigateInitOrderVo.setOrderPage(orderPage2);
return rb.success().setData(appLoanHomeVisitInvestigateInitOrderVo);
}

Loading…
Cancel
Save