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

优化

master
dimengzhe 2 years ago
parent
7f97bda2cd
commit
1720d9d43f
3 changed files with 147 additions and 117 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 74
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  2. 187
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
  3. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsInfoVo.java

74
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
View File

@ -284,32 +284,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
record.setRecallAtn(true); record.setRecallAtn(true);
} }
} }
/* for (FinCollectionConfirmationVo record : records) {
String s = "";
BigDecimal subscriptionMoney = new BigDecimal(0);
String sid = record.getSid();
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid);
for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) {
Integer auditState = finSelectedReceivablesDetailedVo.getAuditState();
s += auditState + ",";
}
if (!s.contains("3")) {
record.setSubscriptionState(1);
} else if (s.contains("3")) {
int auditState = 3;
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState(sid, auditState);
for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos1) {
BigDecimal subscriptionMoney1 = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney());
subscriptionMoney = subscriptionMoney.add(subscriptionMoney1);
}
BigDecimal collectionMoney = new BigDecimal(record.getCollectionMoney());
if (collectionMoney.compareTo(subscriptionMoney) == 0) {
record.setSubscriptionState(3);
} else {
record.setSubscriptionState(2);
}
}
}*/
PagerVo<FinCollectionConfirmationVo> p = PagerUtil.pageToVo(pagging, null); PagerVo<FinCollectionConfirmationVo> p = PagerUtil.pageToVo(pagging, null);
return p; return p;
} }
@ -1039,7 +1013,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
* @param pagerQuery * @param pagerQuery
* @return * @return
*/ */
public IPage<AppFinUncollectedReceivablesDetailedVo> getPaymentDetailsList(PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery) { public IPage<AppFinUncollectedReceivablesDetailedVo> getPaymentDetailsList111(PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
AppFinSelectedReceivablesPaymentDetailsQuery params = pagerQuery.getParams(); AppFinSelectedReceivablesPaymentDetailsQuery params = pagerQuery.getParams();
String orgPath = pagerQuery.getParams().getOrgPath(); String orgPath = pagerQuery.getParams().getOrgPath();
@ -1154,6 +1128,47 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
return page1; return page1;
} }
/**
* 手机端—查询可使用款项明细列表
*
* @param pagerQuery
* @return
*/
public IPage<AppFinUncollectedReceivablesDetailedVo> getPaymentDetailsList(PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
IPage<AppFinSelectedReceivablesPaymentDetailsQuery> page = PagerUtil.queryToPage(pagerQuery);
AppFinSelectedReceivablesPaymentDetailsQuery params = pagerQuery.getParams();
String orgPath = params.getOrgPath();
String userSid = params.getUserSid();
String useOrgSid = "";
QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw = new QueryWrapper<>();
if (params != null) {
if (StringUtils.isNotBlank(orgPath)) {
useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
} else {
useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
}
if (StringUtils.isNotBlank(useOrgSid)) {
qw.eq("useOrgSid", useOrgSid);
}
if (StringUtils.isNotBlank(userSid)) {
qw.eq("createBySid", userSid);
}
if (params.getSidList().size() > 0) {
qw.notIn("sid", params.getSidList());
}
qw.gt("currentReceivableMoney", 0);//应收金额
if (StringUtils.isNotBlank(pagerQuery.getParams().getPurchaseSystemSid())) {
qw.eq("purchaseSystemSid", pagerQuery.getParams().getPurchaseSystemSid());
} else {
qw.eq("purchaseSystemSid", "0");
}
}
IPage<AppFinUncollectedReceivablesDetailedVo> pagging = finSelectedReceivablesDetailedService.getPaymentDetailsList(page, qw,params.getName());
return pagging;
}
/** /**
* 构造条件 * 构造条件
* *
@ -1230,7 +1245,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
* @param userSid * @param userSid
* @return * @return
*/ */
public ResultBean cashierConfirmOld(String sid, String userSid) { public ResultBean cashierConfirm(String sid, String userSid) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
FinCollectionConfirmation confirmation = fetchBySid(sid); FinCollectionConfirmation confirmation = fetchBySid(sid);
if (confirmation == null) { if (confirmation == null) {
@ -1576,7 +1591,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
} }
public ResultBean cashierConfirm(String sid, String userSid) { public ResultBean cashierConfirm11111(String sid, String userSid) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
FinCollectionConfirmation confirmation = fetchBySid(sid); FinCollectionConfirmation confirmation = fetchBySid(sid);
if (confirmation == null) { if (confirmation == null) {
@ -1920,6 +1935,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
ResultBean deleteResult = baseVehicleTempstateFeign.delByBusSid(sid); ResultBean deleteResult = baseVehicleTempstateFeign.delByBusSid(sid);
return rb.success().setMsg("款项确认成功"); return rb.success().setMsg("款项确认成功");
} }
//组装客户推送 //组装客户推送
private BdCustomer createBdCustomer(String useOrgSid, String name, String mobile, String customerSid, String collSid) { private BdCustomer createBdCustomer(String useOrgSid, String name, String mobile, String customerSid, String collSid) {
BdCustomer bdCustomer = new BdCustomer(); BdCustomer bdCustomer = new BdCustomer();

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

@ -24,31 +24,44 @@
<!--手机端—查询可使用款项明细列表--> <!--手机端—查询可使用款项明细列表-->
<select id="getPaymentDetailsList" <select id="getPaymentDetailsList"
resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo"> resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo">
SELECT sid, SELECT distinct furd.sid,
contractNo AS contractId, furd.contractNo AS contractId,
receivablesName AS projectName, furd.receivablesName AS projectName,
customerPhone AS mobile, furd.customerPhone AS mobile,
customerName AS `name`, furd.customerName AS `name`,
currentReceivableMoney AS receivable, (furd.reveivableMoney - COALESCE(SUM(df.dbalance), 0)) AS receivable,
contractSid, furd.contractSid,
<!--currentReceivableMoney AS confirmMoney,--> if(bv.linkNo is null or LENGTH(trim(bv.linkNo)) &lt; 1,
VIN AS vin, if(furd.payTypeKey = 2, RIGHT(bv.temporaryNo, 2), bv.temporaryNo),
furd.busVinSid, RIGHT(bv.linkNo, 8)) as vin,
furd.payType, furd.busVinSid,
furd.payTypeKey furd.payType,
furd.payTypeKey,
0 as subscribedOf,
furd.sid as receivablesSid,
CURRENT_DATE() as confirmDate
FROM fin_uncollected_receivables_detailed furd 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.`collSid`, (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`
GROUP BY d.`sid`
) df ON df.collSid = furd.`sid`
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
<if test="name != null and name != ''"> <if test="name != null and name != ''">
and concat(IFNULL(furd.customerName and concat(IFNULL(furd.customerName
, '') , '')
, ifnull(furd.contractNo , ifnull(furd.contractNo
, '')) LIKE concat('%' , '')
, #{name} , ifnull(bv.linkNo
, '%') , '')) LIKE concat('%'
, #{name}
, '%')
</if> </if>
and length(furd.busVinSid) and length(furd.busVinSid)
>0 >0
</where> </where>
order by furd.contractNo desc order by furd.contractNo desc
</select> </select>
@ -56,32 +69,32 @@
<select id="getPaymentList" <select id="getPaymentList"
resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo"> resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo">
SELECT sid, SELECT sid,
contractNo AS contractId, contractNo AS contractId,
receivablesName AS projectName, receivablesName AS projectName,
customerPhone AS mobile, customerPhone AS mobile,
customerName AS `name`, customerName AS `name`,
currentReceivableMoney AS receivable, currentReceivableMoney AS receivable,
contractSid, contractSid,
VIN AS vin, VIN AS vin,
furd.busVinSid, furd.busVinSid,
furd.payType, furd.payType,
furd.payTypeKey, furd.payTypeKey,
furd.customerSid, furd.customerSid,
furd.useOrgSid, furd.useOrgSid,
furd.reveivableMoney furd.reveivableMoney
FROM fin_uncollected_receivables_detailed furd FROM fin_uncollected_receivables_detailed furd
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
<if test="name != null and name != ''"> <if test="name != null and name != ''">
and concat(IFNULL(furd.customerName and concat(IFNULL(furd.customerName
, '') , '')
, ifnull(furd.contractNo , ifnull(furd.contractNo
, '')) LIKE concat('%' , '')) LIKE concat('%'
, #{name} , #{name}
, '%') , '%')
</if> </if>
and length(furd.busVinSid) and length(furd.busVinSid)
>0 >0
</where> </where>
order by furd.contractNo desc order by furd.contractNo desc
</select> </select>
@ -124,7 +137,7 @@
payTypeKey, payTypeKey,
customerSid, customerSid,
useOrgSid, useOrgSid,
subscribedOf subscribedOf
FROM fin_selected_receivables_detailed FROM fin_selected_receivables_detailed
WHERE collSid = #{collectionBillSid} WHERE collSid = #{collectionBillSid}
</select> </select>
@ -133,7 +146,7 @@
resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo"> resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo">
SELECT fsrd.subscriptionMoney SELECT fsrd.subscriptionMoney
FROM fin_selected_receivables_detailed fsrd FROM fin_selected_receivables_detailed fsrd
LEFT JOIN fin_collection_confirmation fcc ON fcc.sid = fsrd.collSid LEFT JOIN fin_collection_confirmation fcc ON fcc.sid = fsrd.collSid
WHERE fcc.paymentState = 1 WHERE fcc.paymentState = 1
</select> </select>
@ -149,7 +162,7 @@
resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo"> resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo">
select fd.* select fd.*
from fin_selected_receivables_detailed fd from fin_selected_receivables_detailed fd
left join fin_uncollected_receivables_detailed fud on fud.sid = fd.receivablesSid left join fin_uncollected_receivables_detailed fud on fud.sid = fd.receivablesSid
where fd.contractNo = #{contractNo} where fd.contractNo = #{contractNo}
and fud.busVinSid = #{busVinSid} and fud.busVinSid = #{busVinSid}
and fd.auditState = #{state} and fd.auditState = #{state}
@ -263,7 +276,7 @@
<select id="selectByVinSid" resultType="java.lang.String"> <select id="selectByVinSid" resultType="java.lang.String">
select sum(fd.balance) select sum(fd.balance)
from fin_selected_receivables_detailed fd from fin_selected_receivables_detailed fd
left join fin_uncollected_receivables_detailed ff on ff.sid = fd.receivablesSid left join fin_uncollected_receivables_detailed ff on ff.sid = fd.receivablesSid
where ff.busVinSid = #{busVinSid} where ff.busVinSid = #{busVinSid}
and fd.auditState = 3 and fd.auditState = 3
</select> </select>
@ -280,7 +293,8 @@
FROM fin_selected_receivables_detailed FROM fin_selected_receivables_detailed
WHERE receivablesSid = #{ysSid} WHERE receivablesSid = #{ysSid}
AND auditState = 3 AND auditState = 3
ORDER BY createTime DESC LIMIT 1 ORDER BY createTime DESC
LIMIT 1
</select> </select>
<select id="selectUnSelectList" resultType="java.lang.String"> <select id="selectUnSelectList" resultType="java.lang.String">
@ -295,58 +309,58 @@
<select id="selectPageList" <select id="selectPageList"
resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectReceivablesDetailedVo"> resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectReceivablesDetailedVo">
select fd.sid, select fd.sid,
fd.receivablesSid, fd.receivablesSid,
fd.contractNo, fd.contractNo,
fd.customerSid, fd.customerSid,
fd.customerName, fd.customerName,
fd.customerPhone, fd.customerPhone,
fd.receivablesName, fd.receivablesName,
fd.currentReceivableMoney, fd.currentReceivableMoney,
furd.busVinSid, furd.busVinSid,
furd.payType, furd.payType,
furd.payTypeKey, furd.payTypeKey,
fd.subscriptionMoney, fd.subscriptionMoney,
fd.useOrgSid, fd.useOrgSid,
fd.subscriptionDate fd.subscriptionDate
from fin_selected_receivables_detailed fd from fin_selected_receivables_detailed fd
left join fin_uncollected_receivables_detailed furd on furd.sid = fd.receivablesSid left join fin_uncollected_receivables_detailed furd on furd.sid = fd.receivablesSid
<where> <where>
${ew.sqlSegment} and fd.receivablesName != '订金' and fd.auditState = 3 ${ew.sqlSegment}
and fd.receivablesName != '订金'
and fd.auditState = 3
<if test="name != null and name != ''"> <if test="name != null and name != ''">
and concat(IFNULL(fd.customerName and concat(IFNULL(fd.customerName
, '') , '')
, ifnull(fd.contractNo , ifnull(fd.contractNo
, '')) LIKE concat('%' , '')) LIKE concat('%'
, #{name} , #{name}
, '%') , '%')
</if> </if>
</where> </where>
</select> </select>
<select id="noOutVehRecPageList" <select id="noOutVehRecPageList"
resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectReceivablesDetailedWCKCLRKVo"> resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectReceivablesDetailedWCKCLRKVo">
SELECT SELECT ferd.sid,
ferd.sid, fcc.`useOrgSid`,
fcc.`useOrgSid`, fcc.`staffDeptName`,
fcc.`staffDeptName`, fcc.staffUserSid AS staffSid,
fcc.staffUserSid AS staffSid, fcc.`staffName`,
fcc.`staffName`, ferd.`contractNo`,
ferd.`contractNo`, ferd.`payType`,
ferd.`payType`, ferd.`customerName`,
ferd.`customerName`, ferd.`customerPhone`,
ferd.`customerPhone`, ferd.`VIN` AS vinNo,
ferd.`VIN` AS vinNo, ferd.`receivablesName`,
ferd.`receivablesName`, ferd.`auditDate`,
ferd.`auditDate`, ferd.`subscriptionMoney`,
ferd.`subscriptionMoney`, ferd.balance AS reveivableMoney,
ferd.balance AS reveivableMoney, ferd.kxState AS state
ferd.kxState AS state FROM fin_selected_receivables_detailed ferd
FROM LEFT JOIN fin_collection_confirmation fcc
fin_selected_receivables_detailed ferd ON ferd.`collSid` = fcc.`sid`
LEFT JOIN fin_collection_confirmation fcc LEFT JOIN anrui_base.`base_vehicle` bv
ON ferd.`collSid` = fcc.`sid` ON RIGHT(ferd.`VIN`, 8) = RIGHT(bv.`vinNo`, 8) AND fcc.`useOrgSid` = bv.`createOrgSid`
LEFT JOIN anrui_base.`base_vehicle` bv
ON RIGHT(ferd.`VIN`,8) = RIGHT(bv.`vinNo`,8) AND fcc.`useOrgSid` = bv.`createOrgSid`
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
@ -354,6 +368,9 @@
<select id="selectBalanceByReceivedSid" <select id="selectBalanceByReceivedSid"
resultType="java.lang.String"> resultType="java.lang.String">
select ifnull(sum(balance),0) from fin_selected_receivables_detailed where receivablesSid = #{receivablesSid} and (auditState =1 or auditState = 3) select ifnull(sum(balance), 0)
from fin_selected_receivables_detailed
where receivablesSid = #{receivablesSid}
and (auditState = 1 or auditState = 3)
</select> </select>
</mapper> </mapper>

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsInfoVo.java
View File

@ -162,7 +162,4 @@ public class AdvanceArrearsInfoVo implements Vo {
@ApiModelProperty("是否是自营非担保") @ApiModelProperty("是否是自营非担保")
private boolean finType; private boolean finType;
private String modelOrgPath;
} }

Write Preview
Loading…
Cancel
Save