diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJR.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJR.java index 683dba7334..f4a2b99e31 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJR.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJR.java @@ -63,7 +63,7 @@ public class FinUncollectedReceivablesDetailedJR extends BaseEntity { @ApiModelProperty("款项名称value") private String payCostTitleValue; @ApiModelProperty("应收金额（不变）") - private String reveivableMoney; + private BigDecimal reveivableMoney; @ApiModelProperty("当前应收金额") private BigDecimal currentReceivableMoney; // 当前应收金额 @ApiModelProperty("认款状态") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index b9a2d6e5b4..2f453d8e78 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -3771,6 +3771,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService - + - + diff --git a/anrui-riskcenter-ui/src/views/collectionmeasures/collectionmeasuresAdd.vue b/anrui-riskcenter-ui/src/views/collectionmeasures/collectionmeasuresAdd.vue index d0eda30b5b..9854bc70b9 100644 --- a/anrui-riskcenter-ui/src/views/collectionmeasures/collectionmeasuresAdd.vue +++ b/anrui-riskcenter-ui/src/views/collectionmeasures/collectionmeasuresAdd.vue @@ -90,6 +90,11 @@ + + + {{ formobj.lockCarRemarks }} + + @@ -176,6 +181,7 @@ export default { deptSid: '', files: [], loanBeCollectionVehDetails: [], + lockCarRemarks: '', nodeSid: '', nodeState: '', orgPath: '', @@ -346,6 +352,7 @@ export default { deptSid: '', files: [], loanBeCollectionVehDetails: [], + lockCarRemarks: '', nodeSid: '', nodeState: '', orgPath: '', diff --git a/anrui-riskcenter-ui/src/views/collectionmeasures/collectionmeasuresInfo.vue b/anrui-riskcenter-ui/src/views/collectionmeasures/collectionmeasuresInfo.vue index 1dc26820a7..25ad71d1c4 100644 --- a/anrui-riskcenter-ui/src/views/collectionmeasures/collectionmeasuresInfo.vue +++ b/anrui-riskcenter-ui/src/views/collectionmeasures/collectionmeasuresInfo.vue @@ -85,6 +85,11 @@ + + + {{ formobj.lockCarRemarks }} + + @@ -156,6 +161,7 @@ export default { deptSid: '', files: [], loanBeCollectionVehDetails: [], + lockCarRemarks: '', nodeSid: '', nodeState: '', orgPath: '', @@ -286,6 +292,7 @@ export default { deptSid: '', files: [], loanBeCollectionVehDetails: [], + lockCarRemarks: '', nodeSid: '', nodeState: '', orgPath: '', diff --git a/anrui-riskcenter-ui/src/views/overduevehicle/overduevehicle.vue b/anrui-riskcenter-ui/src/views/overduevehicle/overduevehicle.vue index 687678939f..6df670c5e2 100644 --- a/anrui-riskcenter-ui/src/views/overduevehicle/overduevehicle.vue +++ b/anrui-riskcenter-ui/src/views/overduevehicle/overduevehicle.vue @@ -48,7 +48,7 @@ - + diff --git a/anrui-riskcenter-ui/src/views/overduevehicle/overduevehicleByRisk.vue b/anrui-riskcenter-ui/src/views/overduevehicle/overduevehicleByRisk.vue index ee81d57812..d33dd1b336 100644 --- a/anrui-riskcenter-ui/src/views/overduevehicle/overduevehicleByRisk.vue +++ b/anrui-riskcenter-ui/src/views/overduevehicle/overduevehicleByRisk.vue @@ -48,7 +48,7 @@ - + diff --git a/anrui-riskcenter-ui/src/views/workFlow/cuishoucuoshiFlow/collectionmeasuresDaiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/cuishoucuoshiFlow/collectionmeasuresDaiBan.vue index 1473709dcc..8d67ce79a7 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/cuishoucuoshiFlow/collectionmeasuresDaiBan.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/cuishoucuoshiFlow/collectionmeasuresDaiBan.vue @@ -83,6 +83,11 @@ + + + {{ formobj.lockCarRemarks }} + + @@ -187,6 +192,7 @@ export default { deptSid: '', files: [], loanBeCollectionVehDetails: [], + lockCarRemarks: '', nodeSid: '', nodeState: '', orgPath: '', diff --git a/anrui-riskcenter-ui/src/views/workFlow/cuishoucuoshiFlow/collectionmeasuresEdit.vue b/anrui-riskcenter-ui/src/views/workFlow/cuishoucuoshiFlow/collectionmeasuresEdit.vue index 5a24eaa362..315851833c 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/cuishoucuoshiFlow/collectionmeasuresEdit.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/cuishoucuoshiFlow/collectionmeasuresEdit.vue @@ -89,6 +89,11 @@ + + + {{ formobj.lockCarRemarks }} + + @@ -175,6 +180,7 @@ export default { deptSid: '', files: [], loanBeCollectionVehDetails: [], + lockCarRemarks: '', nodeSid: '', nodeState: '', orgPath: '', diff --git a/anrui-riskcenter-ui/src/views/workFlow/cuishoucuoshiFlow/collectionmeasuresYiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/cuishoucuoshiFlow/collectionmeasuresYiBan.vue index 5e68b6f1a7..bd34c9f783 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/cuishoucuoshiFlow/collectionmeasuresYiBan.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/cuishoucuoshiFlow/collectionmeasuresYiBan.vue @@ -80,6 +80,11 @@ + + + {{ formobj.lockCarRemarks }} + + @@ -147,6 +152,7 @@ export default { deptSid: '', files: [], loanBeCollectionVehDetails: [], + lockCarRemarks: '', nodeSid: '', nodeState: '', orgPath: '', diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java index 535dd3dc0d..6480470667 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java @@ -201,26 +201,14 @@ public class LoanRepaymentHistoryService extends MybatisBaseService planDetails = loanRepaymentPlanDetailsService.selPlanByNoAndPeriod(repaymentExcelInfo.getBankContractNo(), repaymentExcelInfo.getPeriod()); if (!planDetails.isEmpty()) { for (LoanRepaymentPlanDetails planDetail : planDetails) { - LoanRepaymentHistory repaymentHistory = new LoanRepaymentHistory(); - repaymentHistory.setBuckle("未申请"); - repaymentHistory.setBuckleKey("001"); - repaymentHistory.setScheduleSid(planDetail.getScheduleSid()); - repaymentHistory.setPlanDetailSid(planDetail.getSid()); - repaymentHistory.setReturnWay("直还"); - repaymentHistory.setReturnWayKey("01"); - try { - repaymentHistory.setActualDate(sdf.parse(repaymentExcelInfo.getRealReturnTime())); - } catch (ParseException e) { - e.printStackTrace(); + String check = loanRepaymentPlanDetailsService.InsertForCheckPaymentAndBank(planDetail.getSid()); + if (StringUtils.isNotBlank(check)) { + if (!check.equals("0")) { + LoanRepaymentHistory repaymentHistory = new LoanRepaymentHistory(); + repaymentHistory.setBuckle("未申请"); + repaymentHistory.setBuckleKey("001"); + repaymentHistory.setScheduleSid(planDetail.getScheduleSid()); + repaymentHistory.setPlanDetailSid(planDetail.getSid()); + repaymentHistory.setReturnWay("直还"); + repaymentHistory.setReturnWayKey("01"); + try { + repaymentHistory.setActualDate(sdf.parse(repaymentExcelInfo.getRealReturnTime())); + } catch (ParseException e) { + e.printStackTrace(); + } + BigDecimal realMoney = new BigDecimal(repaymentExcelInfo.getRealMoney()); + BigDecimal divide = realMoney.divide(new BigDecimal(planDetails.size()), 2, BigDecimal.ROUND_HALF_UP); + repaymentHistory.setActualMoney(divide); + repaymentHistory.setDataTime(new DateTime()); + baseMapper.insert(repaymentHistory); + } } - BigDecimal realMoney = new BigDecimal(repaymentExcelInfo.getRealMoney()); - BigDecimal divide = realMoney.divide(new BigDecimal(planDetails.size()), 2, BigDecimal.ROUND_HALF_UP); - repaymentHistory.setActualMoney(divide); - repaymentHistory.setDataTime(new DateTime()); -// List histories = baseMapper.selHistoryByPlanSid(planDetail.getSid()); -// BigDecimal returned = new BigDecimal(0); -// if (!histories.isEmpty()) { -// for (LoanRepaymentHistory history : histories) { -// returned = history.getActualMoney().add(returned); -// } -// } -// BigDecimal decimal = returned.add(divide); -// BigDecimal dueMoney = planDetail.getDueMoney(); -// BigDecimal subtract = dueMoney.subtract(decimal); -// repaymentHistory.setOutstandingMoney(subtract); - baseMapper.insert(repaymentHistory); } } } @@ -800,6 +782,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService getListByBusVinSid(@Param("busVinSid") String busVinSid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml index a01e26f93a..8c9e719363 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml @@ -15,6 +15,11 @@ #{planSid} + + UPDATE loan_repayment_plan_details + SET vehMark = #{vehMark} + WHERE busVinSid = #{busVinSid} + DELETE FROM loan_repayment_plan_details @@ -117,129 +122,125 @@ where paymentMoney > 0 + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java index 492aaa846e..0f63be0c57 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java @@ -133,4 +133,16 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService getListByBusVinSid(String busVinSid) { + return baseMapper.getListByBusVinSid(busVinSid); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java index 78dedd49d0..90fce7c680 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java @@ -321,6 +321,17 @@ public class LoanRepaymentScheduleService extends MybatisBaseService repayDate = returnRepayDate(dto.getMainRepayDate(), dto.getMainPeriod()); + if (!repayDate.isEmpty()) { + String lastDate = repayDate.get(repayDate.size() - 1); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + try { + Date date = sdf.parse(lastDate); + loanRepaymentSchedule.setMainLastDate(date); + } catch (ParseException e) { + e.printStackTrace(); + } + } baseMapper.updateById(loanRepaymentSchedule); loanRepaymentPlanDetailsService.deletePlanDetails(loanRepaymentSchedule.getSid()); BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(orderSid).getData(); @@ -620,7 +631,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService 0 && i < Integer.parseInt(otherPeriod) - 1) { - otherRepay = new BigDecimal(otherLastPay); + otherRepay = new BigDecimal(otherMidPay); } if (i == 0) { BigDecimal mainF = new BigDecimal(mainFirstRepay); @@ -1607,89 +1618,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService viewVinsSchedule2(String salesOrderSid) { -// ResultBean rb = ResultBean.fireFail(); -// LoanCreateScheduleVinsVo vo = new LoanCreateScheduleVinsVo(); -// BusSalesOrderLoancontractDetailsVo loancontract = busSalesOrderLoancontractFeign.fetchDetailsBySid(salesOrderSid).getData(); -// if (null != loancontract) { -// if (StringUtils.isNotBlank(loancontract.getBankName())) { -// vo.setBankName(loancontract.getBankName()); -// } -// if (null != loancontract.getVehCount()) { -// vo.setVehCount(String.valueOf(loancontract.getVehCount())); -// } -// if (StringUtils.isNotBlank(loancontract.getLoanContractNo())) { -// vo.setLoanContractNo(loancontract.getLoanContractNo()); -// } -// if (StringUtils.isNotBlank(loancontract.getBorrowerName())) { -// vo.setBorrowerName(loancontract.getBorrowerName()); -// } -// LoanRepaymentSchedule schedule = baseMapper.selByLoanContractSid(salesOrderSid); -// if (null != schedule) { -// if (StringUtils.isNotBlank(schedule.getIsOtherPolicy())) { -// vo.setIsOtherPolicy(schedule.getIsOtherPolicy()); -// } -// if (null != schedule.getMainRepayDate()) { -// mainDate = sdf.format(schedule.getMainRepayDate()); -// } -// if (null != schedule.getOtherRepayDate()) { -// otherDate = sdf.format(schedule.getOtherRepayDate()); -// } -// //主产品月还日 -// if (StringUtils.isNotBlank(mainDate)) { -// String[] splitMainDate = mainDate.split("-"); -// String day = splitMainDate[2]; -// if (day.length() == 2 && Integer.parseInt(day) >= 10) { -// vo.setMainRepayDate(day); -// } else { -// vo.setMainRepayDate(day.replace("0", "")); -// } -// } -// //其他融月还日 -// if (StringUtils.isNotBlank(otherDate)) { -// String[] splitOtherDate = otherDate.split("-"); -// String day = splitOtherDate[2]; -// if (day.length() == 2 && Integer.parseInt(day) >= 10) { -// vo.setOtherRepayDate(day); -// } else { -// vo.setOtherRepayDate(day.replace("0", "")); -// } -// } -// } -// List busSalesOrderVehicles = busSalesOrderVehicleFeign.selbyContractSid(salesOrderSid).getData(); -// busSalesOrderVehicles.removeAll(Collections.singleton(null)); -// if (!busSalesOrderVehicles.isEmpty()) { -// List stringVinNos = busSalesOrderVehicles.stream().map(c -> c.getLinkNo()).collect(Collectors.toList()); -// if (!stringVinNos.isEmpty()) { -// List vinList = new ArrayList<>(); -// for (String linkNo : stringVinNos) { -// String vinNo = ""; -// if (linkNo.length() > 8) { -// vinNo = linkNo.substring(linkNo.length() - 8); -// -// } else { -// vinNo = linkNo; -// } -// vinList.add(vinNo); -// } -// vo.setVinNo(String.join(",", vinList)); -// } -// for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) { -// -// -// -// } -// } -// } -// vo.setSalesOrderSid(salesOrderSid); -// return rb.success().setData(vo); -// } + /** * 生成pdf * diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationService.java index fda80418bc..11037c7d59 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationService.java @@ -22,8 +22,10 @@ import com.yxt.anrui.riskcenter.api.loanmortgageinformationtransact.*; import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameter; import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterQuery; import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo; +import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails; import com.yxt.anrui.riskcenter.api.loanwarrantinformation.*; import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService; +import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -68,6 +70,8 @@ public class LoanWarrantInformationService extends MybatisBaseService planSids = loanRepaymentPlanDetailsService.getListByBusVinSid(busVinSid); + if (!planSids.isEmpty()) { + int i = loanRepaymentPlanDetailsService.saveVehMark(busVinSid, entity.getVehicleMark()); + } + } } return rb.success().setData(dto.getSid()); }