From 5299fd9601f162e83c870f862762081fdf2da277 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Fri, 10 May 2024 08:37:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=B4=A6=E5=8D=95=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E5=8A=A0=E6=9C=AA=E6=94=B6=E9=87=91=E9=A2=9D=E5=8C=BA?= =?UTF-8?q?=E9=97=B4=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...inUncollectedReceivablesDetailedQuery.java | 3 + ...nUncollectedReceivablesDetailedMapper.java | 4 +- ...inUncollectedReceivablesDetailedMapper.xml | 81 +++++++++++- ...FinUncollectedReceivablesDetailedRest.java | 2 +- ...UncollectedReceivablesDetailedService.java | 116 +++++++++++++++++- 5 files changed, 202 insertions(+), 4 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java index 9287390fd2..6ffa8cc43a 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java @@ -87,4 +87,7 @@ public class FinUncollectedReceivablesDetailedQuery implements Query { private String menuUrl; @ApiModelProperty("0销售专员申请，1内勤申请") private String state; + + private String noMoneyStart; //未还金额开始 + private String noMoneyEnd; //未还金额结束 } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java index 4ff3211d38..de4af9328e 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java @@ -120,4 +120,6 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper busVinSid, @Param("kxState") String kxState); String selectOtherReceivableMoneyByBusVinSid(String busVinSid); -} \ No newline at end of file + + IPage selectPageVo2(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); +} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml index 1823c3ddc2..00354eaada 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml @@ -356,4 +356,83 @@ FROM fin_uncollected_receivables_detailed WHERE busVinSid = #{busVinSid} - \ No newline at end of file + + diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java index 1820c57524..dfae9ec22d 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java @@ -92,7 +92,7 @@ public class FinUncollectedReceivablesDetailedRest implements FinUncollectedRece @Override public ResultBean> customerBillDetailedListPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); - PagerVo pv = finUncollectedReceivablesDetailedService.detailedListPageVo(pq); + PagerVo pv = finUncollectedReceivablesDetailedService.detailedListPageVo2(pq); return rb.success().setData(pv); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java index ae99e88f77..9cb042a700 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java @@ -390,6 +390,120 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService return qw; } + public PagerVo detailedListPageVo2(PagerQuery pq) { + //==============================分页开始==================================== + FinUncollectedReceivablesDetailedQuery params = pq.getParams(); + String orgPath = params.getOrgPath(); + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + params.setUseOrgSid(useOrgSid); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(params.getMenuUrl())) { + //授权 + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(params.getOrgPath()); + privilegeQuery.setMenuUrl(params.getMenuUrl()); + privilegeQuery.setUserSid(params.getCreateBySid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + orgPath = orgPath + "/"; + int i1 = orgPath.indexOf("/"); + int i2 = orgPath.indexOf("/", i1 + 1); + int i3 = orgPath.indexOf("/", i2 + 1); + int i4 = orgPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgPath = orgPath.substring(0, i1); + qw.like("b.orgSidPath", orgPath); + } else if ("2".equals(orgLevelKey)) { + orgPath = orgPath.substring(0, i2); + qw.like("b.orgSidPath", orgPath); + } else if ("3".equals(orgLevelKey)) { + orgPath = orgPath.substring(0, i3); + qw.like("b.orgSidPath", orgPath); + } else if ("4".equals(orgLevelKey)) { + orgPath = orgPath.substring(0, i4); + qw.like("b.orgSidPath", orgPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("b.createBySid", params.getCreateBySid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + qw.eq("b.useOrgSid", params.getUseOrgSid()); + } + //车架号查询 + if (StringUtils.isNotBlank(params.getVinNo())) { + qw.like("b.vinNo", params.getVinNo()); + } + if (StringUtils.isNotBlank(params.getKxState())) { + qw.like("b.kxState", params.getKxState()); + } + if (StringUtils.isNotBlank(params.getContractNo())) { + qw.like("b.contractNo", params.getContractNo()); + } + if (StringUtils.isNotBlank(params.getCustomerName())) { + qw.like("b.customerName", params.getCustomerName()); + } + if (StringUtils.isNotBlank(params.getReceivablesName())) { + qw.like("b.receivablesName", params.getReceivablesName()); + } + String createStartTime = params.getCreateStartTime(); + String createEndTime = params.getCreateEndTime(); + qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (b.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(createEndTime), "date_format (b.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + ); + String noMoneyStart = params.getNoMoneyStart(); + String noMoneyEnd = params.getNoMoneyEnd(); + qw.apply(StringUtils.isNotEmpty(noMoneyStart), "b.noSubscriptionMoney >=" + noMoneyStart). + apply(StringUtils.isNotEmpty(noMoneyEnd), "b.noSubscriptionMoney <=" + noMoneyEnd + ); + qw.orderByDesc("b.createTime"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo2(page, qw); + //=============================分页结束====================================== + List records = pagging.getRecords(); + for (FinUncollectedReceivablesDetailedVo record : records) { + record.setDownload(false); + //获取单条对应的应收未收sid + String sid = record.getSid(); + BigDecimal noSubscriptionMoney = new BigDecimal(record.getNoSubscriptionMoney()); + String busVinSid = record.getBusVinSid(); + BusSalesOrderVehicle data = busSalesOrderVehicleFeign.fetchBySalesOrderVehiclerSid(busVinSid).getData(); + if (null != data) { + String salesOrderSid = data.getSalesOrderSid(); + FinUncollectedReceivablesDetailedPdfVo pdfVo = baseMapper.selectPdf(sid); + if (null != pdfVo) { + //根据销售订单编号查询金融方案 分别取出保证金 + SolutionsDetailsVo svo = loanSolutionsFeign.selectDetails(salesOrderSid).getData(); + if (noSubscriptionMoney.compareTo(BigDecimal.ZERO) <= 0) { + if (null != svo) { + if ((StringUtils.isNotBlank(svo.getBondAmounts()) && !("0.00").equals(svo.getBondAmounts()) && !("0").equals(svo.getBondAmounts())) + || (StringUtils.isNotBlank(svo.getDepositPremium()) && !("0.00").equals(svo.getDepositPremium()) && !("0").equals(svo.getDepositPremium())) + || (StringUtils.isNotBlank(svo.getDepositSettle()) && !("0.00").equals(svo.getDepositSettle())) && !("0").equals(svo.getDepositSettle())) { + BaseVehicleState vehicleState = baseVehicleStateFeign.selectOneByBusSidAndOrderSid(record.getBusVinSid(), salesOrderSid).getData(); + if (null != vehicleState) { + if (StringUtils.isNotBlank(vehicleState.getFinState())) { + if (vehicleState.getFinState().equals("1")) { + record.setDownload(true); + } + } + } + } + } + } + } + } + } + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public PagerVo detailedListPageVo(PagerQuery pq) { //==============================分页开始==================================== FinUncollectedReceivablesDetailedQuery params = pq.getParams(); @@ -1030,4 +1144,4 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService String otherReceivableMoney = baseMapper.selectOtherReceivableMoneyByBusVinSid(busVinSid); return rb.success().setData(otherReceivableMoney); } -} \ No newline at end of file +}