From e53d0321bcff867a2544950bf12c9924513715fa Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 25 Jul 2023 14:08:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=B7=E5=89=8D=E4=BF=A1=E7=94=A8=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=20=E4=BC=98=E5=8C=96=E5=B7=A5=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...FinSelectReceivablesDetailedWCKCLRKVo.java | 4 + .../FinSelectedReceivablesDetailed.java | 4 + .../FinSelectedReceivablesDetailedMapper.xml | 395 +++++++++--------- .../LoanPreloanCreditApplyVo.java | 11 +- .../LoanPreloanCreditApplyService.java | 13 +- .../creditreview/CreditReviewService.java | 27 +- 6 files changed, 245 insertions(+), 209 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedWCKCLRKVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedWCKCLRKVo.java index 272df0b47f..13622c5086 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedWCKCLRKVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedWCKCLRKVo.java @@ -45,4 +45,8 @@ public class FinSelectReceivablesDetailedWCKCLRKVo implements Vo { private String reveivableMoney; @ApiModelProperty("款项状态") private String state; + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailed.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailed.java index ae38b152ce..88fdd1a2a6 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailed.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailed.java @@ -100,4 +100,8 @@ public class FinSelectedReceivablesDetailed extends BaseEntity { private String kxState; private String selectSid; + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml index 093fc81a75..d6698ed9aa 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml @@ -25,52 +25,52 @@ SELECT sid, - contractNo AS contractId, - receivablesName AS projectName, - customerPhone AS mobile, - customerName AS `name`, - currentReceivableMoney AS receivable, - contractSid, - VIN AS vin, - furd.busVinSid, - furd.payType, - furd.payTypeKey, - furd.customerSid, - furd.useOrgSid, - furd.reveivableMoney + contractNo AS contractId, + receivablesName AS projectName, + customerPhone AS mobile, + customerName AS `name`, + currentReceivableMoney AS receivable, + contractSid, + VIN AS vin, + furd.busVinSid, + furd.payType, + furd.payTypeKey, + furd.customerSid, + furd.useOrgSid, + furd.reveivableMoney FROM fin_uncollected_receivables_detailed furd ${ew.sqlSegment} and concat(IFNULL(furd.customerName - , '') - , ifnull(furd.contractNo - , '')) LIKE concat('%' - , #{name} - , '%') + , '') + , ifnull(furd.contractNo + , '')) LIKE concat('%' + , #{name} + , '%') and length(furd.busVinSid) - >0 + >0 order by furd.contractNo desc @@ -156,7 +156,7 @@ resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo"> SELECT fsrd.subscriptionMoney FROM fin_selected_receivables_detailed fsrd - LEFT JOIN fin_collection_confirmation fcc ON fcc.sid = fsrd.collSid + LEFT JOIN fin_collection_confirmation fcc ON fcc.sid = fsrd.collSid WHERE fcc.paymentState = 1 @@ -172,16 +172,18 @@ 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)) 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 - WHERE d.auditState = #{state} and ff.busVinSid = #{busVinSid} and d.contractNo = #{contractNo} - GROUP BY d.`sid`) d + d.receivablesSid, + d.`collSid`, + d.auditState, + 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 + WHERE d.auditState = #{state} + and ff.busVinSid = #{busVinSid} + and d.contractNo = #{contractNo} + GROUP BY d.`sid`) d select fd.sid, - fd.receivablesSid, - fd.contractNo, - fd.customerSid, - fd.customerName, - fd.customerPhone, - fd.receivablesName, - fd.currentReceivableMoney, - furd.busVinSid, - furd.payType, - furd.payTypeKey, - fd.subscriptionMoney, - fd.useOrgSid, - fd.subscriptionDate + fd.receivablesSid, + fd.contractNo, + fd.customerSid, + fd.customerName, + fd.customerPhone, + fd.receivablesName, + fd.currentReceivableMoney, + furd.busVinSid, + furd.payType, + furd.payTypeKey, + fd.subscriptionMoney, + fd.useOrgSid, + fd.subscriptionDate from fin_selected_receivables_detailed fd - left join fin_uncollected_receivables_detailed furd on furd.sid = fd.receivablesSid + left join fin_uncollected_receivables_detailed furd on furd.sid = fd.receivablesSid ${ew.sqlSegment} - and fd.receivablesName != '订金' - and fd.auditState = 3 + and fd.receivablesName != '订金' + and fd.auditState = 3 and concat(IFNULL(fd.customerName - , '') - , ifnull(fd.contractNo - , '')) LIKE concat('%' - , #{name} - , '%') + , '') + , ifnull(fd.contractNo + , '')) LIKE concat('%' + , #{name} + , '%') @@ -365,61 +367,65 @@ select distinct fd.sid, - fd.receivablesSid, - fd.contractNo, - fd.customerSid, - fd.customerName, - fd.customerPhone, - fd.receivablesName, - fd.currentReceivableMoney, - cast((furd.`reveivableMoney` - COALESCE(df.dbalance, 0)) AS DECIMAL(10, 2)) AS dbalance, - if(fd.currentReceivableMoney <= 0, 0, - if(cast((fd.currentReceivableMoney - fd.subscriptionMoney) AS DECIMAL(10, 2)) <= 0, 0, - cast((fd.currentReceivableMoney - fd.subscriptionMoney) AS DECIMAL(10, 2)))) as reveivableMoney, - furd.busVinSid, - furd.payType, - furd.payTypeKey, - fd.subscriptionMoney, - fd.useOrgSid, - fd.subscriptionDate, - if(bv.linkNo is null or LENGTH(trim(bv.linkNo)) < 1, - if(furd.payTypeKey = 2, RIGHT(bv.temporaryNo, 2), bv.temporaryNo), - RIGHT(bv.linkNo, 8)) as VIN, - CURRENT_DATE() as confirmDate, - 1 as subscribedOf + fd.receivablesSid, + fd.contractNo, + fd.customerSid, + fd.customerName, + fd.customerPhone, + fd.receivablesName, + fd.currentReceivableMoney, + cast((furd.`reveivableMoney` - COALESCE(df.dbalance, 0)) AS DECIMAL(10, 2)) AS dbalance, + if(fd.currentReceivableMoney <= 0, 0, + if(cast((fd.currentReceivableMoney - fd.subscriptionMoney) AS DECIMAL(10, 2)) <= 0, 0, + cast((fd.currentReceivableMoney - fd.subscriptionMoney) AS DECIMAL(10, 2)))) as reveivableMoney, + furd.busVinSid, + furd.payType, + furd.payTypeKey, + fd.subscriptionMoney, + fd.useOrgSid, + fd.subscriptionDate, + if(bv.linkNo is null or LENGTH(trim(bv.linkNo)) < 1, + if(furd.payTypeKey = 2, RIGHT(bv.temporaryNo, 2), bv.temporaryNo), + RIGHT(bv.linkNo, 8)) as VIN, + CURRENT_DATE() as confirmDate, + 1 as subscribedOf from fin_selected_receivables_detailed fd - left join fin_uncollected_receivables_detailed furd on furd.sid = fd.receivablesSid - left join anrui_buscenter.bus_sales_order_vehicle bv on bv.sid = furd.busVinSid - LEFT JOIN (select sum(dbalance) as dbalance, d.receivablesSid - from (SELECT d.sid, - d.receivablesSid, - d.`collSid`, - 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` - WHERE (d.auditState = 1 OR d.auditState = 3) - GROUP BY d.`sid`) d - group by d.receivablesSid + left join fin_uncollected_receivables_detailed furd on furd.sid = fd.receivablesSid + left join anrui_buscenter.bus_sales_order_vehicle bv on bv.sid = furd.busVinSid + LEFT JOIN (select sum(dbalance) as dbalance, d.receivablesSid + from (SELECT d.sid, + d.receivablesSid, + d.`collSid`, + 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` + WHERE (d.auditState = 1 OR d.auditState = 3) + GROUP BY d.`sid`) d + group by d.receivablesSid ) df ON df.receivablesSid = furd.`sid` ${ew.sqlSegment} - and fd.receivablesName != '订金' - and fd.auditState = 3 + and fd.receivablesName != '订金' + and fd.auditState = 3 and concat(IFNULL(fd.customerName - , '') - , ifnull(fd.contractNo - , '') - , ifnull(bv.linkNo - , '')) LIKE concat('%' - , #{name} - , '%') + , '') + , ifnull(fd.contractNo + , '') + , ifnull(bv.linkNo + , '')) LIKE concat('%' + , #{name} + , '%') having dbalance <= 0 @@ -507,11 +513,11 @@ fsrd.`VIN`, fsrd.collSid, ( - fsrd.`subscriptionMoney` - COALESCE(SUM(ffc.`thisUseMoney`), 0) - ) AS balance + fsrd.`subscriptionMoney` - COALESCE(SUM(ffc.`thisUseMoney`), 0) + ) AS balance FROM fin_selected_receivables_detailed fsrd - LEFT JOIN `fin_funds_carried_forward_veh` ffc - ON ffc.`busSid` = fsrd.`sid` + LEFT JOIN `fin_funds_carried_forward_veh` ffc + ON ffc.`busSid` = fsrd.`sid` WHERE fsrd.`sid` = #{busSid} GROUP BY fsrd.sid @@ -524,10 +530,11 @@ d.`collSid`, d.auditState, 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 - 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 - GROUP BY d.`sid`) d WHERE d.receivablesSid = #{receivablesSid} + GROUP BY d.`sid`) d + WHERE d.receivablesSid = #{receivablesSid} \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyVo.java index a5cb4b429b..2eda3c94ed 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyVo.java @@ -40,6 +40,8 @@ public class LoanPreloanCreditApplyVo implements Vo { private String sid; + @ApiModelProperty("申请人+部门") + private String publishInfo; @ApiModelProperty("审核状态") private String state; @ApiModelProperty("分公司名称") @@ -66,8 +68,7 @@ public class LoanPreloanCreditApplyVo implements Vo { @ApiModelProperty("手机号码") private String phone; @ApiModelProperty("公司审核日期") - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private Date gsshDate; + private String gsshDate; @ApiModelProperty("公司风控结果key") private String gsfkjgKey; @ApiModelProperty("公司风控结果") @@ -82,4 +83,10 @@ public class LoanPreloanCreditApplyVo implements Vo { private Boolean isDelete; @ApiModelProperty("是否可以申诉") private Boolean isHandle; + @ApiModelProperty("是否显示修改审核后显示") + private Boolean showUpdateBtn; + @ApiModelProperty("是否显示删除 审核后不显示") + private Boolean showDeleteBtn; + @ApiModelProperty("是否显示申诉 审核后显示") + private Boolean showHandleBtn; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java index 56d2eb3abc..07da63e0f6 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java @@ -152,16 +152,23 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java index db0267008f..748b5f48c4 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java @@ -40,6 +40,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.Collections; +import java.util.Date; import java.util.List; /** @@ -85,7 +86,7 @@ public class CreditReviewService { creditReviewVo.setMobile(record.getPhone()); creditReviewVo.setModel(record.getModelName()); creditReviewVo.setManagement(record.getCapitalName()); - creditReviewVo.setExamineDate(DateUtil.formatDate(record.getGsshDate())); + creditReviewVo.setExamineDate(record.getGsshDate()); creditReviewVo.setCompanyResults(record.getGsfkjg()); creditReviewVo.setManagementResults(record.getZffkjg()); creditReviewVo.setShowDeleteBtn(record.getIsDelete()); @@ -108,6 +109,9 @@ public class CreditReviewService { 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 {//修改回显 LoanPreloanCreditApplyDetailsVo loanPreloanCreditApplyDetailsVo = loanPreloanCreditApplyFeign.fetchDetailsBySid(query.getSid()).getData(); creditReviewDetailsVo.setSid(loanPreloanCreditApplyDetailsVo.getSid()); @@ -150,26 +154,29 @@ public class CreditReviewService { } //构建人员类型下拉选数据 List identityDetailsVos = new ArrayList<>(); - IdentityDetailsVo identityDetailsVo = new IdentityDetailsVo(); if ("1".equals(query.getCustomerTypeKey())){ + IdentityDetailsVo identityDetailsVo = new IdentityDetailsVo(); identityDetailsVo.setSid("003"); identityDetailsVo.setDictKey("003"); identityDetailsVo.setDictValue("担保人"); identityDetailsVos.add(identityDetailsVo); }else { + IdentityDetailsVo identityDetailsVo = new IdentityDetailsVo(); identityDetailsVo.setSid("001"); identityDetailsVo.setDictKey("001"); identityDetailsVo.setDictValue("股东"); identityDetailsVos.add(identityDetailsVo); } - identityDetailsVo.setSid("002"); - identityDetailsVo.setDictKey("002"); - identityDetailsVo.setDictValue("配偶"); - identityDetailsVos.add(identityDetailsVo); - identityDetailsVo.setSid("004"); - identityDetailsVo.setDictKey("004"); - identityDetailsVo.setDictValue("其他"); - identityDetailsVos.add(identityDetailsVo); + IdentityDetailsVo identityDetailsVo1 = new IdentityDetailsVo(); + identityDetailsVo1.setSid("002"); + identityDetailsVo1.setDictKey("002"); + identityDetailsVo1.setDictValue("配偶"); + identityDetailsVos.add(identityDetailsVo1); + IdentityDetailsVo identityDetailsVo2 = new IdentityDetailsVo(); + identityDetailsVo2.setSid("004"); + identityDetailsVo2.setDictKey("004"); + identityDetailsVo2.setDictValue("其他"); + identityDetailsVos.add(identityDetailsVo2); creditReviewDetailsVo.setIdentity(identityDetailsVos); return rb.success().setData(creditReviewDetailsVo); }