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

贷前信用审核 

优化工作
master
God 2 years ago
parent
9f813c5ae7
commit
e53d0321bc
6 changed files with 245 additions and 209 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. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedWCKCLRKVo.java
  2. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailed.java
  3. 395
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
  4. 11
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyVo.java
  5. 13
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java
  6. 27
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedWCKCLRKVo.java
View File

@ -45,4 +45,8 @@ public class FinSelectReceivablesDetailedWCKCLRKVo implements Vo {
private String reveivableMoney; private String reveivableMoney;
@ApiModelProperty("款项状态") @ApiModelProperty("款项状态")
private String state; private String state;
@ApiModelProperty("采购系统sid")
private String purchaseSystemSid;
@ApiModelProperty("采购系统名称")
private String purchaseSystemName;
} }

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailed.java
View File

@ -100,4 +100,8 @@ public class FinSelectedReceivablesDetailed extends BaseEntity {
private String kxState; private String kxState;
private String selectSid; private String selectSid;
@ApiModelProperty("采购系统sid")
private String purchaseSystemSid;
@ApiModelProperty("采购系统名称")
private String purchaseSystemName;
} }

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

@ -25,52 +25,52 @@
<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 (select sum(dbalance) as dbalance, d.receivablesSid LEFT JOIN (select sum(dbalance) as dbalance, d.receivablesSid
from (SELECT d.sid, from (SELECT d.sid,
d.receivablesSid, d.receivablesSid,
d.`collSid`, d.`collSid`,
cast(( cast((
d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL(10, 2)) AS dbalance 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 OR d.auditState = 3) WHERE (d.auditState = 1 OR d.auditState = 3)
GROUP BY d.`sid`) d GROUP BY d.`sid`) d
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
@ -79,32 +79,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>
@ -156,7 +156,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>
@ -172,16 +172,18 @@
resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo"> resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo">
select ifnull(sum(dbalance), 0) as subscriptionMoney select ifnull(sum(dbalance), 0) as subscriptionMoney
from (SELECT d.sid, from (SELECT d.sid,
d.receivablesSid, d.receivablesSid,
d.`collSid`, d.`collSid`,
d.auditState, d.auditState,
cast(( cast((
d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL(10, 2)) AS dbalance 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`
left join fin_uncollected_receivables_detailed ff on ff.sid = d.receivablesSid left join fin_uncollected_receivables_detailed ff on ff.sid = d.receivablesSid
WHERE d.auditState = #{state} and ff.busVinSid = #{busVinSid} and d.contractNo = #{contractNo} WHERE d.auditState = #{state}
GROUP BY d.`sid`) d and ff.busVinSid = #{busVinSid}
and d.contractNo = #{contractNo}
GROUP BY d.`sid`) d
</select> </select>
<select id="getList" <select id="getList"
@ -296,11 +298,12 @@
d.`collSid`, d.`collSid`,
d.auditState, d.auditState,
cast(( cast((
d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL(10, 2)) AS dbalance 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`
left join fin_uncollected_receivables_detailed ff on ff.sid = d.receivablesSid left join fin_uncollected_receivables_detailed ff on ff.sid = d.receivablesSid
WHERE d.auditState = 3 and ff.busVinSid = #{busVinSid} WHERE d.auditState = 3
and ff.busVinSid = #{busVinSid}
GROUP BY d.`sid`) d GROUP BY d.`sid`) d
</select> </select>
@ -316,8 +319,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">
@ -332,32 +334,32 @@
<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>
@ -365,61 +367,65 @@
<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 ferd.sid,
fcc.createBySid AS createBySid, fcc.createBySid AS createBySid,
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.purchaseSystemSid,
ferd.`subscriptionMoney` - COALESCE(SUM(ffc.`thisUseMoney`), 0) ferd.purchaseSystemName,
) AS reveivableMoney, (
ferd.kxState AS state ferd.`subscriptionMoney` - COALESCE(SUM(ffc.`thisUseMoney`), 0)
) AS reveivableMoney,
ferd.kxState AS state
FROM fin_selected_receivables_detailed ferd FROM fin_selected_receivables_detailed ferd
LEFT JOIN fin_collection_confirmation fcc LEFT JOIN fin_collection_confirmation fcc
ON ferd.`collSid` = fcc.`sid` ON ferd.`collSid` = fcc.`sid`
LEFT JOIN anrui_base.`base_vehicle` bv LEFT JOIN anrui_base.`base_vehicle` bv
ON RIGHT(ferd.`VIN`, 8) = RIGHT(bv.`vinNo`, 8) ON RIGHT(ferd.`VIN`, 8) = RIGHT(bv.`vinNo`, 8)
AND fcc.`useOrgSid` = bv.`createOrgSid` AND fcc.`useOrgSid` = bv.`createOrgSid`
LEFT JOIN `fin_funds_carried_forward_veh` ffc LEFT JOIN `fin_funds_carried_forward_veh` ffc
ON ffc.`busSid` = ferd.`sid` ON ffc.`busSid` = ferd.`sid`
<where> <where>
${ew.SqlSegment} ${ew.SqlSegment}
</where> </where>
UNION UNION
SELECT ferd.sid, SELECT ferd.sid,
ffcfa.createBySid AS createBySid, ffcfa.createBySid AS createBySid,
ffcfa.useOrgSid, ffcfa.useOrgSid,
ffcfa.saleDeptName AS staffDeptName, ffcfa.saleDeptName AS staffDeptName,
ffcfa.staffSid, ffcfa.staffSid,
ffcfa.`staffName`, ffcfa.`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.purchaseSystemSid,
ferd.`subscriptionMoney` - COALESCE(SUM(ffc.`thisUseMoney`), 0) ferd.purchaseSystemName,
) AS reveivableMoney, (
ferd.kxState AS state ferd.`subscriptionMoney` - COALESCE(SUM(ffc.`thisUseMoney`), 0)
) AS reveivableMoney,
ferd.kxState AS state
FROM fin_selected_receivables_detailed ferd FROM fin_selected_receivables_detailed ferd
LEFT JOIN fin_funds_carried_forward_apply ffcfa LEFT JOIN fin_funds_carried_forward_apply ffcfa
ON ferd.`collSid` = ffcfa.`sid` ON ferd.`collSid` = ffcfa.`sid`
LEFT JOIN anrui_base.`base_vehicle` bv LEFT JOIN anrui_base.`base_vehicle` bv
ON RIGHT(ferd.`VIN`, 8) = RIGHT(bv.`vinNo`, 8) ON RIGHT(ferd.`VIN`, 8) = RIGHT(bv.`vinNo`, 8)
AND ffcfa.`useOrgSid` = bv.`createOrgSid` AND ffcfa.`useOrgSid` = bv.`createOrgSid`
LEFT JOIN `fin_funds_carried_forward_veh` ffc LEFT JOIN `fin_funds_carried_forward_veh` ffc
ON ffc.`busSid` = ferd.`sid` ON ffc.`busSid` = ferd.`sid`
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
@ -436,56 +442,56 @@
<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 (select sum(dbalance) as dbalance, d.receivablesSid LEFT JOIN (select sum(dbalance) as dbalance, d.receivablesSid
from (SELECT d.sid, from (SELECT d.sid,
d.receivablesSid, d.receivablesSid,
d.`collSid`, d.`collSid`,
cast(( cast((
d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL(10, 2)) AS dbalance 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 OR d.auditState = 3) WHERE (d.auditState = 1 OR d.auditState = 3)
GROUP BY d.`sid`) d GROUP BY d.`sid`) d
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
@ -507,11 +513,11 @@
fsrd.`VIN`, fsrd.`VIN`,
fsrd.collSid, fsrd.collSid,
( (
fsrd.`subscriptionMoney` - COALESCE(SUM(ffc.`thisUseMoney`), 0) fsrd.`subscriptionMoney` - COALESCE(SUM(ffc.`thisUseMoney`), 0)
) AS balance ) AS balance
FROM fin_selected_receivables_detailed fsrd FROM fin_selected_receivables_detailed fsrd
LEFT JOIN `fin_funds_carried_forward_veh` ffc LEFT JOIN `fin_funds_carried_forward_veh` ffc
ON ffc.`busSid` = fsrd.`sid` ON ffc.`busSid` = fsrd.`sid`
WHERE fsrd.`sid` = #{busSid} WHERE fsrd.`sid` = #{busSid}
GROUP BY fsrd.sid GROUP BY fsrd.sid
</select> </select>
@ -524,10 +530,11 @@
d.`collSid`, d.`collSid`,
d.auditState, d.auditState,
cast(( cast((
d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL(10, 2)) AS dbalance 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 = 3 WHERE d.auditState = 3
GROUP BY d.`sid`) d WHERE d.receivablesSid = #{receivablesSid} GROUP BY d.`sid`) d
WHERE d.receivablesSid = #{receivablesSid}
</select> </select>
</mapper> </mapper>

11
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyVo.java
View File

@ -40,6 +40,8 @@ public class LoanPreloanCreditApplyVo implements Vo {
private String sid; private String sid;
@ApiModelProperty("申请人+部门")
private String publishInfo;
@ApiModelProperty("审核状态") @ApiModelProperty("审核状态")
private String state; private String state;
@ApiModelProperty("分公司名称") @ApiModelProperty("分公司名称")
@ -66,8 +68,7 @@ public class LoanPreloanCreditApplyVo implements Vo {
@ApiModelProperty("手机号码") @ApiModelProperty("手机号码")
private String phone; private String phone;
@ApiModelProperty("公司审核日期") @ApiModelProperty("公司审核日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private String gsshDate;
private Date gsshDate;
@ApiModelProperty("公司风控结果key") @ApiModelProperty("公司风控结果key")
private String gsfkjgKey; private String gsfkjgKey;
@ApiModelProperty("公司风控结果") @ApiModelProperty("公司风控结果")
@ -82,4 +83,10 @@ public class LoanPreloanCreditApplyVo implements Vo {
private Boolean isDelete; private Boolean isDelete;
@ApiModelProperty("是否可以申诉") @ApiModelProperty("是否可以申诉")
private Boolean isHandle; private Boolean isHandle;
@ApiModelProperty("是否显示修改审核后显示")
private Boolean showUpdateBtn;
@ApiModelProperty("是否显示删除 审核后不显示")
private Boolean showDeleteBtn;
@ApiModelProperty("是否显示申诉 审核后显示")
private Boolean showHandleBtn;
} }

13
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java
View File

@ -152,16 +152,23 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
String state = record.getState(); String state = record.getState();
if ("1".equals(state)) { if ("1".equals(state)) {
record.setIsEdit(true); record.setIsEdit(true);
record.setShowUpdateBtn(true);
record.setIsDelete(true); record.setIsDelete(true);
record.setShowDeleteBtn(true);
} else { } else {
record.setIsEdit(false); record.setIsEdit(false);
record.setShowUpdateBtn(false);
record.setIsDelete(false); record.setIsDelete(false);
record.setShowDeleteBtn(false);
} }
if ("001".equals(record.getGsfkjgKey())){ if ("002".equals(record.getGsfkjgKey())){
record.setIsHandle(false);
}else {
record.setIsHandle(true); record.setIsHandle(true);
record.setShowHandleBtn(true);
}else {
record.setShowHandleBtn(false);
record.setIsHandle(false);
} }
record.setPublishInfo(record.getApplyDeptName() + "-" + record.getCreateByName());
} }
PagerVo<LoanPreloanCreditApplyVo> p = PagerUtil.pageToVo(pagging, null); PagerVo<LoanPreloanCreditApplyVo> p = PagerUtil.pageToVo(pagging, null);
return p; return p;

27
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java
View File

@ -40,6 +40,7 @@ import org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
@ -85,7 +86,7 @@ public class CreditReviewService {
creditReviewVo.setMobile(record.getPhone()); creditReviewVo.setMobile(record.getPhone());
creditReviewVo.setModel(record.getModelName()); creditReviewVo.setModel(record.getModelName());
creditReviewVo.setManagement(record.getCapitalName()); creditReviewVo.setManagement(record.getCapitalName());
creditReviewVo.setExamineDate(DateUtil.formatDate(record.getGsshDate())); creditReviewVo.setExamineDate(record.getGsshDate());
creditReviewVo.setCompanyResults(record.getGsfkjg()); creditReviewVo.setCompanyResults(record.getGsfkjg());
creditReviewVo.setManagementResults(record.getZffkjg()); creditReviewVo.setManagementResults(record.getZffkjg());
creditReviewVo.setShowDeleteBtn(record.getIsDelete()); creditReviewVo.setShowDeleteBtn(record.getIsDelete());
@ -108,6 +109,9 @@ public class CreditReviewService {
creditReviewDetailsVo.setUserSid(query.getUserSid()); creditReviewDetailsVo.setUserSid(query.getUserSid());
creditReviewDetailsVo.setOrgPath(query.getOrgPath()); creditReviewDetailsVo.setOrgPath(query.getOrgPath());
creditReviewDetailsVo.setPublishInfo(sysOrganizationVoBM.getName() + "-" + sysUserVo.getName()); creditReviewDetailsVo.setPublishInfo(sysOrganizationVoBM.getName() + "-" + sysUserVo.getName());
creditReviewDetailsVo.setCreateTime(DateUtil.formatDate(new Date()));
creditReviewDetailsVo.setCustomerTypeKey(query.getCustomerTypeKey());
creditReviewDetailsVo.setCustomerType(query.getCustomerTypeValue());
}else {//修改回显 }else {//修改回显
LoanPreloanCreditApplyDetailsVo loanPreloanCreditApplyDetailsVo = loanPreloanCreditApplyFeign.fetchDetailsBySid(query.getSid()).getData(); LoanPreloanCreditApplyDetailsVo loanPreloanCreditApplyDetailsVo = loanPreloanCreditApplyFeign.fetchDetailsBySid(query.getSid()).getData();
creditReviewDetailsVo.setSid(loanPreloanCreditApplyDetailsVo.getSid()); creditReviewDetailsVo.setSid(loanPreloanCreditApplyDetailsVo.getSid());
@ -150,26 +154,29 @@ public class CreditReviewService {
} }
//构建人员类型下拉选数据 //构建人员类型下拉选数据
List<IdentityDetailsVo> identityDetailsVos = new ArrayList<>(); List<IdentityDetailsVo> identityDetailsVos = new ArrayList<>();
IdentityDetailsVo identityDetailsVo = new IdentityDetailsVo();
if ("1".equals(query.getCustomerTypeKey())){ if ("1".equals(query.getCustomerTypeKey())){
IdentityDetailsVo identityDetailsVo = new IdentityDetailsVo();
identityDetailsVo.setSid("003"); identityDetailsVo.setSid("003");
identityDetailsVo.setDictKey("003"); identityDetailsVo.setDictKey("003");
identityDetailsVo.setDictValue("担保人"); identityDetailsVo.setDictValue("担保人");
identityDetailsVos.add(identityDetailsVo); identityDetailsVos.add(identityDetailsVo);
}else { }else {
IdentityDetailsVo identityDetailsVo = new IdentityDetailsVo();
identityDetailsVo.setSid("001"); identityDetailsVo.setSid("001");
identityDetailsVo.setDictKey("001"); identityDetailsVo.setDictKey("001");
identityDetailsVo.setDictValue("股东"); identityDetailsVo.setDictValue("股东");
identityDetailsVos.add(identityDetailsVo); identityDetailsVos.add(identityDetailsVo);
} }
identityDetailsVo.setSid("002"); IdentityDetailsVo identityDetailsVo1 = new IdentityDetailsVo();
identityDetailsVo.setDictKey("002"); identityDetailsVo1.setSid("002");
identityDetailsVo.setDictValue("配偶"); identityDetailsVo1.setDictKey("002");
identityDetailsVos.add(identityDetailsVo); identityDetailsVo1.setDictValue("配偶");
identityDetailsVo.setSid("004"); identityDetailsVos.add(identityDetailsVo1);
identityDetailsVo.setDictKey("004"); IdentityDetailsVo identityDetailsVo2 = new IdentityDetailsVo();
identityDetailsVo.setDictValue("其他"); identityDetailsVo2.setSid("004");
identityDetailsVos.add(identityDetailsVo); identityDetailsVo2.setDictKey("004");
identityDetailsVo2.setDictValue("其他");
identityDetailsVos.add(identityDetailsVo2);
creditReviewDetailsVo.setIdentity(identityDetailsVos); creditReviewDetailsVo.setIdentity(identityDetailsVos);
return rb.success().setData(creditReviewDetailsVo); return rb.success().setData(creditReviewDetailsVo);
} }

Write Preview
Loading…
Cancel
Save