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

优化已认款列表

master
dimengzhe 2 years ago
parent
98661538a9
commit
7c356b7da5
3 changed files with 105 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. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java
  2. 57
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
  3. 53
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java
View File

@ -159,4 +159,6 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSele
String selectBalanceByReceivedSid(String receivablesSid);
List<FinSelectedReceivablesDetailed> selectListByReceivableSid(String receivablesSid);
IPage<FinSelectReceivablesDetailedVo> selectPageLists(IPage<FinSelectedReceivablesPaymentDetailsQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw, @Param("name") String name);
}

57
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
View File

@ -391,4 +391,61 @@
where receivablesSid = #{receivablesSid}
and (auditState = 1 or auditState = 3)
</select>
<select id="selectPageLists"
resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectReceivablesDetailedVo">
select distinct fd.sid,
fd.receivablesSid,
fd.contractNo,
fd.customerSid,
fd.customerName,
fd.customerPhone,
fd.receivablesName,
fd.currentReceivableMoney,
(furd.`reveivableMoney` - COALESCE(df.dbalance, 0)) AS dbalance,
if(fd.currentReceivableMoney &lt;= 0,0,if(fd.currentReceivableMoney-fd.subscriptionMoney &lt;=0,0,fd.currentReceivableMoney-fd.subscriptionMoney)) as reveivableMoney,
furd.busVinSid,
furd.payType,
furd.payTypeKey,
fd.subscriptionMoney,
fd.useOrgSid,
fd.subscriptionDate,
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,
CURRENT_DATE() as confirmDate,
1 as subscribedOf
from fin_selected_receivables_detailed fd
left join fin_uncollected_receivables_detailed furd on furd.sid = fd.receivablesSid
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 fd.receivablesName != '订金'
and fd.auditState = 3
<if test="name != null and name != ''">
and concat(IFNULL(fd.customerName
, '')
, ifnull(fd.contractNo
, '')
, ifnull(bv.linkNo
, '')) LIKE concat('%'
, #{name}
, '%')
</if>
</where>
having dbalance &lt;= 0
order by furd.contractNo desc
</select>
</mapper>

53
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java
View File

@ -335,7 +335,7 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
return rb.success().setData(finSelectedReceivablesDetailed);
}
public IPage<FinSelectReceivablesDetailedVo> selectPageList(PagerQuery<FinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
public IPage<FinSelectReceivablesDetailedVo> selectPageList111(PagerQuery<FinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
IPage<FinSelectReceivablesDetailedVo> page = PagerUtil.queryToPage(pagerQuery);
FinSelectedReceivablesPaymentDetailsQuery params = pagerQuery.getParams();
QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw = new QueryWrapper<>();
@ -455,13 +455,9 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
}
if (StringUtils.isNotBlank(pagerQuery.getParams().getName())) {
collList = collList.stream().filter(v -> v.getVIN().contains(pagerQuery.getParams().getName())).collect(Collectors.toList());
// List<FinSelectReceivablesDetailedVo> cll = collList.stream().filter(v -> v.getVIN().contains(pagerQuery.getParams().getName())).collect(Collectors.toList());
// collList = Stream.of(collList, cll).flatMap(Collection::stream).collect(Collectors.toList());
}
if (StringUtils.isNotBlank(pagerQuery.getParams().getVinNo())) {
collList = collList.stream().filter(v -> v.getVIN().contains(pagerQuery.getParams().getVinNo())).collect(Collectors.toList());
// List<FinSelectReceivablesDetailedVo> cll = collList.stream().filter(v -> v.getVIN().contains(pagerQuery.getParams().getVinNo())).collect(Collectors.toList());
// collList = Stream.of(collList, cll).flatMap(Collection::stream).collect(Collectors.toList());
}
}
//将collList根据sid去重
@ -472,16 +468,59 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
//分页
IPage<FinSelectReceivablesDetailedVo> page1 = new Page<>();
page1.setTotal(collList.size());
// page1.setPages((collList.size() / pagerQuery.getSize()) + 1);
page1.setPages(collList.size()/pagerQuery.getSize()+(collList.size()%pagerQuery.getSize()==0?0:1));
collList = collList.stream().skip((pagerQuery.getCurrent() - 1) *pagerQuery.getSize()).limit(pagerQuery.getSize()).collect(Collectors.toList()); //开始分页
// collList = CollUtil.page(Integer.parseInt(String.valueOf(pagerQuery.getCurrent())), Integer.parseInt(String.valueOf(pagerQuery.getSize())), collList);
page1.setRecords(collList);
page1.setCurrent(pagerQuery.getCurrent());
page1.setSize(pagerQuery.getSize());
return page1;
}
public IPage<FinSelectReceivablesDetailedVo> selectPageList(PagerQuery<FinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
IPage<FinSelectedReceivablesPaymentDetailsQuery> page = PagerUtil.queryToPage(pagerQuery);
FinSelectedReceivablesPaymentDetailsQuery params = pagerQuery.getParams();
QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(pagerQuery.getParams().getPurchaseSystemSid())) {
qw.eq("furd.purchaseSystemSid", pagerQuery.getParams().getPurchaseSystemSid());
} else {
qw.eq("furd.purchaseSystemSid", "0");
}
String useOrgSid = "";
String orgPath = pagerQuery.getParams().getOrgPath();
String userSid = pagerQuery.getParams().getUserSid();
if (StringUtils.isNotBlank(orgPath)) {
useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
} else {
useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
}
if (StringUtils.isNotBlank(useOrgSid)) {
qw.eq("fd.useOrgSid", useOrgSid);
}
if (StringUtils.isNotBlank(userSid)) {
qw.eq("fd.createBySid", userSid);
}
List<String> sids = pagerQuery.getParams().getSids();
if (sids != null) {
for (String sid : sids) {
if (StringUtils.isNotBlank(sid)) {
qw.ne("fd.sid", sid);
}
}
}
if(StringUtils.isNotBlank(params.getContractNo())){
qw.like("fd.contractNo",params.getContractNo());
}
if(StringUtils.isNotBlank(params.getCustomerName())){
qw.like("fd.customerName",params.getCustomerName());
}
if(StringUtils.isNotBlank(params.getMobile())){
qw.like("fd.customerPhone",params.getMobile());
}
IPage<FinSelectReceivablesDetailedVo> pagging = baseMapper.selectPageLists(page, qw, params.getName());
return pagging;
}
public PagerVo<FinSelectReceivablesDetailedWCKCLRKVo> noOutVehRecPageList(PagerQuery<FinSelectedReceivablesPaymentDetailsWCKCLRKQuery> pagerQuery) {
FinSelectedReceivablesPaymentDetailsWCKCLRKQuery query = pagerQuery.getParams();
QueryWrapper<FinSelectReceivablesDetailedWCKCLRKVo> qw = new QueryWrapper<>();

Write Preview
Loading…
Cancel
Save