Browse Source

Merge remote-tracking branch 'origin/master'

master
dimengzhe 2 years ago
parent
commit
75f10f2ba5
  1. 18
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml
  2. 7
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  3. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyMapper.xml
  4. 21
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java
  5. 347
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
  6. 10
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java
  7. 15
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java

18
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml

@ -201,21 +201,27 @@
<select id="jyddkydjListPage"
resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationJYDDKYDJVo">
SELECT
fcc.sid,
fsrd.sid,
fcc.useOrgSid,
fcc.staffDeptName,
fcc.staffUserSid as staffSid,
fcc.staffUserSid AS staffSid,
fcc.staffName,
fcc.`billNo`,
fcc.`payerName`,
bd.`draweeMobile` as phone,
fsrd.`customerName`,
bd.`draweeMobile` AS phone,
fcc.collectionDate,
fcc.collectionMoney,
fcc.balance
(
fsrd.`subscriptionMoney` - COALESCE(SUM(ffc.`thisUseMoney`), 0)
) AS balance
FROM
fin_collection_confirmation fcc
fin_selected_receivables_detailed fsrd
LEFT JOIN fin_collection_confirmation fcc
ON fcc.`sid` = fsrd.`collSid`
LEFT JOIN anrui_buscenter.`bus_deposit` bd
ON fcc.`busSid` = bd.`billSid`
LEFT JOIN `fin_funds_carried_forward_veh` ffc
ON ffc.`busSid` = fsrd.`sid`
<where>
${ew.sqlSegment}
</where>

