diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSet.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSet.java index 3f3bec9f1f..3096cc2948 100644 --- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSet.java +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSet.java @@ -26,8 +26,10 @@ public class ReportSet extends BaseEntity { private int buyout; @ApiModelProperty("欠款出库") private int outbound; - @ApiModelProperty("金融未放款") + @ApiModelProperty("金融未放款-已出库") private int loanDis; + @ApiModelProperty("金融未放款-已过信审终审") + private int loanDiss; } diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml index 731aecb88e..dabb7578be 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml @@ -376,17 +376,17 @@ select DATE_FORMAT(createTime, '%Y-%m-%d') as date, - sum(saleOfStockRatio) as saleOfStockRatio, - sum(stock_subtotal) as stock_subtotal, - sum(pcOrder_subtotal) as pcOrder_subtotal, - sum(saleOrder_subtotal_day) as saleOrder_subtotal_day, - sum(sale_subtotal_day) as sale_subtotal_day, - sum(arrears_carry_veh_amount) as arrears_carry_veh_amount, - sum(loan_not_amount) as loan_not_amount, - sum(loan_not_amounts) as loan_not_amounts, - sum(buyout_day) as buyout_day, - sum(saleAllToThree) as saleAllToThree, - SUM(stock_total) as stock_total, + sum(saleOfStockRatio) as saleOfStockRatio, + sum(stock_subtotal) as stock_subtotal, + sum(pcOrder_subtotal) as pcOrder_subtotal, + sum(saleOrder_subtotal_day) as saleOrder_subtotal_day, + sum(sale_subtotal_day) as sale_subtotal_day, + sum(arrears_carry_veh_amount) as arrears_carry_veh_amount, + sum(loan_not_amount) as loan_not_amount, + ifnull(sum(loan_not_amounts), 0) as loan_not_amounts, + sum(buyout_day) as buyout_day, + sum(saleAllToThree) as saleAllToThree, + SUM(stock_total) as stock_total, useOrgSid from daily_report @@ -405,7 +405,7 @@ sum(sale_subtotal_day) as sale_subtotal_day, sum(arrears_carry_veh_amount) as arrears_carry_veh_amount, sum(loan_not_amount) as loan_not_amount, - sum(loan_not_amounts) as loan_not_amounts, + ifnull(sum(loan_not_amounts), 0) as loan_not_amounts, sum(buyout_day) as buyout_day, sum(saleAllToThree) as saleAllToThree, SUM(stock_total) as stock_total, diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/reportset/ReportSetService.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/reportset/ReportSetService.java index c68df995af..f9b29d987d 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/reportset/ReportSetService.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/reportset/ReportSetService.java @@ -62,6 +62,10 @@ public class ReportSetService extends MybatisBaseService stringList, @Param("formatDate") String formatDate); List selNotRuleForBuckSids(@Param("useOrgSid") String useOrgSid); + + String selPayStateByPlanSid(@Param("key") String key); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml index 97e396795b..90cccbb695 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml @@ -11,6 +11,7 @@ + + \ No newline at end of file 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 1d468dcb98..8bdbc18218 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 @@ -905,11 +905,11 @@ public class LoanRepaymentHistoryService extends MybatisBaseService(); } - qw.eq("p.orgSidPath", useOrgSid); + qw.eq("p.useOrgSid", useOrgSid); qw.ne("h.buckleKey", "002"); qw.ne("h.buckleKey", "003"); qw.eq("h.updateState", "1"); - qw.notIn("h.sid",selNotRuleForBuckSids); + qw.notIn("h.sid", selNotRuleForBuckSids); List histories = baseMapper.selbuckleNewInitList(qw); Map countMoney = new HashMap<>(); Map> sids = new HashMap<>(); @@ -920,8 +920,8 @@ public class LoanRepaymentHistoryService extends MybatisBaseService { RepaymentHistoryVoForBuckleNew r = new RepaymentHistoryVoForBuckleNew(); - if (StringUtils.isNotBlank(h.getPlanDetailSid()) && StringUtils.isNotBlank(h.getPayState())) { - r.setRule(h.getPlanDetailSid() + "!" + h.getPayState()); + if (StringUtils.isNotBlank(h.getPlanDetailSid())) { + r.setRule(h.getPlanDetailSid()); } if (StringUtils.isNotBlank(h.getSid())) { r.setSid(h.getSid()); @@ -931,6 +931,19 @@ public class LoanRepaymentHistoryService extends MybatisBaseService { +// RepaymentHistoryVoForBuckleNew r = new RepaymentHistoryVoForBuckleNew(); +// if (StringUtils.isNotBlank(h.getPlanDetailSid()) && StringUtils.isNotBlank(h.getPayState())) { +// r.setRule(h.getPlanDetailSid() + "!" + h.getPayState()); +// } +// if (StringUtils.isNotBlank(h.getSid())) { +// r.setSid(h.getSid()); +// } +// if (null != h.getActualMoney()) { +// r.setActualMoney(h.getActualMoney()); +// } +// newList.add(r); +// }); if (!newList.isEmpty()) { countMoney = newList.stream() .collect(Collectors.groupingBy(RepaymentHistoryVoForBuckleNew::getRule, CollectorsUtil.summingBigDecimal(RepaymentHistoryVoForBuckleNew::getActualMoney))); @@ -952,18 +965,21 @@ public class LoanRepaymentHistoryService extends MybatisBaseService> entry : stringListMap.entrySet()) { LoanBuckleHistoryRecord record = new LoanBuckleHistoryRecord(); - String planSid = ""; - String payState = ""; - if (StringUtils.isNotBlank(entry.getKey())) { - String[] split = entry.getKey().split("!"); - planSid = split[0]; - payState = split[1]; +// String planSid = ""; +// String payState = ""; +// if (StringUtils.isNotBlank(entry.getKey())) { +// String[] split = entry.getKey().split("!"); +// planSid = split[0]; +// payState = split[1]; +// } + record.setRecordSid(entry.getKey()); + String payState = baseMapper.selPayStateByPlanSid(entry.getKey()); + if (StringUtils.isNotBlank(payState)) { + record.setPayState(payState); } - record.setRecordSid(planSid); - record.setPayState(payState); record.setHistorySids(entry.getValue()); record.setActualMoney(newMap.get(entry.getKey()).toString()); - LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.fetchBySid(planSid); + LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.fetchBySid(entry.getKey()); if (null != planDetails) { if (StringUtils.isNotBlank(planDetails.getLoanContractNo())) { record.setLoanContractNo(planDetails.getLoanContractNo()); diff --git a/anrui-system-ui/src/assets/loginImg/logo.png b/anrui-system-ui/src/assets/loginImg/logo.png index a56f153dc7..4e5a41b636 100644 Binary files a/anrui-system-ui/src/assets/loginImg/logo.png and b/anrui-system-ui/src/assets/loginImg/logo.png differ diff --git a/anrui-system-ui/src/assets/loginImg/logo1.png b/anrui-system-ui/src/assets/loginImg/logo1.png new file mode 100644 index 0000000000..a56f153dc7 Binary files /dev/null and b/anrui-system-ui/src/assets/loginImg/logo1.png differ