yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化PC端应收未收分页列表

master
dimengzhe 2 years ago
parent
b3e917ddd9
commit
98661538a9
2 changed files with 89 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 42
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
  2. 54
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

42
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
View File

@ -45,13 +45,51 @@
<select id="selectListAllVo"
resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.DetailsOfReceivablesAndUncollectedItemsVo">
SELECT *
<!-- SELECT *
FROM fin_uncollected_receivables_detailed
<where>
${ew.sqlSegment}
and length(busVinSid) > 0
</where>
order by id asc
order by id asc-->
SELECT distinct furd.sid,
furd.contractNo AS contractNo,
furd.receivablesName AS receivablesName,
furd.customerPhone AS customerPhone,
furd.customerName AS `customerName`,
furd.customerSid,
furd.useOrgSid,
(furd.`reveivableMoney` - COALESCE(df.dbalance, 0)) AS currentReceivableMoney,
furd.reveivableMoney,
furd.contractSid,
if(bv.linkNo is null or LENGTH(trim(bv.linkNo)) &lt; 1,
if(furd.payTypeKey = 2, RIGHT(bv.temporaryNo, 2), bv.temporaryNo),
RIGHT(bv.linkNo, 8)) as VIN,
furd.busVinSid,
furd.payType,
furd.payTypeKey,
0 as subscribedOf,
furd.sid as receivablesSid
FROM fin_uncollected_receivables_detailed furd
left join anrui_buscenter.bus_sales_order_vehicle bv on bv.sid = furd.busVinSid
LEFT JOIN (
SELECT d.sid,
d.receivablesSid,
d.`collSid`,
(
sum(d.`subscriptionMoney`) - COALESCE(SUM(f.`thisUseMoney`), 0)) AS dbalance
FROM fin_selected_receivables_detailed d
LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = d.`sid`
where d.auditState = 1
or d.auditState = 3
GROUP BY d.`receivablesSid`
) df ON df.receivablesSid = furd.`sid`
<where>
${ew.sqlSegment}
and length(furd.busVinSid)>0
</where>
having currentReceivableMoney>0
order by furd.contractNo desc
</select>
<select id="getCustomerBillList"

54
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java
View File

@ -187,16 +187,60 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
}
public List<DetailsOfReceivablesAndUncollectedItemsVo> listAllVo(FinUncollectedReceivablesDetailedQuery query) {
QueryWrapper<FinUncollectedReceivablesDetailed> qw = new QueryWrapper<>();
String useOrgSid = "";
if (StringUtils.isNotBlank(query.getOrgPath())) {
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
query.setUseOrgSid(useOrgSid);
} else {
String createBySid = query.getCreateBySid();
String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(createBySid).getData();
useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(createBySid).getData();
}
// BigDecimal bigDecimal = new BigDecimal("0");
// qw.ne("currentReceivableMoney", bigDecimal);
qw.eq("furd.useOrgSid",useOrgSid);
qw.eq("furd.createBySid", query.getCreateBySid());
String[] sids = query.getSids();
if (sids != null) {
for (String sid : sids) {
if (StringUtils.isNotBlank(sid)) {
qw.ne("furd.sid", sid);
}
}
}
if (StringUtils.isNotBlank(query.getContractNo())) {
qw.like("furd.contractNo", query.getContractNo());
}
if (StringUtils.isNotBlank(query.getCustomerName())) {
qw.like("furd.customerName", query.getCustomerName());
}
if (StringUtils.isNotBlank(query.getVinNo())) {
qw.like("bv.linkNo", query.getVinNo());
}
QueryWrapper<FinUncollectedReceivablesDetailed> qw = createQueryWrapper(query);
if (StringUtils.isNotBlank(query.getCustomerPhone())) {
qw.like("furd.customerPhone", query.getCustomerPhone());
}
if (StringUtils.isNotBlank(query.getPaymentTypeKey())) {
qw.eq("furd.paymentTypeKey", query.getPaymentTypeKey());
}
if (StringUtils.isNotBlank(query.getSubscriptionState())) {
qw.eq("furd.subscriptionState", query.getSubscriptionState());
}
/* //当前应收金额
qw.gt("currentReceivableMoney", new BigDecimal("0"));*/
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (furd.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(createEndTime), "date_format (furd.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
if (StringUtils.isNotBlank(query.getPurchaseSystemSid())) {
qw.eq("furd.purchaseSystemSid", query.getPurchaseSystemSid());
} else {
qw.eq("furd.purchaseSystemSid", "0");
}
// QueryWrapper<FinUncollectedReceivablesDetailed> qw = createQueryWrapper(query);
List<DetailsOfReceivablesAndUncollectedItemsVo> list = baseMapper.selectListAllVo(qw);
list.removeAll(Collections.singleton(null));
/*list.removeAll(Collections.singleton(null));
if (!list.isEmpty()) {
for (DetailsOfReceivablesAndUncollectedItemsVo v : list) {
v.setSubscribedOf(0);
@ -230,7 +274,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
if (StringUtils.isNotBlank(query.getVinNo())) {
list = list.stream().filter(v -> v.getVIN().contains(query.getVinNo())).collect(Collectors.toList());
}
list = list.stream().sorted(Comparator.comparing(DetailsOfReceivablesAndUncollectedItemsVo::getContractNo).reversed()).collect(Collectors.toList());
list = list.stream().sorted(Comparator.comparing(DetailsOfReceivablesAndUncollectedItemsVo::getContractNo).reversed()).collect(Collectors.toList());*/
return list;
}

Write Preview
Loading…
Cancel
Save