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

Merge remote-tracking branch 'origin/master'

master
yunuo970428 2 years ago
parent
215c4ed5d7 22c2fd59d7
commit
a00a6f4c8c
16 changed files with 416 additions and 200 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java
  2. 167
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml
  3. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
  4. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyFeign.java
  5. 20
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyMapper.xml
  6. 6
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java
  7. 116
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
  8. 40
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
  9. 30
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditpeo/LoanPreloanCreditPeoDto.java
  10. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewDetailsQuery.java
  11. 61
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewDto.java
  12. 5
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeign.java
  13. 5
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeignFallback.java
  14. 35
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewOffDto.java
  15. 5
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewRest.java
  16. 115
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java

3
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java
View File

@ -78,7 +78,6 @@ public interface BusDeliveredMapper extends BaseMapper<BusDelivered> {
* @return
*/
IPage<AppBusDeliveredPageVo> getRetrievalNotList(IPage<AppBusDeliveredPageVo> page, @Param(Constants.WRAPPER) QueryWrapper<AppBusDeliveredPageQuery> qw, @Param("name") String name);
IPage<AppBusDeliveredPageVo> getRetrievalNotLists(IPage<AppBusDeliveredPageVo> page, @Param(Constants.WRAPPER) QueryWrapper<AppBusDeliveredPageQuery> qw, @Param("name") String name);
/**
* 查询车架号
@ -101,4 +100,6 @@ public interface BusDeliveredMapper extends BaseMapper<BusDelivered> {
List<String> selectByState();
IPage<BusDeliveredVo> selectListsVos(IPage<BusDelivered> page, @Param(Constants.WRAPPER)QueryWrapper<BusDelivered> qw);
IPage<AppBusDeliveredPageVo> getRetrievalNotLists(IPage<AppBusDeliveredPageVo> page, @Param(Constants.WRAPPER)QueryWrapper<AppBusDeliveredPageQuery> qw, @Param("name") String name);
}

167
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml
View File

@ -65,45 +65,6 @@
group by bd.contractNo
</select>
<resultMap id="ListMap" type="com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo">
<result column="sid" jdbcType="VARCHAR" property="sid"/>
<result column="contractNo" jdbcType="VARCHAR" property="contractNo"/>
<result column="paymentMethod" jdbcType="INTEGER" property="paymentMethod"/>
<result column="name" jdbcType="VARCHAR" property="name"/>
<collection property="vinList" ofType="com.yxt.anrui.buscenter.api.sysmobilemenu.SysMobileMenuListVo"
select="vinList" column="contractNo">
</collection>
</resultMap>
<select id="getRetrievalNotLists"
resultMap="ListMap">
SELECT bd.*
FROM bus_delivered bd
left join bus_sales_order bo on bo.contractNo = bd.contractNo
left join bus_sales_order_vehicle bv on bo.sid = bv.salesOrderSid
<where>
${ew.sqlSegment}
<if test="name != null and name != ''">
and concat(IFNULL(bd.contractNo
, '')
, ifnull(bd.`name`
, '')) LIKE concat('%'
, #{name}
, '%')
</if>
AND (
SELECT
count(*)
FROM
bus_sales_order_vehicle bbv
LEFT JOIN bus_sales_order bo ON bo.sid = bbv.salesOrderSid
WHERE
length( bbv.linkSid )> 0
AND bo.contractNo = bd.contractNo
)> 0
</where>
group by bd.contractNo
</select>
<select id="selVinListVo" resultType="com.yxt.anrui.buscenter.api.busdelivered.AppVinListVo">
SELECT RIGHT(bv.linkNo, 8) as vin, bd.busVinSid, bd.subscription as businessState, bv.linkSid as vinSid
FROM bus_delivered bd
@ -138,7 +99,7 @@
</foreach>
</update>
<select id="selectListsVo" resultType="com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredVo">
<!-- <select id="selectListsVo" resultType="com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredVo">
SELECT bd.sid,
bd.contractNo,
bd.name,
@ -154,7 +115,7 @@
${ew.sqlSegment}
and length(bv.linkSid) > 0
</where>
</select>
</select>-->
<select id="selectListsVo" resultType="com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredVo">
SELECT bd.sid,
@ -211,4 +172,128 @@
and length(bv.linkSid) > 0 and bbv.vehicleStateValue != '出库'
</where>
</select>
<resultMap id="listMap" type="com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo">
<result column="contractNo" jdbcType="VARCHAR" property="contractNo"/>
<collection property="vinList" ofType="com.yxt.anrui.buscenter.api.busdelivered.AppVinListVo"
select="vinList" column="contractNo">
</collection>
</resultMap>
<select id="vinList">
SELECT
bv.linkNo vin,
bv.linkSid vinSid,
bv.sid busVinSid,
cast(
sum(
furd.`reveivableMoney` - COALESCE ( df.dbalance, 0 )) AS DECIMAL ( 10, 2 )) AS dblances,
bbv.vehicleStateValue
FROM
fin_uncollected_receivables_detailed furd
LEFT JOIN anrui_buscenter.bus_sales_order_vehicle bv ON bv.sid = furd.busVinSid
LEFT JOIN (
SELECT
sum( dbalance ) AS dbalance,
d.receivablesSid
FROM
(
SELECT
d.sid,
d.receivablesSid,
d.`collSid`,
cast((
d.`subscriptionMoney` - COALESCE ( SUM( f.`thisUseMoney` ), 0 ) + COALESCE ( ffa.`useMoney`, 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`
LEFT JOIN (
SELECT
fa.sid,
ff.busSid,
ff.thisUseMoney AS useMoney
FROM
fin_funds_carried_forward_apply fa
LEFT JOIN fin_funds_carried_forward_veh ff ON ff.mainSid = fa.sid
WHERE
fa.nodeState = '终止'
) ffa ON ffa.busSid = d.sid
WHERE
(d.auditState = 3 )
GROUP BY
d.`sid`
) d
GROUP BY
d.receivablesSid
) df ON df.receivablesSid = furd.`sid`
LEFT JOIN anrui_base.base_vehicle bbv ON bbv.sid = bv.linkSid
WHERE
bbv.vehicleStateValue != '出库'
AND length( bv.linkSid )> 0 and furd.contractNo = #{contractNo}
GROUP BY
furd.busVinSid
HAVING
dblances &lt;= 0
</select>
<select id="getRetrievalNotLists" resultMap="listMap">
SELECT
ds.contractNo
FROM
(
SELECT
furd.contractNo,
furd.busVinSid,
cast(
sum(
furd.`reveivableMoney` - COALESCE ( df.dbalance, 0 )) AS DECIMAL ( 10, 2 )) AS dblances,
bbv.vehicleStateValue
FROM
fin_uncollected_receivables_detailed furd
LEFT JOIN anrui_buscenter.bus_sales_order_vehicle bv ON bv.sid = furd.busVinSid
LEFT JOIN (
SELECT
sum( dbalance ) AS dbalance,
d.receivablesSid
FROM
(
SELECT
d.sid,
d.receivablesSid,
d.`collSid`,
cast((
d.`subscriptionMoney` - COALESCE ( SUM( f.`thisUseMoney` ), 0 ) + COALESCE ( ffa.`useMoney`, 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`
LEFT JOIN (
SELECT
fa.sid,
ff.busSid,
ff.thisUseMoney AS useMoney
FROM
fin_funds_carried_forward_apply fa
LEFT JOIN fin_funds_carried_forward_veh ff ON ff.mainSid = fa.sid
WHERE
fa.nodeState = '终止'
) ffa ON ffa.busSid = d.sid
WHERE
(d.auditState = 3 )
GROUP BY
d.`sid`
) d
GROUP BY
d.receivablesSid
) df ON df.receivablesSid = furd.`sid`
LEFT JOIN anrui_base.base_vehicle bbv ON bbv.sid = bv.linkSid
WHERE
bbv.vehicleStateValue != '出库'
AND length( bv.linkSid )> 0
GROUP BY
furd.busVinSid
HAVING
dblances &lt;= 0
) ds
GROUP BY
ds.contractNo order by ds.contractNo desc
</select>
</mapper>

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
View File

@ -554,6 +554,6 @@
</select>
<select id="selectBySid" resultType="java.lang.String">
select cc.sid from bus_sales_order bo left join anrui_base.common_contract cc on cc.contractNo = bo.contractNo
select cc.sid from bus_sales_order bo left join anrui_base.common_contract cc on cc.contractNo = bo.contractNo where bo.sid = #{sid}
</select>
</mapper>

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyFeign.java
View File

@ -97,7 +97,7 @@ public interface FinFundsCarriedForwardApplyFeign {
@ApiOperation("生成款项结转PDF")
@PostMapping("/createPdf")
@ResponseBody
public ResultBean<String> createPdf(@RequestParam("sid") String sid, @RequestParam("userName") String userName);
public ResultBean<String> createPdf(@RequestParam("sid") String sid, @RequestParam("pdfType") String pdfType);
/****************************************************审批流程*****************************************************/

20
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyMapper.xml
View File

@ -70,20 +70,18 @@
<select id="selectByBusSid" resultType="java.lang.String">
select ifnull(sum(dbalance), 0) as subscriptionMoney
from (SELECT d.sid,
d.receivablesSid,
d.`collSid`,
d.auditState,
from (SELECT
cast((
d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0) +
COALESCE(ffa.`useMoney`, 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
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 (SELECT fa.sid, ff.busSid, ff.thisUseMoney as useMoney
FROM fin_funds_carried_forward_apply fa
LEFT JOIN fin_funds_carried_forward_veh ff ON ff.mainSid = fa.sid
WHERE fa.nodeState = '终止') ffa on ffa.busSid = d.sid
LEFT JOIN (
SELECT f.busSid,
f.thisUseMoney
FROM fin_funds_carried_forward_veh f
JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid
WHERE fa.`nodeState` != '终止'
) f ON f.`busSid` = d.`sid`
WHERE d.auditState = 3
and ff.busVinSid = #{busVinSid}
GROUP BY d.`sid`) d

6
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java
View File

@ -391,6 +391,8 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
finFundsCarriedForwardVehDetailsVo.setVinNo(finSelectedReceivablesDetailed.getVIN());
finFundsCarriedForwardVehDetailsVo.setBalance(finSelectedReceivablesDetailed.getBalance());
finFundsCarriedForwardVehDetailsVos.add(finFundsCarriedForwardVehDetailsVo);
finFundsCarriedForwardApplyDetailsVo.setPurchaseSystemSid(finSelectedReceivablesDetailed.getPurchaseSystemSid());
finFundsCarriedForwardApplyDetailsVo.setPurchaseSystem(finSelectedReceivablesDetailed.getPurchaseSystemName());
}
SysUserVo sysUserVo1 = null;
if (finCollectionConfirmation != null){
@ -1365,7 +1367,9 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
tzDto.setConNo(finFundsCarriedForwardVehDetailsVo.getBusBillNo());
tzDto.setName(finFundsCarriedForwardVehDetailsVo.getCustomerName());
tzDto.setVinNo(finFundsCarriedForwardVehDetailsVo.getVinNo());
tzDto.setDcje(Integer.parseInt(finFundsCarriedForwardVehDetailsVo.getThisUseMoney()));
String thisUseMoney = finFundsCarriedForwardVehDetailsVo.getThisUseMoney();
int index = thisUseMoney.indexOf(".");
tzDto.setDcje(Integer.parseInt(thisUseMoney.substring(0, index)));
tzList.add(tzDto);
}
for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {

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

@ -25,42 +25,43 @@
<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.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,
COALESCE(SUM(df.dbalance), 0) AS realMoney,
cast((furd.`reveivableMoney` - COALESCE(SUM(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,
RIGHT(bv.linkNo, 8)) as vin,
furd.busVinSid,
furd.payType,
furd.payTypeKey,
0 as subscribedOf,
furd.sid as receivablesSid,
CURRENT_DATE() as confirmDate,
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 sum(dbalance) as dbalance, d.receivablesSid
from (SELECT d.sid,
d.receivablesSid,
d.`collSid`,
cast((
d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0) +
COALESCE(ffa.`useMoney`, 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`
LEFT JOIN (SELECT fa.sid, ff.busSid, ff.thisUseMoney as useMoney
FROM fin_funds_carried_forward_apply fa
LEFT JOIN fin_funds_carried_forward_veh ff ON ff.mainSid = fa.sid
WHERE fa.nodeState = '终止') ffa on ffa.busSid = d.sid
WHERE (d.auditState = 1 OR d.auditState = 3)
GROUP BY d.`sid`) d
group by d.receivablesSid
LEFT JOIN (
SELECT d.sid,
d.`receivablesSid`,
(
d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS dbalance
FROM fin_selected_receivables_detailed d
LEFT JOIN (
SELECT f.busSid,
f.thisUseMoney
FROM fin_funds_carried_forward_veh f
JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid
WHERE fa.`nodeState` != '终止'
) f ON f.`busSid` = d.`sid`
WHERE d.`auditState` = 3
or d.auditState = 1
GROUP BY d.`sid`
) df ON df.receivablesSid = furd.`sid`
<where>
${ew.sqlSegment}
@ -77,6 +78,7 @@
and length(furd.busVinSid)
>0
</where>
group by furd.sid
having receivable>0
order by furd.contractNo desc
</select>
@ -176,20 +178,17 @@
<select id="selectListByVin"
resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo">
select ifnull(sum(dbalance), 0) as subscriptionMoney
from (SELECT d.sid,
d.receivablesSid,
d.`collSid`,
d.auditState,
cast((
d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0) +
COALESCE(ffa.`useMoney`, 0)) AS DECIMAL(10, 2)) AS dbalance
from (SELECT cast((
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`
left join fin_uncollected_receivables_detailed ff on ff.sid = d.receivablesSid
LEFT JOIN (SELECT fa.sid, ff.busSid, ff.thisUseMoney as useMoney
FROM fin_funds_carried_forward_apply fa
LEFT JOIN fin_funds_carried_forward_veh ff ON ff.mainSid = fa.sid
WHERE fa.nodeState = '终止') ffa on ffa.busSid = d.sid
LEFT JOIN (
SELECT f.busSid,
f.thisUseMoney
FROM fin_funds_carried_forward_veh f
JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid
WHERE fa.`nodeState` != '终止'
) f ON f.`busSid` = d.`sid`
WHERE d.auditState = #{state}
and ff.busVinSid = #{busVinSid}
and d.contractNo = #{contractNo}
@ -303,20 +302,17 @@
<select id="selectByVinSid" resultType="java.lang.String">
select ifnull(sum(dbalance), 0) as subscriptionMoney
from (SELECT d.sid,
d.receivablesSid,
d.`collSid`,
d.auditState,
cast((
d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0) +
COALESCE(ffa.`useMoney`, 0)) AS DECIMAL(10, 2)) AS dbalance
from (SELECT cast((
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`
left join fin_uncollected_receivables_detailed ff on ff.sid = d.receivablesSid
LEFT JOIN (SELECT fa.sid, ff.busSid, ff.thisUseMoney as useMoney
FROM fin_funds_carried_forward_apply fa
LEFT JOIN fin_funds_carried_forward_veh ff ON ff.mainSid = fa.sid
WHERE fa.nodeState = '终止') ffa on ffa.busSid = d.sid
LEFT JOIN (
SELECT f.busSid,
f.thisUseMoney
FROM fin_funds_carried_forward_veh f
JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid
WHERE fa.`nodeState` != '终止'
) f ON f.`busSid` = d.`sid`
WHERE d.auditState = 3
and ff.busVinSid = #{busVinSid}
GROUP BY d.`sid`) d
@ -533,6 +529,8 @@
fsrd.`customerName`,
fsrd.`VIN`,
fsrd.collSid,
fsrd.purchaseSystemSid,
fsrd.purchaseSystemName,
(
fsrd.`subscriptionMoney` - COALESCE(SUM(ffc.`thisUseMoney`), 0)
) AS balance
@ -546,19 +544,17 @@
<select id="fetchByReceivablesSid"
resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed">
select ifnull(sum(dbalance), 0) as subscriptionMoney, d.receivablesSid
from (SELECT d.sid,
d.receivablesSid,
d.`collSid`,
d.auditState,
from (SELECT d.receivablesSid,
cast((
d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0) +
COALESCE(ffa.`useMoney`, 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
LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = d.`sid`
LEFT JOIN (SELECT fa.sid, ff.busSid, ff.thisUseMoney as useMoney
FROM fin_funds_carried_forward_apply fa
LEFT JOIN fin_funds_carried_forward_veh ff ON ff.mainSid = fa.sid
WHERE fa.nodeState = '终止') ffa on ffa.busSid = d.sid
LEFT JOIN (
SELECT f.busSid,
f.thisUseMoney
FROM fin_funds_carried_forward_veh f
JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid
WHERE fa.`nodeState` != '终止'
) f ON f.`busSid` = d.`sid`
WHERE d.auditState = 3
GROUP BY d.`sid`) d
WHERE d.receivablesSid = #{receivablesSid}

40
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
View File

@ -58,7 +58,8 @@
furd.customerName AS `customerName`,
furd.customerSid,
furd.useOrgSid,
cast((furd.`reveivableMoney` - COALESCE(df.dbalance, 0)) AS DECIMAL(10, 2)) AS currentReceivableMoney,
COALESCE ( SUM( df.dbalance ), 0 ) AS realMoney,
cast((furd.`reveivableMoney` - COALESCE(SUM( df.dbalance ), 0)) AS DECIMAL(10, 2)) AS currentReceivableMoney,
furd.reveivableMoney,
furd.contractSid,
if(bv.linkNo is null or LENGTH(trim(bv.linkNo)) &lt; 1,
@ -71,27 +72,28 @@
furd.sid as receivablesSid
FROM fin_uncollected_receivables_detailed furd
left join anrui_buscenter.bus_sales_order_vehicle bv on bv.sid = furd.busVinSid
LEFT JOIN (select sum(dbalance) as dbalance, d.receivablesSid
from (SELECT d.sid,
d.receivablesSid,
d.`collSid`,
cast((
d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0) +
COALESCE(ffa.`useMoney`, 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`
LEFT JOIN (SELECT fa.sid, ff.busSid, ff.thisUseMoney as useMoney
FROM fin_funds_carried_forward_apply fa
LEFT JOIN fin_funds_carried_forward_veh ff ON ff.mainSid = fa.sid
WHERE fa.nodeState = '终止') ffa on ffa.busSid = d.sid
WHERE (d.auditState = 1 OR d.auditState = 3)
GROUP BY d.`sid`) d
group by d.receivablesSid
LEFT JOIN (
SELECT d.sid,
d.`receivablesSid`,
(
d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS dbalance
FROM fin_selected_receivables_detailed d
LEFT JOIN (
SELECT f.busSid,
f.thisUseMoney
FROM fin_funds_carried_forward_veh f
JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid
WHERE fa.`nodeState` != '终止'
) f ON f.`busSid` = d.`sid`
WHERE d.`auditState` = 3
or d.auditState = 1
GROUP BY d.`sid`
) df ON df.receivablesSid = furd.`sid`
<where>
${ew.sqlSegment}
and length(furd.busVinSid) > 0
</where>
group by furd.sid,currentReceivableMoney,furd.contractNo
having currentReceivableMoney>0
order by furd.contractNo desc
</select>
@ -213,6 +215,8 @@
</select>
<select id="selectByBusVinSid" resultType="java.lang.String">
select sum(reveivableMoney) from fin_uncollected_receivables_detailed where busVinSid = #{busVinSid}
select sum(reveivableMoney)
from fin_uncollected_receivables_detailed
where busVinSid = #{busVinSid}
</select>
</mapper>

30
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditpeo/LoanPreloanCreditPeoDto.java
View File

@ -38,22 +38,22 @@ import java.util.List;
@ApiModel(value = "贷前信用审核人员表 数据传输对象", description = "贷前信用审核人员表 数据传输对象")
public class LoanPreloanCreditPeoDto implements Dto {
private String sid; // sid
private String sid;
@ApiModelProperty("主表sid")
private String mainSid;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("人员身份key")
private String peoTypeKey; // 人员身份key
@ApiModelProperty("人员身份value")
private String peoTypeValue; // 人员身份value
@ApiModelProperty("身份证号码")
private String idCard; // 身份证号码
@ApiModelProperty("人员姓名")
private String peoName; // 人员姓名
@ApiModelProperty("手机号码")
private String phone; // 手机号码
@ApiModelProperty("人员身份key")
private String peoTypeKey;
@ApiModelProperty("人员身份value")
private String peoTypeValue;
@ApiModelProperty("身份证号码")
private String idCard;
@ApiModelProperty("人员姓名")
private String peoName;
@ApiModelProperty("手机号码")
private String phone;
@ApiModelProperty("身份证正反面附件")
private List<String> idCardImages = new ArrayList<>();
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("主表sid")
private String mainSid;
}

4
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewDetailsQuery.java
View File

@ -16,4 +16,8 @@ public class CreditReviewDetailsQuery implements Query {
private String userSid;
@ApiModelProperty("组织全路径")
private String orgPath;
@ApiModelProperty("发起的来源 0单独发起 1意向 2销售订单")
private int createSource;
@ApiModelProperty("来源的sid 1意向的sid 2销售订单的sid")
private String sourceSid;
}

61
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewDto.java
View File

@ -11,61 +11,44 @@ import java.util.List;
public class CreditReviewDto implements Dto {
private String sid;
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("组织全路径")
private String orgPath;
@ApiModelProperty("申请人+部门")
private String publishInfo;
@ApiModelProperty("申请日期")
private String createTime;
@ApiModelProperty("客户类型key 1个人2企业")
private String customerTypeKey;
@ApiModelProperty("客户类型value")
private String customerType;
@ApiModelProperty("车型名称")
private String model;
@ApiModelProperty("车型sid")
private String modelSid;
@ApiModelProperty("客户类型key 1个人2企业")
private String customerTypeKey;
@ApiModelProperty("客户类型value")
private String customerType;
@ApiModelProperty("企业名称")
private String companyName;
@ApiModelProperty("企业sid")
private String companySid;
@ApiModelProperty("法人/贷款人身份证")
private String legalPersonIdNumber;
@ApiModelProperty("法人/贷款人姓名")
private String legalPersonName;
@ApiModelProperty("贷款人sid")
private String legalPersonSid;
@ApiModelProperty("法人/贷款人手机号")
private String legalPersonMobile;
@ApiModelProperty("法人/贷款人身份证")
private String legalPersonIdNumber;
@ApiModelProperty("身份证正反面附件")
private List<String> legalPersonIdCardImages;
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("组织全路径")
private String orgPath;
@ApiModelProperty("企业名称")
private String companyName;
@ApiModelProperty("企业sid")
private String companySid;
private List<String> legalPersonIdCardImages = new ArrayList<>();
@ApiModelProperty("风控要求的其他人员")
private List<ShareholderDetailsVo> shareholderList = new ArrayList<>();
@ApiModelProperty("模板下载地址")
private String downUrl;
@ApiModelProperty("公司要求材料")
private List<String> materialImages;
@ApiModelProperty("资方名称")
private String managementName;
private List<String> materialImages= new ArrayList<>();
@ApiModelProperty("资方sid")
private String managementSid;
@ApiModelProperty("模板下载地址")
private String downUrl;
@ApiModelProperty("查询结果截图（公司）")
private List<String> searchResultImages;
@ApiModelProperty("审核结果（公司）")
private String examineResult;
@ApiModelProperty("审核日期（公司）")
private String examineDate;
@ApiModelProperty("审核备注（公司）")
private String examineRemarks;
@ApiModelProperty("查询结果截图（资方）")
private List<String> searchResultImages2;
@ApiModelProperty("审核结果（资方）")
private String examineResult2;
@ApiModelProperty("审核日期（资方）")
private String examineDate2;
@ApiModelProperty("审核备注（资方）")
private String examineRemarks2;
@ApiModelProperty("风控要求的其他人员")
private List<ShareholderDetailsVo> shareholderList = new ArrayList<>();
private List<IdentityDetailsVo> identity = new ArrayList<>();
@ApiModelProperty("资方名称")
private String managementName;
}

5
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeign.java
View File

@ -53,4 +53,9 @@ public interface CreditReviewFeign {
@PostMapping("/saveCreditReviewInfo")
@ResponseBody
public ResultBean saveCreditReviewInfo(@RequestBody CreditReviewDto dto);
@ApiOperation("保存贷前信用审核申请1")
@PostMapping("/saveCreditReviewInfo1")
@ResponseBody
public ResultBean saveCreditReviewInfo1(@RequestBody CreditReviewOffDto dto);
}

5
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeignFallback.java
View File

@ -44,4 +44,9 @@ public class CreditReviewFeignFallback implements CreditReviewFeign {
public ResultBean saveCreditReviewInfo(CreditReviewDto dto) {
return null;
}
@Override
public ResultBean saveCreditReviewInfo1(CreditReviewOffDto dto) {
return null;
}
}

35
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewOffDto.java
View File

@ -0,0 +1,35 @@
package com.yxt.anrui.terminal.api.risk.creditreview;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@Data
public class CreditReviewOffDto extends CreditReviewDto{
@ApiModelProperty("查询结果截图（公司）")
private List<String> searchResultImages = new ArrayList<>();
@ApiModelProperty("审核结果key（公司）")
private String examineResultKey;
@ApiModelProperty("审核结果（公司）")
private String examineResult;
@ApiModelProperty("审核日期（公司）")
private String examineDate;
@ApiModelProperty("审核备注（公司）")
private String examineRemarks;
@ApiModelProperty("资方剩余额度")
private String manageLeave;
@ApiModelProperty("查询结果截图（资方）")
private List<String> searchResultImages2 = new ArrayList<>();
@ApiModelProperty("审核结果key（资方）")
private String examineResult2Key;
@ApiModelProperty("审核结果（资方）")
private String examineResult2;
@ApiModelProperty("审核日期（资方）")
private String examineDate2;
@ApiModelProperty("审核备注（资方）")
private String examineRemarks2;
}

5
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewRest.java
View File

@ -51,6 +51,11 @@ public class CreditReviewRest implements CreditReviewFeign {
@Override
public ResultBean saveCreditReviewInfo(CreditReviewDto dto) {
return creditReviewService.saveCreditReviewInfo(dto);
}
@Override
public ResultBean saveCreditReviewInfo1(CreditReviewOffDto dto) {
return null;
}
}

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

@ -12,17 +12,16 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBankDto;
import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBankFeign;
import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBanksVo;
import com.yxt.anrui.riskcenter.api.loanfinotherpolicyrecordapply.LoanFinOtherPolicyApplyInitVo;
import com.yxt.anrui.riskcenter.api.loanfinotherpolicyrecordapply.LoanFinOtherPolicyRecordApplyFeign;
import com.yxt.anrui.riskcenter.api.loanfinotherpolicyrecordapply.flow.LoanOtherPolicyApplyCompleteDto;
import com.yxt.anrui.riskcenter.api.loanfinotherpolicyrecordapply.flow.LoanOtherPolicyApplyTaskQuery;
import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApplyDetailsVo;
import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApplyFeign;
import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApplyQuery;
import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApplyVo;
import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.*;
import com.yxt.anrui.riskcenter.api.loanpreloancreditpeo.LoanPreloanCreditPeoDetailsVo;
import com.yxt.anrui.riskcenter.api.loanpreloancreditpeo.LoanPreloanCreditPeoDto;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoicePageQuery;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoicePageVo;
import com.yxt.anrui.terminal.api.risk.creditreview.*;
@ -104,14 +103,20 @@ public class CreditReviewService {
ResultBean rb = ResultBean.fireFail();
CreditReviewDetailsVo creditReviewDetailsVo = new CreditReviewDetailsVo();
if (StringUtils.isBlank(query.getSid())){//新增初始化
SysUserVo sysUserVo = sysUserFeign.fetchBySid(query.getUserSid()).getData();
SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.selectByOrgSidPath(query.getOrgPath()).getData();
creditReviewDetailsVo.setUserSid(query.getUserSid());
creditReviewDetailsVo.setOrgPath(query.getOrgPath());
creditReviewDetailsVo.setPublishInfo(sysOrganizationVoBM.getName() + "-" + sysUserVo.getName());
creditReviewDetailsVo.setCreateTime(DateUtil.formatDate(new Date()));
creditReviewDetailsVo.setCustomerTypeKey(query.getCustomerTypeKey());
creditReviewDetailsVo.setCustomerType(query.getCustomerTypeValue());
if (query.getCreateSource() == 0){
SysUserVo sysUserVo = sysUserFeign.fetchBySid(query.getUserSid()).getData();
SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.selectByOrgSidPath(query.getOrgPath()).getData();
creditReviewDetailsVo.setUserSid(query.getUserSid());
creditReviewDetailsVo.setOrgPath(query.getOrgPath());
creditReviewDetailsVo.setPublishInfo(sysOrganizationVoBM.getName() + "-" + sysUserVo.getName());
creditReviewDetailsVo.setCreateTime(DateUtil.formatDate(new Date()));
creditReviewDetailsVo.setCustomerTypeKey(query.getCustomerTypeKey());
creditReviewDetailsVo.setCustomerType(query.getCustomerTypeValue());
}else if (query.getCreateSource() == 1){//意向车型发起
}else if (query.getCreateSource() == 2){//销售订单发起
}
}else {//修改回显
LoanPreloanCreditApplyDetailsVo loanPreloanCreditApplyDetailsVo = loanPreloanCreditApplyFeign.fetchDetailsBySid(query.getSid()).getData();
creditReviewDetailsVo.setSid(loanPreloanCreditApplyDetailsVo.getSid());
@ -209,4 +214,90 @@ public class CreditReviewService {
}
return rb.success().setData(identityDetailsVos);
}
public ResultBean saveCreditReviewInfo(CreditReviewDto dto) {
ResultBean rb = ResultBean.fireFail();
LoanPreloanCreditApplyDto loanPreloanCreditApplyDto = new LoanPreloanCreditApplyDto();
loanPreloanCreditApplyDto.setSid(dto.getSid());
loanPreloanCreditApplyDto.setCreateBySid(dto.getUserSid());
String[] publishInfos = dto.getPublishInfo().split("-");
loanPreloanCreditApplyDto.setApplyDeptName(publishInfos[0]);
loanPreloanCreditApplyDto.setCreateByName(publishInfos[1]);
SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.selectByOrgSidPath(dto.getOrgPath()).getData();
loanPreloanCreditApplyDto.setApplyDeptSid(sysOrganizationVoBM.getSid());
loanPreloanCreditApplyDto.setModelSid(dto.getModelSid());
loanPreloanCreditApplyDto.setModelName(dto.getModel());
loanPreloanCreditApplyDto.setCustTypeKey(dto.getCustomerTypeKey());
loanPreloanCreditApplyDto.setCustTypeValue(dto.getCustomerType());
loanPreloanCreditApplyDto.setQySid(dto.getCompanySid());
loanPreloanCreditApplyDto.setQyName(dto.getCompanyName());
loanPreloanCreditApplyDto.setIdCard(dto.getLegalPersonIdNumber());
loanPreloanCreditApplyDto.setCustSid(dto.getLegalPersonSid());
loanPreloanCreditApplyDto.setCustName(dto.getLegalPersonName());
loanPreloanCreditApplyDto.setPhone(dto.getLegalPersonMobile());
loanPreloanCreditApplyDto.setCapitalSid(dto.getManagementSid());
loanPreloanCreditApplyDto.setCapitalName(dto.getManagementName());
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
SysOrganizationVo sysOrganizationVoGS = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
loanPreloanCreditApplyDto.setUseOrgSid(useOrgSid);
loanPreloanCreditApplyDto.setUseOrgName(sysOrganizationVoGS.getName());
loanPreloanCreditApplyDto.setOrgSidPath(dto.getOrgPath());
loanPreloanCreditApplyDto.setIdCardImages(dto.getLegalPersonIdCardImages());
List<ShareholderDetailsVo> shareholderList = dto.getShareholderList();
List<LoanPreloanCreditPeoDto> loanPreloanCreditPeoDtos = new ArrayList<>();
for (ShareholderDetailsVo shareholderDetailsVo : shareholderList) {
LoanPreloanCreditPeoDto loanPreloanCreditPeoDto = new LoanPreloanCreditPeoDto();
loanPreloanCreditPeoDto.setPeoTypeKey(shareholderDetailsVo.getShareholderTypeKey());
loanPreloanCreditPeoDto.setPeoTypeValue(shareholderDetailsVo.getShareholderTypeValue());
loanPreloanCreditPeoDto.setIdCard(shareholderDetailsVo.getShareholderIdNumber());
loanPreloanCreditPeoDto.setPeoName(shareholderDetailsVo.getShareholderName());
loanPreloanCreditPeoDto.setPhone(shareholderDetailsVo.getShareholderMobile());
loanPreloanCreditPeoDto.setIdCardImages(shareholderDetailsVo.getShareholderIdCardImages());
loanPreloanCreditPeoDto.setRemarks(shareholderDetailsVo.getShareholderRemarks());
loanPreloanCreditPeoDtos.add(loanPreloanCreditPeoDto);
}
loanPreloanCreditApplyDto.setLoanPreloanCreditPeos(loanPreloanCreditPeoDtos);
loanPreloanCreditApplyFeign.save(loanPreloanCreditApplyDto);
return rb.success();
}
public ResultBean saveCreditReviewInfo1(CreditReviewOffDto dto) {
ResultBean rb = ResultBean.fireFail();
LoanPreloanCreditApplyDto loanPreloanCreditApplyDto = new LoanPreloanCreditApplyDto();
loanPreloanCreditApplyDto.setSid(dto.getSid());
loanPreloanCreditApplyDto.setCreateBySid(dto.getUserSid());
String[] publishInfos = dto.getPublishInfo().split("-");
loanPreloanCreditApplyDto.setApplyDeptName(publishInfos[0]);
loanPreloanCreditApplyDto.setCreateByName(publishInfos[1]);
SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.selectByOrgSidPath(dto.getOrgPath()).getData();
loanPreloanCreditApplyDto.setApplyDeptSid(sysOrganizationVoBM.getSid());
loanPreloanCreditApplyDto.setModelSid(dto.getModelSid());
loanPreloanCreditApplyDto.setModelName(dto.getModel());
loanPreloanCreditApplyDto.setCustTypeKey(dto.getCustomerTypeKey());
loanPreloanCreditApplyDto.setCustTypeValue(dto.getCustomerType());
loanPreloanCreditApplyDto.setQySid(dto.getCompanySid());
loanPreloanCreditApplyDto.setQyName(dto.getCompanyName());
loanPreloanCreditApplyDto.setIdCard(dto.getLegalPersonIdNumber());
loanPreloanCreditApplyDto.setCustSid(dto.getLegalPersonSid());
loanPreloanCreditApplyDto.setCustName(dto.getLegalPersonName());
loanPreloanCreditApplyDto.setPhone(dto.getLegalPersonMobile());
loanPreloanCreditApplyDto.setCapitalSid(dto.getManagementSid());
loanPreloanCreditApplyDto.setCapitalName(dto.getManagementName());
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
SysOrganizationVo sysOrganizationVoGS = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
loanPreloanCreditApplyDto.setUseOrgSid(useOrgSid);
loanPreloanCreditApplyDto.setUseOrgName(sysOrganizationVoGS.getName());
loanPreloanCreditApplyDto.setOrgSidPath(dto.getOrgPath());
loanPreloanCreditApplyDto.setGsfkjgKey("");
loanPreloanCreditApplyDto.setGsfkjg(dto.getExamineResult());
loanPreloanCreditApplyDto.setGsshDate(dto.getExamineDate());
loanPreloanCreditApplyDto.setGsshRemarks(dto.getExamineRemarks());
loanPreloanCreditApplyDto.setGsQueryResults(dto.getSearchResultImages());
loanPreloanCreditApplyDto.setZffkjgKey("");
loanPreloanCreditApplyDto.setZffkjg(dto.getExamineResult2());
loanPreloanCreditApplyDto.setZfshRemarks(dto.getExamineRemarks2());
loanPreloanCreditApplyDto.setZfQueryResults(dto.getSearchResultImages2());
//loanPreloanCreditApplyFeign.save()
return null;
}
}

Write Preview
Loading…
Cancel
Save