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" <select id="jyddkydjListPage"
resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationJYDDKYDJVo"> resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationJYDDKYDJVo">
SELECT SELECT
fcc.sid, fsrd.sid,
fcc.useOrgSid, fcc.useOrgSid,
fcc.staffDeptName, fcc.staffDeptName,
fcc.staffUserSid as staffSid, fcc.staffUserSid AS staffSid,
fcc.staffName, fcc.staffName,
fcc.`billNo`, fcc.`billNo`,
fcc.`payerName`, fsrd.`customerName`,
bd.`draweeMobile` as phone, bd.`draweeMobile` AS phone,
fcc.collectionDate, fcc.collectionDate,
fcc.collectionMoney, fcc.collectionMoney,
fcc.balance (
fsrd.`subscriptionMoney` - COALESCE(SUM(ffc.`thisUseMoney`), 0)
) AS balance
FROM 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 LEFT JOIN anrui_buscenter.`bus_deposit` bd
ON fcc.`busSid` = bd.`billSid` ON fcc.`busSid` = bd.`billSid`
LEFT JOIN `fin_funds_carried_forward_veh` ffc
ON ffc.`busSid` = fsrd.`sid`
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </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')"). 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')" 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())) { 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.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.isNotNull("fcc.busSid");
qw.groupBy("fsrd.sid");
qw.having("balance >=", query.getCollectionSmallMoney()).having("balance <=", query.getCollectionBigMoney());
IPage<FinCollectionConfirmation> page = PagerUtil.queryToPage(pq); IPage<FinCollectionConfirmation> page = PagerUtil.queryToPage(pq);
IPage<FinCollectionConfirmationJYDDKYDJVo> pagging = baseMapper.jyddkydjListPage(page, qw); IPage<FinCollectionConfirmationJYDDKYDJVo> pagging = baseMapper.jyddkydjListPage(page, qw);
List<FinCollectionConfirmationJYDDKYDJVo> records = pagging.getRecords(); 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.`createByName`,
fa.`createTime`, fa.`createTime`,
fa.`source`, fa.`source`,
SUM(fv.`thisUseMoney`) AS carryForwardMoney, COALESCE(SUM(fv.`thisUseMoney`), 0) AS carryForwardMoney,
fa.`remarks`, fa.`remarks`,
fa.pdfPath AS downloadUrl, fa.pdfPath AS downloadUrl,
fa.pdfPath AS tzsqPath 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.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; 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.fincollectionconfirmation.FinCollectionConfirmation;
import com.yxt.anrui.fin.api.finfundscarriedforwardapply.*; import com.yxt.anrui.fin.api.finfundscarriedforwardapply.*;
import com.yxt.anrui.fin.api.finfundscarriedforwardapply.flowable.FinFundsApplyNodeQuery; import com.yxt.anrui.fin.api.finfundscarriedforwardapply.flowable.FinFundsApplyNodeQuery;
@ -140,6 +142,8 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
@Autowired @Autowired
private FlowTaskFeign flowTaskFeign; private FlowTaskFeign flowTaskFeign;
@Autowired @Autowired
private CrmCustomerTempFeign crmCustomerTempFeign;
@Autowired
private OtherReceivableBillService otherReceivableBillService; private OtherReceivableBillService otherReceivableBillService;
@Autowired @Autowired
private com.yxt.anrui.portal.api.flow.FlowableFeign flowableFeignPro; private com.yxt.anrui.portal.api.flow.FlowableFeign flowableFeignPro;
@ -596,7 +600,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos1 = data.getYxysFinFundsCarriedForwardYXYSKXVos(); List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos1 = data.getYxysFinFundsCarriedForwardYXYSKXVos();
String pdfPath = createPdf(sid, finFundsCarriedForwardApply.getCreateByName()).getData(); String pdfPath = createPdf(sid, finFundsCarriedForwardApply.getCreateByName()).getData();
baseMapper.updatePathBySid(pdfPath, sid); baseMapper.updatePathBySid(pdfPath, sid);
updateYeBySid(sid);
for (AppFinFundsCarriedForwardYXYSKXDto yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) { for (AppFinFundsCarriedForwardYXYSKXDto yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid()); FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid());
if (finUncollectedReceivablesDetailed != null) { if (finUncollectedReceivablesDetailed != null) {
@ -615,7 +618,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
} else {//贷款 } else {//贷款
BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), finSelectedReceivablesDetailed.getUseOrgSid()).getData(); BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), finSelectedReceivablesDetailed.getUseOrgSid()).getData();
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finSelectedReceivablesDetailed.getContractNo(), baseVehicle.getSid()).getData(); BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finSelectedReceivablesDetailed.getContractNo(), baseVehicle.getSid()).getData();
custNo = finSelectedReceivablesDetailed.getContractNo() + busSalesOrderVehicle.getTemporaryNo(); custNo = busSalesOrderVehicle.getTemporaryNo();
} }
jzCustNos.add(custNo); jzCustNos.add(custNo);
} }
@ -707,7 +710,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
} }
UpdateFlowFieldVo ufVo = voResultBean.getData(); UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo)); updateFlowFiled(BeanUtil.beanToMap(ufVo));
updateYeBySid(businessSid);
FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(businessSid).getData(); FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(businessSid).getData();
List<AppFinFundsCarriedForwardYXYSKXVo> yxyskxVos = data.getYxysFinFundsCarriedForwardYXYSKXVos(); List<AppFinFundsCarriedForwardYXYSKXVo> yxyskxVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
for (AppFinFundsCarriedForwardYXYSKXVo appFinFundsCarriedForwardYXYSKXVo : yxyskxVos) { for (AppFinFundsCarriedForwardYXYSKXVo appFinFundsCarriedForwardYXYSKXVo : yxyskxVos) {
@ -864,7 +866,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
Map<String, Object> map = BeanUtil.beanToMap(ufVo); Map<String, Object> map = BeanUtil.beanToMap(ufVo);
//更新业务中的流程相关的参数 //更新业务中的流程相关的参数
updateFlowFiled(map); updateFlowFiled(map);
updateYeBySid(businessSid);
FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(businessSid).getData(); FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(businessSid).getData();
List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos(); List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())) { if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())) {
@ -919,7 +920,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
return rb.setMsg(resultBean.getMsg()); return rb.setMsg(resultBean.getMsg());
} }
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
updateYeBySid(query.getBusinessSid());
FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(query.getBusinessSid()).getData(); FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(query.getBusinessSid()).getData();
List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos(); List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())) { if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())) {
@ -961,7 +961,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
} }
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData()); Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map); updateFlowFiled(map);
updateYeBySid(query.getBusinessSid());
FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(query.getBusinessSid()).getData(); FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(query.getBusinessSid()).getData();
List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos(); List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())) { if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())) {
@ -985,7 +984,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
} }
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData()); Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map); updateFlowFiled(map);
updateYeBySid(query.getBusinessSid());
FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(query.getBusinessSid()).getData(); FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(query.getBusinessSid()).getData();
List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos(); List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())) { if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())) {
@ -1049,10 +1047,9 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
if ("简易订单订金".equals(finFundsCarriedForwardApply.getSource())) { if ("简易订单订金".equals(finFundsCarriedForwardApply.getSource())) {
List<FinFundsCarriedForwardVehDetailsVo> finFundsCarriedForwardVehDetailsVos1 = finFundsCarriedForwardVehService.fetchByMainSidAndGroupCustPhone(finFundsCarriedForwardApply.getSid()); List<FinFundsCarriedForwardVehDetailsVo> finFundsCarriedForwardVehDetailsVos1 = finFundsCarriedForwardVehService.fetchByMainSidAndGroupCustPhone(finFundsCarriedForwardApply.getSid());
for (FinFundsCarriedForwardVehDetailsVo finFundsCarriedForwardVehDetailsVo : finFundsCarriedForwardVehDetailsVos1) { for (FinFundsCarriedForwardVehDetailsVo finFundsCarriedForwardVehDetailsVo : finFundsCarriedForwardVehDetailsVos1) {
String customerName = finFundsCarriedForwardVehDetailsVo.getCustomerName(); FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(finFundsCarriedForwardVehDetailsVo.getBusSid());
String draweeMobile = finFundsCarriedForwardVehDetailsVo.getDraweeMobile(); CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finSelectedReceivablesDetailed.getCustomerSid()).getData();
String custNo = getPrefix(finFundsCarriedForwardApply.getStaffSid(), customerName, draweeMobile); jzCustNos.add(crmCustomerTempVo.getCustomerNo());
jzCustNos.add(custNo);
} }
jzCustNos = jzCustNos.stream().distinct().collect(Collectors.toList()); jzCustNos = jzCustNos.stream().distinct().collect(Collectors.toList());
for (String jzCustNo : jzCustNos) { for (String jzCustNo : jzCustNos) {
@ -1101,7 +1098,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
} else {//贷款 } else {//贷款
BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), finSelectedReceivablesDetailed.getUseOrgSid()).getData(); BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), finSelectedReceivablesDetailed.getUseOrgSid()).getData();
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finSelectedReceivablesDetailed.getContractNo(), baseVehicle.getSid()).getData(); BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finSelectedReceivablesDetailed.getContractNo(), baseVehicle.getSid()).getData();
custNo = finSelectedReceivablesDetailed.getContractNo() + busSalesOrderVehicle.getTemporaryNo(); custNo = busSalesOrderVehicle.getTemporaryNo();
} }
jzCustNos.add(custNo); 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" <select id="getPaymentDetailsList"
resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo"> resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo">
SELECT distinct furd.sid, SELECT distinct furd.sid,
furd.contractNo AS contractId, furd.contractNo AS contractId,
furd.receivablesName AS projectName, furd.receivablesName AS projectName,
furd.customerPhone AS mobile, furd.customerPhone AS mobile,
furd.customerName AS `name`, furd.customerName AS `name`,
furd.customerSid, furd.customerSid,
furd.useOrgSid, furd.useOrgSid,
cast((furd.`reveivableMoney` - COALESCE(df.dbalance, 0)) AS DECIMAL (10, 2) ) AS receivable, cast((furd.`reveivableMoney` - COALESCE(df.dbalance, 0)) AS DECIMAL (10, 2) ) AS receivable,
furd.contractSid, furd.contractSid,
if(bv.linkNo is null or LENGTH(trim(bv.linkNo)) &lt; 1, if(bv.linkNo is null or LENGTH(trim(bv.linkNo)) &lt; 1,
if(furd.payTypeKey = 2, RIGHT(bv.temporaryNo, 2), bv.temporaryNo), if(furd.payTypeKey = 2, RIGHT(bv.temporaryNo, 2), bv.temporaryNo),
RIGHT(bv.linkNo, 8)) as vin, RIGHT(bv.linkNo, 8)) as vin,
furd.busVinSid, furd.busVinSid,
furd.payType, furd.payType,
furd.payTypeKey, furd.payTypeKey,
0 as subscribedOf, 0 as subscribedOf,
furd.sid as receivablesSid, furd.sid as receivablesSid,
CURRENT_DATE() as confirmDate, CURRENT_DATE() as confirmDate,
furd.purchaseSystemSid furd.purchaseSystemSid
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 anrui_buscenter.bus_sales_order_vehicle bv on bv.sid = furd.busVinSid
LEFT JOIN ( LEFT JOIN (
SELECT d.sid, SELECT d.sid,
d.receivablesSid, d.receivablesSid,
d.`collSid`, d.`collSid`,
cast((sum(d.`subscriptionMoney`) - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL (10, 2)) AS dbalance cast((sum(d.`subscriptionMoney`) - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL (10, 2)) AS dbalance
FROM fin_selected_receivables_detailed d FROM fin_selected_receivables_detailed d
LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = d.`sid` LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = d.`sid`
where d.auditState = 1 where d.auditState = 1
or d.auditState = 3 or d.auditState = 3
GROUP BY d.`receivablesSid` GROUP BY d.`receivablesSid`
) df ON df.receivablesSid = furd.`sid` ) df ON df.receivablesSid = 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
, '') , '')
, ifnull(bv.linkNo , ifnull(bv.linkNo
, '')) LIKE concat('%' , '')) LIKE concat('%'
, #{name} , #{name}
, '%') , '%')
</if> </if>
and length(furd.busVinSid) and length(furd.busVinSid)
>0 >0
</where> </where>
having receivable>0 having receivable>0
order by furd.contractNo desc order by furd.contractNo desc
@ -78,32 +78,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>
@ -155,7 +155,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>
@ -171,7 +171,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}
@ -285,8 +285,8 @@
<select id="selectByVinSid" resultType="java.lang.String"> <select id="selectByVinSid" resultType="java.lang.String">
select cast((sum(fd.`subscriptionMoney`) - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL(10, 2)) AS dbalance select cast((sum(fd.`subscriptionMoney`) - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL(10, 2)) AS dbalance
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
LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = fd.`sid` LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = fd.`sid`
where ff.busVinSid = #{busVinSid} where ff.busVinSid = #{busVinSid}
and fd.auditState = 3 and fd.auditState = 3
</select> </select>
@ -303,8 +303,7 @@
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 ORDER BY createTime DESC LIMIT 1
LIMIT 1
</select> </select>
<select id="selectUnSelectList" resultType="java.lang.String"> <select id="selectUnSelectList" resultType="java.lang.String">
@ -319,81 +318,93 @@
<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} ${ew.sqlSegment}
and fd.receivablesName != '订金' and fd.receivablesName != '订金'
and fd.auditState = 3 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 ferd.sid, SELECT
fcc.`useOrgSid`, ferd.sid,
fcc.`staffDeptName`, fcc.`useOrgSid`,
fcc.staffUserSid AS staffSid, fcc.`staffDeptName`,
fcc.`staffName`, fcc.staffUserSid AS staffSid,
ferd.`contractNo`, fcc.`staffName`,
ferd.`payType`, ferd.`contractNo`,
ferd.`customerName`, ferd.`payType`,
ferd.`customerPhone`, ferd.`customerName`,
ferd.`VIN` AS vinNo, ferd.`customerPhone`,
ferd.`receivablesName`, ferd.`VIN` AS vinNo,
ferd.`auditDate`, ferd.`receivablesName`,
ferd.`subscriptionMoney`, ferd.`auditDate`,
ferd.balance AS reveivableMoney, ferd.`subscriptionMoney`,
ferd.kxState AS state (
FROM fin_selected_receivables_detailed ferd ferd.`subscriptionMoney` - COALESCE(SUM(ffc.`thisUseMoney`), 0)
LEFT JOIN fin_collection_confirmation fcc ) AS reveivableMoney,
ON ferd.`collSid` = fcc.`sid` ferd.kxState AS state
LEFT JOIN anrui_base.`base_vehicle` bv FROM
ON RIGHT(ferd.`VIN`, 8) = RIGHT(bv.`vinNo`, 8) fin_selected_receivables_detailed ferd
AND fcc.`useOrgSid` = bv.`createOrgSid` 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 UNION
SELECT ferd.sid, SELECT
ffcfa.useOrgSid, ferd.sid,
ffcfa.saleDeptName AS staffDeptName, ffcfa.useOrgSid,
ffcfa.staffSid, ffcfa.saleDeptName AS staffDeptName,
ffcfa.`staffName`, ffcfa.staffSid,
ferd.`contractNo`, ffcfa.`staffName`,
ferd.`payType`, ferd.`contractNo`,
ferd.`customerName`, ferd.`payType`,
ferd.`customerPhone`, ferd.`customerName`,
ferd.`VIN` AS vinNo, ferd.`customerPhone`,
ferd.`receivablesName`, ferd.`VIN` AS vinNo,
ferd.`auditDate`, ferd.`receivablesName`,
ferd.`subscriptionMoney`, ferd.`auditDate`,
ferd.balance AS reveivableMoney, ferd.`subscriptionMoney`,
ferd.kxState AS state (
FROM fin_selected_receivables_detailed ferd ferd.`subscriptionMoney` - COALESCE(SUM(ffc.`thisUseMoney`), 0)
LEFT JOIN fin_funds_carried_forward_apply ffcfa ) AS reveivableMoney,
ON ferd.`collSid` = ffcfa.`sid` ferd.kxState AS state
LEFT JOIN anrui_base.`base_vehicle` bv FROM
ON RIGHT(ferd.`VIN`, 8) = RIGHT(bv.`vinNo`, 8) fin_selected_receivables_detailed ferd
AND ffcfa.`useOrgSid` = bv.`createOrgSid` 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> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
@ -417,55 +428,55 @@
<select id="selectPageLists" <select id="selectPageLists"
resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectReceivablesDetailedVo"> resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectReceivablesDetailedVo">
select distinct fd.sid, select distinct 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,
cast((furd.`reveivableMoney` - COALESCE(df.dbalance, 0)) AS DECIMAL(10, 2)) AS dbalance, cast((furd.`reveivableMoney` - COALESCE(df.dbalance, 0)) AS DECIMAL(10, 2)) AS dbalance,
if(fd.currentReceivableMoney &lt;= 0, 0, if(fd.currentReceivableMoney &lt;= 0, 0,
if(cast((fd.currentReceivableMoney - fd.subscriptionMoney) AS DECIMAL(10, 2)) &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, cast((fd.currentReceivableMoney - fd.subscriptionMoney) AS DECIMAL(10, 2)))) as reveivableMoney,
furd.busVinSid, furd.busVinSid,
furd.payType, furd.payType,
furd.payTypeKey, furd.payTypeKey,
fd.subscriptionMoney, fd.subscriptionMoney,
fd.useOrgSid, fd.useOrgSid,
fd.subscriptionDate, fd.subscriptionDate,
if(bv.linkNo is null or LENGTH(trim(bv.linkNo)) &lt; 1, if(bv.linkNo is null or LENGTH(trim(bv.linkNo)) &lt; 1,
if(furd.payTypeKey = 2, RIGHT(bv.temporaryNo, 2), bv.temporaryNo), if(furd.payTypeKey = 2, RIGHT(bv.temporaryNo, 2), bv.temporaryNo),
RIGHT(bv.linkNo, 8)) as VIN, RIGHT(bv.linkNo, 8)) as VIN,
CURRENT_DATE() as confirmDate, CURRENT_DATE() as confirmDate,
1 as subscribedOf 1 as subscribedOf
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
left join anrui_buscenter.bus_sales_order_vehicle bv on bv.sid = furd.busVinSid left join anrui_buscenter.bus_sales_order_vehicle bv on bv.sid = furd.busVinSid
LEFT JOIN ( LEFT JOIN (
SELECT d.sid, SELECT d.sid,
d.receivablesSid, d.receivablesSid,
d.`collSid`, d.`collSid`,
cast((sum(d.`subscriptionMoney`) - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL(10, 2)) AS dbalance cast((sum(d.`subscriptionMoney`) - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL(10, 2)) AS dbalance
FROM fin_selected_receivables_detailed d FROM fin_selected_receivables_detailed d
LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = d.`sid` LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = d.`sid`
where d.auditState = 1 where d.auditState = 1
or d.auditState = 3 or d.auditState = 3
GROUP BY d.`receivablesSid` GROUP BY d.`receivablesSid`
) df ON df.receivablesSid = furd.`sid` ) df ON df.receivablesSid = furd.`sid`
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
and fd.receivablesName != '订金' and fd.receivablesName != '订金'
and fd.auditState = 3 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
, '') , '')
, ifnull(bv.linkNo , ifnull(bv.linkNo
, '')) LIKE concat('%' , '')) LIKE concat('%'
, #{name} , #{name}
, '%') , '%')
</if> </if>
</where> </where>
having dbalance &lt;= 0 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())) { if (StringUtils.isNotBlank(query.getVinNo())) {
qw.like("ferd.VIN", 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())) { 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.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<FinSelectedReceivablesDetailed> page = PagerUtil.queryToPage(pagerQuery);
IPage<FinSelectReceivablesDetailedWCKCLRKVo> pagging = baseMapper.noOutVehRecPageList(page, qw); IPage<FinSelectReceivablesDetailedWCKCLRKVo> pagging = baseMapper.noOutVehRecPageList(page, qw);
for (FinSelectReceivablesDetailedWCKCLRKVo record : pagging.getRecords()) { for (FinSelectReceivablesDetailedWCKCLRKVo record : pagging.getRecords()) {
String useOrgSid = record.getUseOrgSid(); String useOrgSid = record.getUseOrgSid();
String useOrgName = sysOrganizationFeign.fetchBySid(useOrgSid).getData().getName(); String useOrgName = sysOrganizationFeign.fetchBySid(useOrgSid).getData().getName();
record.setUseOrgName(useOrgName); record.setUseOrgName(useOrgName);
if (StringUtils.isBlank(record.getReveivableMoney())){
record.setReveivableMoney(record.getSubscriptionMoney());
}
} }
PagerVo<FinSelectReceivablesDetailedWCKCLRKVo> p = PagerUtil.pageToVo(pagging, null); PagerVo<FinSelectReceivablesDetailedWCKCLRKVo> p = PagerUtil.pageToVo(pagging, null);
return p; 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> idCardImages = new ArrayList<>();
List<String> comFkFiles = new ArrayList<>(); List<String> comFkFiles = new ArrayList<>();
for (CommonAppendixVo commonAppendixVo : data1) { for (CommonAppendixVo commonAppendixVo : data1) {
String filePath = commonAppendixVo.getFilePath(); idCardImages.add(commonAppendixVo.getFilePath());
String urlPrefix = fileUploadComponent.getUrlPrefix();
filePath = urlPrefix + filePath;
idCardImages.add(filePath);
} }
for (CommonAppendixVo commonAppendixVo : data2) { for (CommonAppendixVo commonAppendixVo : data2) {
String filePath = commonAppendixVo.getFilePath(); comFkFiles.add(commonAppendixVo.getFilePath());
String urlPrefix = fileUploadComponent.getUrlPrefix();
filePath = urlPrefix + filePath;
comFkFiles.add(filePath);
} }
List<LoanPreloanCreditPeoDetailsVo> loanPreloanCreditPeoDetailsVos = loanPreloanCreditPeoService.fetchByMainSid(sid); List<LoanPreloanCreditPeoDetailsVo> loanPreloanCreditPeoDetailsVos = loanPreloanCreditPeoService.fetchByMainSid(sid);
List<String> idCardPeoImages = new ArrayList<>(); List<String> idCardPeoImages = new ArrayList<>();
@ -418,10 +412,7 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
commonAppendixSelectQuery3.setAttachType(LoanFileTypeEnum.FileTypeEnum.ID_CARD.getCode()); commonAppendixSelectQuery3.setAttachType(LoanFileTypeEnum.FileTypeEnum.ID_CARD.getCode());
List<CommonAppendixVo> data3 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery3).getData(); List<CommonAppendixVo> data3 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery3).getData();
for (CommonAppendixVo commonAppendixVo : data3) { for (CommonAppendixVo commonAppendixVo : data3) {
String filePath = commonAppendixVo.getFilePath(); idCardPeoImages.add(commonAppendixVo.getFilePath());
String urlPrefix = fileUploadComponent.getUrlPrefix();
filePath = urlPrefix + filePath;
idCardPeoImages.add(filePath);
} }
loanPreloanCreditPeoDetailsVo.setIdCardImages(idCardPeoImages); loanPreloanCreditPeoDetailsVo.setIdCardImages(idCardPeoImages);
} }

Loading…
Cancel
Save