7
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@ -2782,15 +2782,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
qw.apply(StringUtils.isNotEmpty(collectionStartDate), "date_format (fcc.collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(collectionEndDate), "date_format (fcc.collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')"
);
String collectionSmallMoney = query.getCollectionSmallMoney();
String collectionBigMoney = query.getCollectionBigMoney();
if (StringUtils.isNotBlank(collectionSmallMoney) && StringUtils.isNotBlank(collectionBigMoney)) {
qw.between("fcc.balance", collectionSmallMoney, collectionBigMoney);
}
if (StringUtils.isNotBlank(query.getName())) {
qw.and(wrapper -> wrapper.like("fcc.billNo", query.getName()).or().like("fcc.staffDeptName", query.getName()).or().like("fcc.staffName", query.getName()).or().like("fcc.payerName", query.getName()).or().like("bd.draweeMobile", query.getName()));
}
qw.isNotNull("fcc.busSid");
qw.groupBy("fsrd.sid");
qw.having("balance >=", query.getCollectionSmallMoney()).having("balance <=", query.getCollectionBigMoney());
IPage<FinCollectionConfirmation> page = PagerUtil.queryToPage(pq);
IPage<FinCollectionConfirmationJYDDKYDJVo> pagging = baseMapper.jyddkydjListPage(page, qw);
List<FinCollectionConfirmationJYDDKYDJVo> records = pagging.getRecords();

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyMapper.xml

@ -13,7 +13,7 @@
fa.`createByName`,
fa.`createTime`,
fa.`source`,
SUM(fv.`thisUseMoney`) AS carryForwardMoney,
COALESCE(SUM(fv.`thisUseMoney`), 0) AS carryForwardMoney,
fa.`remarks`,
fa.pdfPath AS downloadUrl,
fa.pdfPath AS tzsqPath

21
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java

@ -40,6 +40,8 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmation;
import com.yxt.anrui.fin.api.finfundscarriedforwardapply.*;
import com.yxt.anrui.fin.api.finfundscarriedforwardapply.flowable.FinFundsApplyNodeQuery;
@ -140,6 +142,8 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
@Autowired
private FlowTaskFeign flowTaskFeign;
@Autowired
private CrmCustomerTempFeign crmCustomerTempFeign;
@Autowired
private OtherReceivableBillService otherReceivableBillService;
@Autowired
private com.yxt.anrui.portal.api.flow.FlowableFeign flowableFeignPro;
@ -596,7 +600,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos1 = data.getYxysFinFundsCarriedForwardYXYSKXVos();
String pdfPath = createPdf(sid, finFundsCarriedForwardApply.getCreateByName()).getData();
baseMapper.updatePathBySid(pdfPath, sid);
updateYeBySid(sid);
for (AppFinFundsCarriedForwardYXYSKXDto yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid());
if (finUncollectedReceivablesDetailed != null) {
@ -615,7 +618,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
} else {//贷款
BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), finSelectedReceivablesDetailed.getUseOrgSid()).getData();
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finSelectedReceivablesDetailed.getContractNo(), baseVehicle.getSid()).getData();
custNo = finSelectedReceivablesDetailed.getContractNo() + busSalesOrderVehicle.getTemporaryNo();
custNo = busSalesOrderVehicle.getTemporaryNo();
}
jzCustNos.add(custNo);
}
@ -707,7 +710,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
}
UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo));
updateYeBySid(businessSid);
FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(businessSid).getData();
List<AppFinFundsCarriedForwardYXYSKXVo> yxyskxVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
for (AppFinFundsCarriedForwardYXYSKXVo appFinFundsCarriedForwardYXYSKXVo : yxyskxVos) {
@ -864,7 +866,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
Map<String, Object> map = BeanUtil.beanToMap(ufVo);
//更新业务中的流程相关的参数
updateFlowFiled(map);
updateYeBySid(businessSid);
FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(businessSid).getData();
List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())) {
@ -919,7 +920,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
return rb.setMsg(resultBean.getMsg());
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
updateYeBySid(query.getBusinessSid());
FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(query.getBusinessSid()).getData();
List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())) {
@ -961,7 +961,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
}
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map);
updateYeBySid(query.getBusinessSid());
FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(query.getBusinessSid()).getData();
List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())) {
@ -985,7 +984,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
}
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map);
updateYeBySid(query.getBusinessSid());
FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(query.getBusinessSid()).getData();
List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())) {
@ -1049,10 +1047,9 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
if ("简易订单订金".equals(finFundsCarriedForwardApply.getSource())) {
List<FinFundsCarriedForwardVehDetailsVo> finFundsCarriedForwardVehDetailsVos1 = finFundsCarriedForwardVehService.fetchByMainSidAndGroupCustPhone(finFundsCarriedForwardApply.getSid());
for (FinFundsCarriedForwardVehDetailsVo finFundsCarriedForwardVehDetailsVo : finFundsCarriedForwardVehDetailsVos1) {
String customerName = finFundsCarriedForwardVehDetailsVo.getCustomerName();
String draweeMobile = finFundsCarriedForwardVehDetailsVo.getDraweeMobile();
String custNo = getPrefix(finFundsCarriedForwardApply.getStaffSid(), customerName, draweeMobile);
jzCustNos.add(custNo);
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(finFundsCarriedForwardVehDetailsVo.getBusSid());
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finSelectedReceivablesDetailed.getCustomerSid()).getData();
jzCustNos.add(crmCustomerTempVo.getCustomerNo());
}
jzCustNos = jzCustNos.stream().distinct().collect(Collectors.toList());
for (String jzCustNo : jzCustNos) {
@ -1101,7 +1098,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
} else {//贷款
BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), finSelectedReceivablesDetailed.getUseOrgSid()).getData();
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finSelectedReceivablesDetailed.getContractNo(), baseVehicle.getSid()).getData();
custNo = finSelectedReceivablesDetailed.getContractNo() + busSalesOrderVehicle.getTemporaryNo();
custNo = busSalesOrderVehicle.getTemporaryNo();
}
jzCustNos.add(custNo);
}

347
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml

