diff --git a/anrui-riskcenter-ui/src/api/returntostorage/returntostorage.js b/anrui-riskcenter-ui/src/api/returntostorage/returntostorage.js index ada094603c..5a71a3da45 100644 --- a/anrui-riskcenter-ui/src/api/returntostorage/returntostorage.js +++ b/anrui-riskcenter-ui/src/api/returntostorage/returntostorage.js @@ -41,6 +41,13 @@ export default { headers: { 'Content-Type': 'application/json' } }) }, + createPdf: function(data) { + return request({ + url: '/riskcenter/v1/LoanReturnInboundApply/createPdf', + method: 'post', + params: data + }) + }, // 提交流程 submit: function(params) { return request({ diff --git a/anrui-riskcenter-ui/src/api/returntothewarehouse/returntothewarehouse.js b/anrui-riskcenter-ui/src/api/returntothewarehouse/returntothewarehouse.js index 897af26b63..8f58fb9390 100644 --- a/anrui-riskcenter-ui/src/api/returntothewarehouse/returntothewarehouse.js +++ b/anrui-riskcenter-ui/src/api/returntothewarehouse/returntothewarehouse.js @@ -25,6 +25,13 @@ export default { params: data }) }, + createPdf: function(data) { + return request({ + url: '/riskcenter/v1/loanoutboundapply/createPdf', + method: 'post', + params: data + }) + }, // 提交流程 submit: function(params) { return request({ diff --git a/anrui-riskcenter-ui/src/api/secondarysalesnotrecovery/secondarysalesnotrecovery.js b/anrui-riskcenter-ui/src/api/secondarysalesnotrecovery/secondarysalesnotrecovery.js index b2ca367fc9..b7f750b0ed 100644 --- a/anrui-riskcenter-ui/src/api/secondarysalesnotrecovery/secondarysalesnotrecovery.js +++ b/anrui-riskcenter-ui/src/api/secondarysalesnotrecovery/secondarysalesnotrecovery.js @@ -40,6 +40,13 @@ export default { headers: { 'Content-Type': 'application/json' } }) }, + createPdf: function(data) { + return request({ + url: '/riskcenter/v1/loansecondarysalesnotapply/createPdf', + method: 'post', + params: data + }) + }, // 提交流程 submit: function(params) { return request({ diff --git a/anrui-riskcenter-ui/src/views/returntostorage/returntostorage.vue b/anrui-riskcenter-ui/src/views/returntostorage/returntostorage.vue index 4421841cd8..c918cfe43e 100644 --- a/anrui-riskcenter-ui/src/views/returntostorage/returntostorage.vue +++ b/anrui-riskcenter-ui/src/views/returntostorage/returntostorage.vue @@ -74,6 +74,7 @@ @@ -458,6 +459,32 @@ export default { this.viewState = 4 this.$refs['divInfo'].showInfo(row) }, + toDownload(row) { + req.createPdf({ sid: row.sid, userName: window.sessionStorage.getItem('name') }).then((res) => { + if (res.success) { + var xhr = new XMLHttpRequest() + xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + res.data + '&outFileName=' + '交回车辆入库申请单', true) + xhr.setRequestHeader('token', getStorage()) + xhr.responseType = 'blob' + xhr.onload = function(e) { + // 如果请求执行成功 + var blob = this.response + var filename = '交回车辆入库申请单.pdf' + var a = document.createElement('a') + // blob.type="application/octet-stream"; + // 创键临时url对象 + var url = URL.createObjectURL(blob) + a.href = url + a.download = filename + a.click() + // 释放之前创建的URL对象 + window.URL.revokeObjectURL(url) + } + // 发送请求 + xhr.send() + } + }).catch(() => {}) + }, // 删除 doDel() { if (this.sids.length === 0) { diff --git a/anrui-riskcenter-ui/src/views/returntothewarehouse/returntothewarehouse.vue b/anrui-riskcenter-ui/src/views/returntothewarehouse/returntothewarehouse.vue index 17bf0bccda..f7b98647c3 100644 --- a/anrui-riskcenter-ui/src/views/returntothewarehouse/returntothewarehouse.vue +++ b/anrui-riskcenter-ui/src/views/returntothewarehouse/returntothewarehouse.vue @@ -79,6 +79,7 @@ @@ -338,6 +339,32 @@ export default { this.viewState = 4 this.$refs['divInfo'].showInfo(row) }, + toDownload(row) { + req.createPdf({ sid: row.sid, userName: window.sessionStorage.getItem('name') }).then((res) => { + if (res.success) { + var xhr = new XMLHttpRequest() + xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + res.data + '&outFileName=' + '交回车辆出库申请单', true) + xhr.setRequestHeader('token', getStorage()) + xhr.responseType = 'blob' + xhr.onload = function(e) { + // 如果请求执行成功 + var blob = this.response + var filename = '交回车辆出库申请单.pdf' + var a = document.createElement('a') + // blob.type="application/octet-stream"; + // 创键临时url对象 + var url = URL.createObjectURL(blob) + a.href = url + a.download = filename + a.click() + // 释放之前创建的URL对象 + window.URL.revokeObjectURL(url) + } + // 发送请求 + xhr.send() + } + }).catch(() => {}) + }, // 修改、编辑、详情返回列表页面 resetState() { this.viewState = 1 diff --git a/anrui-riskcenter-ui/src/views/secondarysales/secondarysalesAdd.vue b/anrui-riskcenter-ui/src/views/secondarysales/secondarysalesAdd.vue index 64732c5f79..0fdf51a0d0 100644 --- a/anrui-riskcenter-ui/src/views/secondarysales/secondarysalesAdd.vue +++ b/anrui-riskcenter-ui/src/views/secondarysales/secondarysalesAdd.vue @@ -524,45 +524,45 @@ export default { this.formobj.loanSecondarySalesCost.otherCostAssume = '' } }, - // 计算预计亏损金额 = 欠款合计 - 贷款保证金 - 车辆售价 - 催收费用 - 承担方为公司的各项费用 + // 计算预计亏损金额 = 欠款合计 - 贷款保证金 - 车辆售价 + 催收费用 + 承担方为公司的各项费用 lossPrice() { let money = '0' - money = parseFloat(this.formobj.loanSecondarySalesCost.arrearsAll) - parseFloat(this.formobj.loanSecondarySalesCost.loanDeposit) + money = Math.round((parseFloat(this.formobj.loanSecondarySalesCost.arrearsAll) - parseFloat(this.formobj.loanSecondarySalesCost.loanDeposit)) * 100) / 100 // 车辆售价不等于空 if (this.formobj.loanSecondarySalesCost.vehPrice !== '') { - money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.vehPrice) + money = Math.round((parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.vehPrice)) * 100) / 100 } // 催收费用不等于空 if (this.formobj.loanSecondarySalesCost.collectionCost !== '') { - money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.collectionCost) + money = Math.round((parseFloat(money) + parseFloat(this.formobj.loanSecondarySalesCost.collectionCost)) * 100) / 100 } // 资方结清费用不等于空且承担方为公司 if (this.formobj.loanSecondarySalesCost.bankSettleCost !== '' && this.formobj.loanSecondarySalesCost.bankSettleCostAssume === '公司') { - money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.bankSettleCost) + money = Math.round((parseFloat(money) + parseFloat(this.formobj.loanSecondarySalesCost.bankSettleCost)) * 100) / 100 } // 车辆违章费用不等于空且承担方为公司 if (this.formobj.loanSecondarySalesCost.vehicleViolationCost !== '' && this.formobj.loanSecondarySalesCost.vehicleViolationCostAssume === '公司') { - money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.vehicleViolationCost) + money = Math.round((parseFloat(money) + parseFloat(this.formobj.loanSecondarySalesCost.vehicleViolationCost)) * 100) / 100 } // 年检费不等于空且承担方为公司 if (this.formobj.loanSecondarySalesCost.inspectYearCost !== '' && this.formobj.loanSecondarySalesCost.inspectYearCostAssume === '公司') { - money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.inspectYearCost) + money = Math.round((parseFloat(money) + parseFloat(this.formobj.loanSecondarySalesCost.inspectYearCost)) * 100) / 100 } // 保险费不等于空且承担方为公司 if (this.formobj.loanSecondarySalesCost.insureCost !== '' && this.formobj.loanSecondarySalesCost.insureCostAssume === '公司') { - money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.insureCost) + money = Math.round((parseFloat(money) + parseFloat(this.formobj.loanSecondarySalesCost.insureCost)) * 100) / 100 } // 过户费不等于空且承担方为公司 if (this.formobj.loanSecondarySalesCost.ownershipCost !== '' && this.formobj.loanSecondarySalesCost.ownershipCostAssume === '公司') { - money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.ownershipCost) + money = Math.round((parseFloat(money) + parseFloat(this.formobj.loanSecondarySalesCost.ownershipCost)) * 100) / 100 } // 停车费不等于空且承担方为公司 if (this.formobj.loanSecondarySalesCost.stopCost !== '' && this.formobj.loanSecondarySalesCost.stopCostAssume === '公司') { - money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.stopCost) + money = Math.round((parseFloat(money) + parseFloat(this.formobj.loanSecondarySalesCost.stopCost)) * 100) / 100 } // 其他费用不等于空且承担方为公司 if (this.formobj.loanSecondarySalesCost.otherCost !== '' && this.formobj.loanSecondarySalesCost.otherCostAssume === '公司') { - money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.otherCost) + money = Math.round((parseFloat(money) + parseFloat(this.formobj.loanSecondarySalesCost.otherCost)) * 100) / 100 } this.formobj.loanSecondarySalesCost.lossPrice = money return money diff --git a/anrui-riskcenter-ui/src/views/secondarysalesnotrecovery/secondarysalesnotrecovery.vue b/anrui-riskcenter-ui/src/views/secondarysalesnotrecovery/secondarysalesnotrecovery.vue index 44880873d7..ce880a18ab 100644 --- a/anrui-riskcenter-ui/src/views/secondarysalesnotrecovery/secondarysalesnotrecovery.vue +++ b/anrui-riskcenter-ui/src/views/secondarysalesnotrecovery/secondarysalesnotrecovery.vue @@ -66,6 +66,7 @@ @@ -323,6 +324,32 @@ export default { this.viewState = 4 this.$refs['divInfo'].showInfo(row) }, + toDownload(row) { + req.createPdf({ sid: row.sid, userName: window.sessionStorage.getItem('name') }).then((res) => { + if (res.success) { + var xhr = new XMLHttpRequest() + xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + res.data + '&outFileName=' + '二次销售车辆不追偿申请单', true) + xhr.setRequestHeader('token', getStorage()) + xhr.responseType = 'blob' + xhr.onload = function(e) { + // 如果请求执行成功 + var blob = this.response + var filename = '二次销售车辆不追偿申请单.pdf' + var a = document.createElement('a') + // blob.type="application/octet-stream"; + // 创键临时url对象 + var url = URL.createObjectURL(blob) + a.href = url + a.download = filename + a.click() + // 释放之前创建的URL对象 + window.URL.revokeObjectURL(url) + } + // 发送请求 + xhr.send() + } + }).catch(() => {}) + }, // 删除 doDel() { if (this.sids.length === 0) { diff --git a/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesEdit.vue b/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesEdit.vue index 3aa3fa6323..7a14600598 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesEdit.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesEdit.vue @@ -542,45 +542,45 @@ export default { this.formobj.loanSecondarySalesCost.otherCostAssume = '' } }, - // 计算预计亏损金额 = 欠款合计 - 贷款保证金 - 车辆售价 - 催收费用 - 承担方为公司的各项费用 + // 计算预计亏损金额 = 欠款合计 - 贷款保证金 - 车辆售价 + 催收费用 + 承担方为公司的各项费用 lossPrice() { let money = '0' - money = parseFloat(this.formobj.loanSecondarySalesCost.arrearsAll) - parseFloat(this.formobj.loanSecondarySalesCost.loanDeposit) + money = Math.round((parseFloat(this.formobj.loanSecondarySalesCost.arrearsAll) - parseFloat(this.formobj.loanSecondarySalesCost.loanDeposit)) * 100) / 100 // 车辆售价不等于空 if (this.formobj.loanSecondarySalesCost.vehPrice !== '') { - money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.vehPrice) + money = Math.round((parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.vehPrice)) * 100) / 100 } // 催收费用不等于空 if (this.formobj.loanSecondarySalesCost.collectionCost !== '') { - money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.collectionCost) + money = Math.round((parseFloat(money) + parseFloat(this.formobj.loanSecondarySalesCost.collectionCost)) * 100) / 100 } // 资方结清费用不等于空且承担方为公司 if (this.formobj.loanSecondarySalesCost.bankSettleCost !== '' && this.formobj.loanSecondarySalesCost.bankSettleCostAssume === '公司') { - money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.bankSettleCost) + money = Math.round((parseFloat(money) + parseFloat(this.formobj.loanSecondarySalesCost.bankSettleCost)) * 100) / 100 } // 车辆违章费用不等于空且承担方为公司 if (this.formobj.loanSecondarySalesCost.vehicleViolationCost !== '' && this.formobj.loanSecondarySalesCost.vehicleViolationCostAssume === '公司') { - money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.vehicleViolationCost) + money = Math.round((parseFloat(money) + parseFloat(this.formobj.loanSecondarySalesCost.vehicleViolationCost)) * 100) / 100 } // 年检费不等于空且承担方为公司 if (this.formobj.loanSecondarySalesCost.inspectYearCost !== '' && this.formobj.loanSecondarySalesCost.inspectYearCostAssume === '公司') { - money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.inspectYearCost) + money = Math.round((parseFloat(money) + parseFloat(this.formobj.loanSecondarySalesCost.inspectYearCost)) * 100) / 100 } // 保险费不等于空且承担方为公司 if (this.formobj.loanSecondarySalesCost.insureCost !== '' && this.formobj.loanSecondarySalesCost.insureCostAssume === '公司') { - money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.insureCost) + money = Math.round((parseFloat(money) + parseFloat(this.formobj.loanSecondarySalesCost.insureCost)) * 100) / 100 } // 过户费不等于空且承担方为公司 if (this.formobj.loanSecondarySalesCost.ownershipCost !== '' && this.formobj.loanSecondarySalesCost.ownershipCostAssume === '公司') { - money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.ownershipCost) + money = Math.round((parseFloat(money) + parseFloat(this.formobj.loanSecondarySalesCost.ownershipCost)) * 100) / 100 } // 停车费不等于空且承担方为公司 if (this.formobj.loanSecondarySalesCost.stopCost !== '' && this.formobj.loanSecondarySalesCost.stopCostAssume === '公司') { - money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.stopCost) + money = Math.round((parseFloat(money) + parseFloat(this.formobj.loanSecondarySalesCost.stopCost)) * 100) / 100 } // 其他费用不等于空且承担方为公司 if (this.formobj.loanSecondarySalesCost.otherCost !== '' && this.formobj.loanSecondarySalesCost.otherCostAssume === '公司') { - money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.otherCost) + money = Math.round((parseFloat(money) + parseFloat(this.formobj.loanSecondarySalesCost.otherCost)) * 100) / 100 } this.formobj.loanSecondarySalesCost.lossPrice = money return money diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml index a5d60ab813..6c4f08cf6d 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml @@ -18,14 +18,6 @@ a1.dueMoney AS bankMonthRep, MIN(a1.dueDate) AS firstBeDate, -- 改为取最早逾期日期 COUNT(a1.sid) AS beOverduePeriod, - ROUND(SUM(a1.yq_total) + - COALESCE(lbpv_sum.bankBeInter_sum, 0) + - CAST(COALESCE(lfd_sum.fund_sum, 0) AS DECIMAL(10,2)),2) AS beOverdueMoney, - ROUND( - (SUM(a1.yq_total) + COALESCE(lbpv_sum.bankBeInter_sum, 0) + COALESCE(lfd_sum.fund_sum, 0)) / - MAX(a1.qjyh), -- 保证聚合正确性 - 2 - ) AS beOverdueMoneyAndPeriod, SUM(a1.yd_dkje) AS advMoney, SUM(a1.yd_zjzyf) AS fundPossCostMoney, MAX(a1.riskStaffUserSid) AS riskStaffUserSid, -- 保证聚合正确性 @@ -90,41 +82,9 @@ WHERE lbca.collMeasure LIKE '%远程控制%' AND lbca.nodeState = '已办结' ) lbcv ON lbcv.saleVehSid = lrpd.busVinSid AND lbcv.rn = 1 - WHERE lrpd.dueDate <= lrpd.updateTime -- 移除DATE_FORMAT函数 + WHERE lrpd.dueDate <= lrpd.updateTime GROUP BY lrpd.sid ) a1 - LEFT JOIN ( - SELECT - saleVehSid, - SUM(bankBeInter) AS bankBeInter_sum - FROM loan_be_padsincere_veh - GROUP BY saleVehSid - ) lbpv_sum ON lbpv_sum.saleVehSid = a1.busVinSid - LEFT JOIN ( - SELECT - lp.busVinSid, - SUM(fjj.reveivableMoney - fjj.m) AS fund_sum - FROM ( - SELECT - IFNULL(( - SELECT SUM(subscriptionMoney) - FROM anrui_fin.fin_selected_receivables_detailed s - WHERE s.auditState = '3' - AND s.receivablesSid = fj.sid - ), 0) AS m, - fj.* - FROM ( - SELECT j.busSid, j.sid, j.reveivableMoney - FROM anrui_fin.fin_uncollected_receivables_detailed_jr j - WHERE j.payCostTitleKey = '006' - ) fj - ) fjj - LEFT JOIN loan_repayment_plan_details lp - ON lp.sid = fjj.busSid - WHERE lp.dueDate <= lp.updateTime - AND lp.busVinSid IS NOT NULL - GROUP BY lp.busVinSid - ) lfd_sum ON lfd_sum.busVinSid = a1.busVinSid ${ew.sqlSegment} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java index 2127840d12..4baad41b19 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java @@ -8,6 +8,8 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecordVehInit; import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.*; +import com.yxt.anrui.riskcenter.api.loanrestorereportapply.AlrepaidAndArrVo; +import com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -26,6 +28,8 @@ public class LoanBeOverdueVehService { private SysUserFeign sysUserFeign; @Autowired private LoanBeOverdueVehMapper loanBeOverdueVehMapper; + @Autowired + private LoanRestoreReportApplyService loanRestoreReportApplyService; public PagerVo listPageVo(PagerQuery pq) { LoanBeOverdueVehQuery query = pq.getParams(); @@ -127,6 +131,11 @@ public class LoanBeOverdueVehService { qw.having("beOverdueMoney > {0}", 0); IPage page = PagerUtil.queryToPage(pq); IPage pagging = loanBeOverdueVehMapper.selectPageVo(page, qw); + for (LoanBeOverdueVehVo record : pagging.getRecords()) { + AlrepaidAndArrVo alrepaidAndArr2 = loanRestoreReportApplyService.getAlrepaidAndArr2(record.getSaleVehSid()); + record.setBeOverdueMoney(alrepaidAndArr2.getCurrentBeMoney()); + record.setBeOverdueMoneyAndPeriod(alrepaidAndArr2.getBeOverdueMoneyAndPeriod()); + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyMapper.xml index 789aa9c160..eddbc8042e 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyMapper.xml @@ -114,6 +114,7 @@ la.createDeptSid, la.createByName, DATE_FORMAT(la.createTime, '%Y-%m-%d') as createDate, + la.billNo, la.vinNo, la.vinSid, la.vehMark, diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java index 537439ee8a..cd03bc0743 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java @@ -1009,7 +1009,9 @@ public class LoanReturnInboundApplyService extends MybatisBaseService - - - + + + - - UPDATE loan_secondary_sales_not_apply - SET nodeState=#{nodeState} - - , taskDefKey=#{taskDefKey} - - - , closeDate = NOW() - - - , procDefId=#{procDefId} - - - , procInstId=#{procInsId} - - - , taskId=#{taskId} - - WHERE sid = #{sid} - + + UPDATE loan_secondary_sales_not_apply + SET nodeState=#{nodeState} + + , taskDefKey=#{taskDefKey} + + + , closeDate = NOW() + + + , procDefId=#{procDefId} + + + , procInstId=#{procInsId} + + + , taskId=#{taskId} + + WHERE sid = #{sid} + - + - + SELECT COUNT(*) + FROM loan_secondary_sales_not_apply + WHERE nodeState != '待提交' and find_in_set(sid, #{list}) \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotapply/LoanSecondarySalesNotApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotapply/LoanSecondarySalesNotApplyService.java index 0053bb57da..97ae1e5d07 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotapply/LoanSecondarySalesNotApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotapply/LoanSecondarySalesNotApplyService.java @@ -754,9 +754,9 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService loanSecondarySalesNotApplyPdfVos = new ArrayList<>(); @@ -780,7 +780,7 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService flowRecordVo = flowableFeignSp.flowRecordAndComment(data.getProcInstId(), "1").getData(); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/bzc.ftl b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/bzc.ftl index 2d712b03aa..568a1d81d3 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/bzc.ftl +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/bzc.ftl @@ -1837,7 +1837,7 @@ - ${finshTime!} + ${finishTime!} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/jhclck.ftl b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/jhclck.ftl index 63ff6bbf5e..0dece7fb2b 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/jhclck.ftl +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/jhclck.ftl @@ -30,16 +30,16 @@ 10745413@qq.com 10745413@qq.com 2 - 0 + 1 2025-05-07T03:30:00Z - 2025-05-07T03:38:00Z - 2025-05-07T03:38:00Z + 2025-05-07T08:59:00Z + 2025-05-07T08:59:00Z 1 - 105 - 294 - 42 + 103 + 292 + 41 49 - 350 + 346 16 @@ -1150,6 +1150,7 @@ + @@ -1169,7 +1170,7 @@ - + @@ -1182,7 +1183,7 @@ - + @@ -1197,7 +1198,7 @@ - + @@ -1210,7 +1211,7 @@ - + @@ -1244,7 +1245,10 @@ + + + @@ -1253,10 +1257,8 @@ - - @@ -1269,9 +1271,11 @@ + + @@ -1279,7 +1283,6 @@ - @@ -1287,10 +1290,10 @@ - + @@ -1308,27 +1311,28 @@ - - + + + + - - - - - - + + + + + + + - - + - - - - - + + + + - + @@ -1336,7 +1340,7 @@ - + @@ -1378,15 +1382,15 @@ - + - - + + @@ -1427,8 +1431,8 @@ - - + + @@ -1473,13 +1477,14 @@ + 　 - - + + @@ -1520,8 +1525,8 @@ - - + + @@ -1566,13 +1571,13 @@ + 　 - - + @@ -1613,8 +1618,8 @@ - - + + @@ -1653,15 +1658,15 @@ - + - - + + @@ -1702,8 +1707,8 @@ - - + + @@ -1748,13 +1753,14 @@ + 　 - - + + @@ -1795,8 +1801,8 @@ - - + + @@ -1830,7 +1836,7 @@ - ${finshTime!} + ${finishTime!} @@ -1841,13 +1847,13 @@ + 　 - - + @@ -1888,8 +1894,8 @@ - - + + @@ -1934,11 +1940,12 @@ + 　 - + @@ -1946,7 +1953,7 @@ - + @@ -1987,7 +1994,7 @@ - + @@ -2026,7 +2033,7 @@ - + @@ -2066,7 +2073,7 @@ - + @@ -2104,7 +2111,7 @@ - + @@ -2112,7 +2119,7 @@ - + @@ -2154,7 +2161,7 @@ - + @@ -2196,7 +2203,7 @@ - + @@ -2237,7 +2244,7 @@ - + @@ -2277,7 +2284,7 @@ - + @@ -2318,6 +2325,7 @@ + @@ -2355,7 +2363,7 @@ - + @@ -2363,7 +2371,7 @@ - + @@ -2405,7 +2413,7 @@ - + @@ -2443,7 +2451,7 @@ - + @@ -2451,7 +2459,7 @@ - + @@ -2490,14 +2498,14 @@ - + - + @@ -2538,8 +2546,8 @@ - - + + @@ -2579,8 +2587,8 @@ - - + + @@ -2620,8 +2628,8 @@ - - + + @@ -2661,8 +2669,8 @@ - - + + @@ -2702,8 +2710,7 @@ - - + @@ -2743,14 +2750,14 @@ <#list wlList as wl> - + - + @@ -2759,7 +2766,7 @@ - + @@ -2791,8 +2798,8 @@ - - + + @@ -2800,7 +2807,7 @@ - + @@ -2831,8 +2838,8 @@ - - + + @@ -2840,7 +2847,7 @@ - + @@ -2871,8 +2878,8 @@ - - + + @@ -2880,7 +2887,7 @@ - + @@ -2911,8 +2918,8 @@ - - + + @@ -2920,13 +2927,13 @@ - + + wsp:rsidP="002D070C"> - + @@ -2951,8 +2958,7 @@ - - + @@ -2960,7 +2966,7 @@ - + @@ -2991,7 +2997,7 @@ - + @@ -3000,6 +3006,7 @@ + @@ -3043,7 +3050,7 @@ - + - + @@ -3159,7 +3166,7 @@ <#list lcList as lc> <#if (lc_index>0)> - + @@ -3168,6 +3175,7 @@ + @@ -3200,7 +3208,7 @@ - + @@ -3271,7 +3279,7 @@ - + @@ -3317,7 +3325,7 @@ - + @@ -3325,7 +3333,7 @@ - + @@ -3365,7 +3373,7 @@ - + @@ -3402,7 +3410,7 @@ - + @@ -3440,7 +3448,7 @@ - + diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/jhclrk.ftl b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/jhclrk.ftl index e3b9ae0dec..2c92fabb9c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/jhclrk.ftl +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/jhclrk.ftl @@ -30,10 +30,10 @@ 10745413@qq.com 10745413@qq.com 2 - 0 + 1 2025-05-07T01:09:00Z - 2025-05-07T01:38:00Z - 2025-05-07T01:38:00Z + 2025-05-07T09:33:00Z + 2025-05-07T09:33:00Z 1 180 405 @@ -1169,7 +1169,7 @@ - + @@ -1182,7 +1182,7 @@ - + @@ -1197,7 +1197,7 @@ - + @@ -1210,7 +1210,7 @@ - + @@ -1239,12 +1239,12 @@ + - @@ -1254,6 +1254,7 @@ + @@ -1261,6 +1262,7 @@ + @@ -1269,8 +1271,8 @@ + - @@ -1279,6 +1281,8 @@ + + @@ -1290,8 +1294,10 @@ + + @@ -1305,7 +1311,7 @@ - + @@ -1316,29 +1322,28 @@ - - + + - - + - + - + - - + + @@ -1380,7 +1385,7 @@ - + @@ -1513,7 +1518,7 @@ - + @@ -1594,7 +1599,7 @@ - + @@ -1634,7 +1639,7 @@ - + @@ -1767,7 +1772,7 @@ - + @@ -1801,7 +1806,7 @@ - ${finshTime!} + ${finishTime!} @@ -1848,7 +1853,7 @@ - + @@ -1888,7 +1893,7 @@ - + @@ -1907,10 +1912,10 @@ - + - + @@ -1947,10 +1952,10 @@ - + - + @@ -1975,7 +1980,7 @@ - + @@ -1986,10 +1991,10 @@ - + - + @@ -2015,7 +2020,7 @@ - + @@ -2027,10 +2032,10 @@ + wsp:rsidP="00000DFF"> - + @@ -2055,8 +2060,8 @@ - - + + @@ -2066,10 +2071,10 @@ - + - + @@ -2107,10 +2112,10 @@ + wsp:rsidP="00000DFF"> - + @@ -2134,7 +2139,7 @@ - + @@ -2153,10 +2158,10 @@ - + - + @@ -2182,7 +2187,7 @@ - + @@ -2194,10 +2199,10 @@ + wsp:rsidP="00000DFF"> - + @@ -2222,8 +2227,8 @@ - - + + @@ -2233,10 +2238,10 @@ - + - + @@ -2274,10 +2279,10 @@ + wsp:rsidP="00000DFF"> - + @@ -2301,7 +2306,7 @@ - + @@ -2321,10 +2326,10 @@ + wsp:rsidP="00000DFF"> - + @@ -2362,10 +2367,10 @@ + wsp:rsidP="00000DFF"> - + @@ -2392,7 +2397,7 @@ - + @@ -2404,10 +2409,10 @@ + wsp:rsidP="00000DFF"> - + @@ -2433,7 +2438,7 @@ - + @@ -2445,10 +2450,10 @@ + wsp:rsidP="00000DFF"> - + @@ -2473,8 +2478,8 @@ - - + + @@ -2485,10 +2490,10 @@ + wsp:rsidP="00000DFF"> - + @@ -2526,10 +2531,10 @@ + wsp:rsidP="00000DFF"> - + @@ -2553,7 +2558,7 @@ - + @@ -2573,10 +2578,10 @@ + wsp:rsidP="00000DFF"> - + @@ -2614,10 +2619,10 @@ + wsp:rsidP="00000DFF"> - + @@ -2642,7 +2647,7 @@ - + @@ -2654,10 +2659,10 @@ + wsp:rsidP="00000DFF"> - + @@ -2683,7 +2688,7 @@ - + @@ -2695,10 +2700,10 @@ + wsp:rsidP="00000DFF"> - + @@ -2723,8 +2728,8 @@ - - + + @@ -2735,10 +2740,10 @@ + wsp:rsidP="00000DFF"> - + @@ -2776,10 +2781,10 @@ + wsp:rsidP="00000DFF"> - + @@ -2803,7 +2808,7 @@ - + @@ -2822,10 +2827,10 @@ - + - + @@ -2862,10 +2867,10 @@ - + - + @@ -2890,7 +2895,7 @@ - + @@ -2901,10 +2906,10 @@ - + - + @@ -2930,8 +2935,8 @@ - - + + @@ -2941,10 +2946,10 @@ - + - + @@ -2968,7 +2973,7 @@ - + @@ -2976,7 +2981,7 @@ - + @@ -2988,10 +2993,10 @@ + wsp:rsidP="00000DFF"> - + @@ -3015,7 +3020,7 @@ - + @@ -3035,10 +3040,10 @@ + wsp:rsidP="00000DFF"> - + @@ -3076,10 +3081,10 @@ + wsp:rsidP="00000DFF"> - + @@ -3104,7 +3109,7 @@ - + @@ -3116,10 +3121,10 @@ + wsp:rsidP="00000DFF"> - + @@ -3145,7 +3150,7 @@ - + @@ -3157,10 +3162,10 @@ + wsp:rsidP="00000DFF"> - + @@ -3185,8 +3190,8 @@ - - + + @@ -3197,10 +3202,10 @@ + wsp:rsidP="00000DFF"> - + @@ -3238,10 +3243,10 @@ + wsp:rsidP="00000DFF"> - + @@ -3265,7 +3270,7 @@ - + @@ -3285,10 +3290,10 @@ + wsp:rsidP="00000DFF"> - + @@ -3326,10 +3331,10 @@ + wsp:rsidP="00000DFF"> - + @@ -3354,7 +3359,7 @@ - + @@ -3366,10 +3371,10 @@ + wsp:rsidP="00000DFF"> - + @@ -3395,8 +3400,8 @@ - - + + @@ -3407,10 +3412,10 @@ + wsp:rsidP="00000DFF"> - + @@ -3434,15 +3439,15 @@ - + - - + + @@ -3454,10 +3459,10 @@ + wsp:rsidP="00000DFF"> - + @@ -3481,7 +3486,7 @@ - + @@ -3501,10 +3506,10 @@ + wsp:rsidP="00000DFF"> - + @@ -3542,10 +3547,10 @@ + wsp:rsidP="00000DFF"> - + @@ -3581,10 +3586,10 @@ + wsp:rsidP="00000DFF"> - + @@ -3611,7 +3616,7 @@ - + @@ -3622,10 +3627,10 @@ + wsp:rsidP="00000DFF"> - + @@ -3662,10 +3667,10 @@ + wsp:rsidP="00000DFF"> - + @@ -3691,7 +3696,7 @@ - + @@ -3702,10 +3707,10 @@ + wsp:rsidP="00000DFF"> - + @@ -3730,7 +3735,7 @@ - + @@ -3750,10 +3755,10 @@ + wsp:rsidP="00000DFF"> - + @@ -3790,10 +3795,10 @@ - + - + @@ -3828,10 +3833,10 @@ + wsp:rsidP="00000DFF"> - + @@ -3858,7 +3863,7 @@ - + @@ -3869,10 +3874,10 @@ + wsp:rsidP="00000DFF"> - + @@ -3909,10 +3914,10 @@ + wsp:rsidP="00000DFF"> - + @@ -3938,7 +3943,7 @@ - + @@ -3948,10 +3953,10 @@ - + - + @@ -3973,7 +3978,7 @@ - + @@ -3993,10 +3998,10 @@ + wsp:rsidP="00000DFF"> - + @@ -4022,8 +4027,8 @@ - - + + @@ -4034,10 +4039,10 @@ + wsp:rsidP="00000DFF"> - + @@ -4061,7 +4066,7 @@ - + @@ -4121,7 +4126,7 @@ - + @@ -4182,8 +4187,8 @@ - - + + @@ -4192,7 +4197,7 @@ - + @@ -4229,7 +4234,7 @@ <#list lcList as lc> <#if (lc_index>0)> - + @@ -4279,7 +4284,7 @@ - + @@ -4340,8 +4345,8 @@ - - + + @@ -4352,7 +4357,7 @@ w:color="156082"/> - + @@ -4387,7 +4392,7 @@ - + @@ -4509,8 +4514,8 @@ - - + +