diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java index b6cc55eb3e..424b9d84dd 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java @@ -86,4 +86,6 @@ public interface LoanRepaymentHistoryMapper extends BaseMapper list); List selSchSidAndVinNo(@Param("scheduleSid") String scheduleSid,@Param("vinNo") String vinNo); + + IPage repaymentStatistics2(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); } 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 7e20cebefc..e2e37a12fe 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 @@ -920,4 +920,84 @@ WHERE d.vinNo = #{vinNo} AND h.scheduleSid = #{scheduleSid} + diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryRest.java index 9325b5ad72..163e88390c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryRest.java @@ -153,7 +153,7 @@ public class LoanRepaymentHistoryRest implements LoanRepaymentHistoryFeign { @Override public ResultBean> repaymentStatistics(PagerQuery pq) { ResultBean> rb = ResultBean.fireFail(); - PagerVo pv = loanRepaymentHistoryService.repaymentStatistics(pq); + PagerVo pv = loanRepaymentHistoryService.repaymentStatistics2(pq); return rb.success().setData(pv); } 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 debd64c89c..aabf182875 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 @@ -1332,7 +1332,6 @@ public class LoanRepaymentHistoryService extends MybatisBaseService= date_format('" + updateStartDate + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(updateEndDate), "date_format (a.updateDate,'%Y-%m-%d') <= date_format('" + updateEndDate + "','%Y-%m-%d')" ); - qw.eq("1", "1"); qw.orderBy(true, true, "a.useOrgName") .orderBy(true, true, "a.vinNo") .orderBy(true, true, "a.period") @@ -1393,6 +1392,107 @@ public class LoanRepaymentHistoryService extends MybatisBaseService repaymentStatistics2(PagerQuery pq) { + IPage page = PagerUtil.queryToPage(pq); + RepaymentStatisticsQuery pagerQuery = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + //======================= + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(pagerQuery.getOrgPath()); + privilegeQuery.setMenuSid(pagerQuery.getMenuSid()); + privilegeQuery.setMenuUrl(pagerQuery.getMenuUrl()); + privilegeQuery.setUserSid(pagerQuery.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = pagerQuery.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("a.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("a.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("a.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("a.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("a.createBySid", pagerQuery.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + //======================= + if (StringUtils.isNotBlank(pagerQuery.getUseOrgName())) { + qw.like("a.useOrgName", pagerQuery.getUseOrgName()); + } + if (StringUtils.isNotBlank(pagerQuery.getVinNo())) { + qw.like("a.vinNo", pagerQuery.getVinNo()); + } + if (StringUtils.isNotBlank(pagerQuery.getDept())) { + qw.like("a.dept", pagerQuery.getDept()); + } + if (StringUtils.isNotBlank(pagerQuery.getReturnState())) { + qw.eq("a.returnState", pagerQuery.getReturnState()); + } + if (StringUtils.isNotBlank(pagerQuery.getStaffName())) { + qw.like("a.staffName", pagerQuery.getStaffName()); + } + if (StringUtils.isNotBlank(pagerQuery.getLoanContractNo())) { + qw.like("a.loanContractNo", pagerQuery.getLoanContractNo()); + } + if (StringUtils.isNotBlank(pagerQuery.getPeriod())) { + qw.eq("a.period", pagerQuery.getPeriod()); + } + if (StringUtils.isNotBlank(pagerQuery.getBankName())) { + qw.like("a.bankName", pagerQuery.getBankName()); + } + if (StringUtils.isNotBlank(pagerQuery.getBankContractNo())) { + qw.like("a.bankContractNo", pagerQuery.getBankContractNo()); + } + if (StringUtils.isNotBlank(pagerQuery.getCustomer())) { + qw.like("a.customer", pagerQuery.getCustomer()); + } + if (StringUtils.isNotBlank(pagerQuery.getBorrowerName())) { + qw.like("a.borrowerName", pagerQuery.getBorrowerName()); + } + if (StringUtils.isNotBlank(pagerQuery.getDueOverdue())) { + qw.eq("a.dueOverdue", pagerQuery.getDueOverdue()); + } + String dueStartDate = pagerQuery.getDueStartDate(); + String dueEndDate = pagerQuery.getDueEndDate(); + qw.apply(StringUtils.isNotEmpty(dueStartDate), "date_format (a.dueDate,'%Y-%m-%d') >= date_format('" + dueStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(dueEndDate), "date_format (a.dueDate,'%Y-%m-%d') <= date_format('" + dueEndDate + "','%Y-%m-%d')" + ); + String updateStartDate = pagerQuery.getUpdateStartDate(); + String updateEndDate = pagerQuery.getUpdateEndDate(); + qw.apply(StringUtils.isNotEmpty(updateStartDate), "date_format (a.updateDate,'%Y-%m-%d') >= date_format('" + updateStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(updateEndDate), "date_format (a.updateDate,'%Y-%m-%d') <= date_format('" + updateEndDate + "','%Y-%m-%d')" + ); + qw.orderBy(true, true, "a.useOrgName") + .orderBy(true, true, "a.vinNo") + .orderBy(true, true, "a.period") + .orderBy(true, true, "a.loanContractNo") + ; + IPage pagging = baseMapper.repaymentStatistics2(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + /** * 分页方法 */ @@ -1529,7 +1629,6 @@ public class LoanRepaymentHistoryService extends MybatisBaseService= date_format('" + updateStartTime + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(updateEndTime), "date_format (a.updateTime,'%Y-%m-%d') <= date_format('" + updateEndTime + "','%Y-%m-%d')" ); - qw.eq("1", "1"); qw.orderBy(true, true, "a.useOrgName") .orderBy(true, true, "a.vinNo") .orderBy(true, false, "a.createTime") @@ -1615,7 +1714,6 @@ public class LoanRepaymentHistoryService extends MybatisBaseService= date_format('" + head + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(last), "date_format (a.dueDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')" ); - qw.eq("1", "1"); qw.orderBy(true, true, "a.useOrgName") .orderBy(true, true, "a.vinNo") .orderBy(true, true, "a.period") @@ -1835,7 +1933,6 @@ public class LoanRepaymentHistoryService extends MybatisBaseService= date_format('" + updateStartDate + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(updateEndDate), "date_format (a.updateDate,'%Y-%m-%d') <= date_format('" + updateEndDate + "','%Y-%m-%d')" ); - qw.eq("1", "1"); qw.orderBy(true, true, "a.useOrgName") .orderBy(true, true, "a.vinNo") .orderBy(true, true, "a.period") @@ -1998,7 +2095,6 @@ public class LoanRepaymentHistoryService extends MybatisBaseService= date_format('" + updateStartTime + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(updateEndTime), "date_format (a.updateTime,'%Y-%m-%d') <= date_format('" + updateEndTime + "','%Y-%m-%d')" ); - qw.eq("1", "1"); qw.orderBy(true, true, "a.useOrgName") .orderBy(true, true, "a.vinNo") .orderBy(true, true, "a.period")