@ -25,51 +25,51 @@
<select id="getPaymentDetailsList"
resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo">
SELECT distinct furd.sid,
furd.contractNo AS contractId,
furd.receivablesName AS projectName,
furd.customerPhone AS mobile,
furd.customerName AS `name`,
furd.customerSid,
furd.useOrgSid,
cast((furd.`reveivableMoney` - COALESCE(df.dbalance, 0)) AS DECIMAL (10, 2) ) AS receivable,
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,
CURRENT_DATE() as confirmDate,
furd.purchaseSystemSid
furd.contractNo AS contractId,
furd.receivablesName AS projectName,
furd.customerPhone AS mobile,
furd.customerName AS `name`,
furd.customerSid,
furd.useOrgSid,
cast((furd.`reveivableMoney` - COALESCE(df.dbalance, 0)) AS DECIMAL (10, 2) ) AS receivable,
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,
CURRENT_DATE() as confirmDate,
furd.purchaseSystemSid
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`,
cast((sum(d.`subscriptionMoney`) - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL (10, 2)) 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`
left join anrui_buscenter.bus_sales_order_vehicle bv on bv.sid = furd.busVinSid
LEFT JOIN (
SELECT d.sid,
d.receivablesSid,
d.`collSid`,
cast((sum(d.`subscriptionMoney`) - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL (10, 2)) 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}
<if test="name != null and name != ''">
and concat(IFNULL(furd.customerName
, '')
, ifnull(furd.contractNo
, '')
, ifnull(bv.linkNo
, '')) LIKE concat('%'
, #{name}
, '%')
, '')
, ifnull(furd.contractNo
, '')
, ifnull(bv.linkNo
, '')) LIKE concat('%'
, #{name}
, '%')
</if>
and length(furd.busVinSid)
>0
>0
</where>
having receivable>0
order by furd.contractNo desc
@ -78,32 +78,32 @@
<select id="getPaymentList"
resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo">
SELECT sid,
contractNo AS contractId,
receivablesName AS projectName,
customerPhone AS mobile,
customerName AS `name`,
currentReceivableMoney AS receivable,
contractSid,
VIN AS vin,
furd.busVinSid,
furd.payType,
furd.payTypeKey,
furd.customerSid,
furd.useOrgSid,
furd.reveivableMoney
contractNo AS contractId,
receivablesName AS projectName,
customerPhone AS mobile,
customerName AS `name`,
currentReceivableMoney AS receivable,
contractSid,
VIN AS vin,
furd.busVinSid,
furd.payType,
furd.payTypeKey,
furd.customerSid,
furd.useOrgSid,
furd.reveivableMoney
FROM fin_uncollected_receivables_detailed furd
<where>
${ew.sqlSegment}
<if test="name != null and name != ''">
and concat(IFNULL(furd.customerName
, '')
, ifnull(furd.contractNo
, '')) LIKE concat('%'
, #{name}
, '%')
, '')
, ifnull(furd.contractNo
, '')) LIKE concat('%'
, #{name}
, '%')
</if>
and length(furd.busVinSid)
>0
>0
</where>
order by furd.contractNo desc
</select>
@ -155,7 +155,7 @@
resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo">
SELECT fsrd.subscriptionMoney
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
</select>
@ -171,7 +171,7 @@
resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo">
select 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}
and fud.busVinSid = #{busVinSid}
and fd.auditState = #{state}
@ -285,8 +285,8 @@
<select id="selectByVinSid" resultType="java.lang.String">
select cast((sum(fd.`subscriptionMoney`) - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL(10, 2)) AS dbalance
from fin_selected_receivables_detailed fd
left join fin_uncollected_receivables_detailed ff on ff.sid = fd.receivablesSid
LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = fd.`sid`
left join fin_uncollected_receivables_detailed ff on ff.sid = fd.receivablesSid
LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = fd.`sid`
where ff.busVinSid = #{busVinSid}
and fd.auditState = 3
</select>
@ -303,8 +303,7 @@
FROM fin_selected_receivables_detailed
WHERE receivablesSid = #{ysSid}
AND auditState = 3
ORDER BY createTime DESC
LIMIT 1
ORDER BY createTime DESC LIMIT 1
</select>
<select id="selectUnSelectList" resultType="java.lang.String">
@ -319,81 +318,93 @@
<select id="selectPageList"
resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectReceivablesDetailedVo">
select fd.sid,
fd.receivablesSid,
fd.contractNo,
fd.customerSid,
fd.customerName,
fd.customerPhone,
fd.receivablesName,
fd.currentReceivableMoney,
furd.busVinSid,
furd.payType,
furd.payTypeKey,
fd.subscriptionMoney,
fd.useOrgSid,
fd.subscriptionDate
fd.receivablesSid,
fd.contractNo,
fd.customerSid,
fd.customerName,
fd.customerPhone,
fd.receivablesName,
fd.currentReceivableMoney,
furd.busVinSid,
furd.payType,
furd.payTypeKey,
fd.subscriptionMoney,
fd.useOrgSid,
fd.subscriptionDate
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>
${ew.sqlSegment}
and fd.receivablesName != '订金'
and fd.auditState = 3
and fd.receivablesName != '订金'
and fd.auditState = 3
<if test="name != null and name != ''">
and concat(IFNULL(fd.customerName
, '')
, ifnull(fd.contractNo
, '')) LIKE concat('%'
, #{name}
, '%')
, '')
, ifnull(fd.contractNo
, '')) LIKE concat('%'
, #{name}
, '%')
</if>
</where>
</select>
<select id="noOutVehRecPageList"
resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectReceivablesDetailedWCKCLRKVo">
SELECT ferd.sid,
fcc.`useOrgSid`,
fcc.`staffDeptName`,
fcc.staffUserSid AS staffSid,
fcc.`staffName`,
ferd.`contractNo`,
ferd.`payType`,
ferd.`customerName`,
ferd.`customerPhone`,
ferd.`VIN` AS vinNo,
ferd.`receivablesName`,
ferd.`auditDate`,
ferd.`subscriptionMoney`,
ferd.balance AS reveivableMoney,
ferd.kxState AS state
FROM fin_selected_receivables_detailed ferd
LEFT JOIN fin_collection_confirmation fcc
ON ferd.`collSid` = fcc.`sid`
LEFT JOIN anrui_base.`base_vehicle` bv
ON RIGHT(ferd.`VIN`, 8) = RIGHT(bv.`vinNo`, 8)
AND fcc.`useOrgSid` = bv.`createOrgSid`
SELECT
ferd.sid,
fcc.`useOrgSid`,
fcc.`staffDeptName`,
fcc.staffUserSid AS staffSid,
fcc.`staffName`,
ferd.`contractNo`,
ferd.`payType`,
ferd.`customerName`,
ferd.`customerPhone`,
ferd.`VIN` AS vinNo,
ferd.`receivablesName`,
ferd.`auditDate`,
ferd.`subscriptionMoney`,
(
ferd.`subscriptionMoney` - COALESCE(SUM(ffc.`thisUseMoney`), 0)
) AS reveivableMoney,
ferd.kxState AS state
FROM
fin_selected_receivables_detailed ferd
LEFT JOIN fin_collection_confirmation fcc
ON ferd.`collSid` = fcc.`sid`
LEFT JOIN anrui_base.`base_vehicle` bv
ON RIGHT(ferd.`VIN`, 8) = RIGHT(bv.`vinNo`, 8)
AND fcc.`useOrgSid` = bv.`createOrgSid`
LEFT JOIN `fin_funds_carried_forward_veh` ffc
ON ffc.`busSid` = ferd.`sid`
UNION
SELECT ferd.sid,
ffcfa.useOrgSid,
ffcfa.saleDeptName AS staffDeptName,
ffcfa.staffSid,
ffcfa.`staffName`,
ferd.`contractNo`,
ferd.`payType`,
ferd.`customerName`,
ferd.`customerPhone`,
ferd.`VIN` AS vinNo,
ferd.`receivablesName`,
ferd.`auditDate`,
ferd.`subscriptionMoney`,
ferd.balance AS reveivableMoney,
ferd.kxState AS state
FROM fin_selected_receivables_detailed ferd
LEFT JOIN fin_funds_carried_forward_apply ffcfa
ON ferd.`collSid` = ffcfa.`sid`
LEFT JOIN anrui_base.`base_vehicle` bv
ON RIGHT(ferd.`VIN`, 8) = RIGHT(bv.`vinNo`, 8)
AND ffcfa.`useOrgSid` = bv.`createOrgSid`
SELECT
ferd.sid,
ffcfa.useOrgSid,
ffcfa.saleDeptName AS staffDeptName,
ffcfa.staffSid,
ffcfa.`staffName`,
ferd.`contractNo`,
ferd.`payType`,
ferd.`customerName`,
ferd.`customerPhone`,
ferd.`VIN` AS vinNo,
ferd.`receivablesName`,
ferd.`auditDate`,
ferd.`subscriptionMoney`,
(
ferd.`subscriptionMoney` - COALESCE(SUM(ffc.`thisUseMoney`), 0)
) AS reveivableMoney,
ferd.kxState AS state
FROM
fin_selected_receivables_detailed ferd
LEFT JOIN fin_funds_carried_forward_apply ffcfa
ON ferd.`collSid` = ffcfa.`sid`
LEFT JOIN anrui_base.`base_vehicle` bv
ON RIGHT(ferd.`VIN`, 8) = RIGHT(bv.`vinNo`, 8)
AND ffcfa.`useOrgSid` = bv.`createOrgSid`
LEFT JOIN `fin_funds_carried_forward_veh` ffc
ON ffc.`busSid` = ferd.`sid`
<where>
${ew.sqlSegment}
</where>
@ -417,55 +428,55 @@
<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,
cast((furd.`reveivableMoney` - COALESCE(df.dbalance, 0)) AS DECIMAL(10, 2)) AS dbalance,
if(fd.currentReceivableMoney &lt;= 0, 0,
if(cast((fd.currentReceivableMoney - fd.subscriptionMoney) AS DECIMAL(10, 2)) &lt;= 0, 0,
cast((fd.currentReceivableMoney - fd.subscriptionMoney) AS DECIMAL(10, 2)))) 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
fd.receivablesSid,
fd.contractNo,
fd.customerSid,
fd.customerName,
fd.customerPhone,
fd.receivablesName,
fd.currentReceivableMoney,
cast((furd.`reveivableMoney` - COALESCE(df.dbalance, 0)) AS DECIMAL(10, 2)) AS dbalance,
if(fd.currentReceivableMoney &lt;= 0, 0,
if(cast((fd.currentReceivableMoney - fd.subscriptionMoney) AS DECIMAL(10, 2)) &lt;= 0, 0,
cast((fd.currentReceivableMoney - fd.subscriptionMoney) AS DECIMAL(10, 2)))) 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`,
cast((sum(d.`subscriptionMoney`) - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL(10, 2)) 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`
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`,
cast((sum(d.`subscriptionMoney`) - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL(10, 2)) 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
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}
, '%')
, '')
, ifnull(fd.contractNo
, '')
, ifnull(bv.linkNo
, '')) LIKE concat('%'
, #{name}
, '%')
</if>
</where>
having dbalance &lt;= 0

10
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java

@ -585,23 +585,17 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
if (StringUtils.isNotBlank(query.getVinNo())) {
qw.like("ferd.VIN", query.getVinNo());
}
String balanceSmallMoney = query.getBalanceSmallMoney();
String balanceBigMoney = query.getBalanceBigMoney();
if (StringUtils.isNotBlank(balanceSmallMoney) && StringUtils.isNotBlank(balanceBigMoney)) {
qw.between("ferd.balance", balanceSmallMoney, balanceBigMoney);
}
if (StringUtils.isNotBlank(query.getName())) {
qw.and(wrapper -> wrapper.like("ferd.contractNo", query.getName()).or().like("fcc.staffDeptName", query.getName()).or().like("ffcfa.saleDeptName",query.getName()).or().like("ffcfa.staffName",query.getName()).or().like("fcc.staffName", query.getName()).or().like("ferd.customerName", query.getName()).or().like("ferd.customerPhone", query.getName()).or().like("ferd.VIN", query.getName()));
}
qw.groupBy("ferd.sid");
qw.having("reveivableMoney >=",query.getBalanceSmallMoney()).having("reveivableMoney <=",query.getBalanceBigMoney());
IPage<FinSelectedReceivablesDetailed> page = PagerUtil.queryToPage(pagerQuery);
IPage<FinSelectReceivablesDetailedWCKCLRKVo> pagging = baseMapper.noOutVehRecPageList(page, qw);
for (FinSelectReceivablesDetailedWCKCLRKVo record : pagging.getRecords()) {
String useOrgSid = record.getUseOrgSid();
String useOrgName = sysOrganizationFeign.fetchBySid(useOrgSid).getData().getName();
record.setUseOrgName(useOrgName);
if (StringUtils.isBlank(record.getReveivableMoney())){
record.setReveivableMoney(record.getSubscriptionMoney());
}
}
PagerVo<FinSelectReceivablesDetailedWCKCLRKVo> p = PagerUtil.pageToVo(pagging, null);
return p;

15
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java

@ -399,16 +399,10 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
List<String> idCardImages = new ArrayList<>();
List<String> comFkFiles = new ArrayList<>();
for (CommonAppendixVo commonAppendixVo : data1) {
String filePath = commonAppendixVo.getFilePath();
String urlPrefix = fileUploadComponent.getUrlPrefix();
filePath = urlPrefix + filePath;
idCardImages.add(filePath);
idCardImages.add(commonAppendixVo.getFilePath());
}
for (CommonAppendixVo commonAppendixVo : data2) {
String filePath = commonAppendixVo.getFilePath();
String urlPrefix = fileUploadComponent.getUrlPrefix();
filePath = urlPrefix + filePath;
comFkFiles.add(filePath);
comFkFiles.add(commonAppendixVo.getFilePath());
}
List<LoanPreloanCreditPeoDetailsVo> loanPreloanCreditPeoDetailsVos = loanPreloanCreditPeoService.fetchByMainSid(sid);
List<String> idCardPeoImages = new ArrayList<>();
@ -418,10 +412,7 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
commonAppendixSelectQuery3.setAttachType(LoanFileTypeEnum.FileTypeEnum.ID_CARD.getCode());
List<CommonAppendixVo> data3 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery3).getData();
for (CommonAppendixVo commonAppendixVo : data3) {
String filePath = commonAppendixVo.getFilePath();
String urlPrefix = fileUploadComponent.getUrlPrefix();
filePath = urlPrefix + filePath;
idCardPeoImages.add(filePath);
idCardPeoImages.add(commonAppendixVo.getFilePath());
}
loanPreloanCreditPeoDetailsVo.setIdCardImages(idCardPeoImages);
}

Loading…
Cancel
Save