|
|
@ -1284,10 +1284,10 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService |
|
|
|
qw.apply("( b.reveivableMoney - b.subscriptionMoney ) <=" + query.getNoSubscriptionMoneyEnd()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getContractNo())) { |
|
|
|
qw.like("b.contractNo",query.getContractNo()); |
|
|
|
qw.like("b.contractNo", query.getContractNo()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getCustomerName())) { |
|
|
|
qw.like("b.customerName",query.getCustomerName()); |
|
|
|
qw.like("b.customerName", query.getCustomerName()); |
|
|
|
} |
|
|
|
IPage<FinUncollectedReceivablesDetailed> page = PagerUtil.queryToPage(pq); |
|
|
|
IPage<CustomerBillSummaryVo> pagging = baseMapper.getCustomerSummaryList(page, qw); |
|
|
@ -1316,6 +1316,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService |
|
|
|
public List<CustomerBillSummaryExportVo> exportCustomerBillExcel(CustomerBillSummaryQuery query) { |
|
|
|
QueryWrapper<FinUncollectedReceivablesDetailed> qw = new QueryWrapper<>(); |
|
|
|
String orgPath = query.getOrgPath(); |
|
|
|
List<CustomerBillSummaryExportVo> list = new ArrayList<>(); |
|
|
|
//授权
|
|
|
|
if (StringUtils.isNotBlank(query.getMenuUrl())) { |
|
|
|
PrivilegeQuery privilegeQuery = new PrivilegeQuery(); |
|
|
@ -1361,12 +1362,27 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService |
|
|
|
qw.apply("( b.reveivableMoney - b.subscriptionMoney ) <=" + query.getNoSubscriptionMoneyEnd()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getContractNo())) { |
|
|
|
qw.like("b.contractNo",query.getContractNo()); |
|
|
|
qw.like("b.contractNo", query.getContractNo()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getCustomerName())) { |
|
|
|
qw.like("b.customerName",query.getCustomerName()); |
|
|
|
qw.like("b.customerName", query.getCustomerName()); |
|
|
|
} |
|
|
|
List<CustomerBillSummaryVo> summaryVos = baseMapper.exportCustomerBillExcel(qw); |
|
|
|
if (!summaryVos.isEmpty()) { |
|
|
|
for (CustomerBillSummaryVo summaryVo : summaryVos) { |
|
|
|
String contractSid = summaryVo.getContractSid(); |
|
|
|
List<CustomerBillSummaryExportVo> details = baseMapper.selexportCustomerBillExcelDetails(contractSid); |
|
|
|
if (!details.isEmpty()) { |
|
|
|
list.addAll(details); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
if (!list.isEmpty()) { |
|
|
|
for (int i = 0; i < list.size(); i++) { |
|
|
|
CustomerBillSummaryExportVo exportVo = list.get(i); |
|
|
|
exportVo.setRankNo(i + 1); |
|
|
|
} |
|
|
|
} |
|
|
|
List<CustomerBillSummaryExportVo> list = baseMapper.exportCustomerBillExcel(qw); |
|
|
|
return list; |
|
|
|
} |
|
|
|
} |
|
|
|