From 36649c0954078ac37c6c29134785360064ee62b0 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 29 May 2025 15:09:50 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8D=95=E8=BD=A6?= =?UTF-8?q?=E8=BF=94=E5=88=A9=E6=A0=B8=E5=AF=B9=E3=80=81=E4=B8=93=E9=A1=B9?= =?UTF-8?q?=E8=BF=94=E5=88=A9=E6=A0=B8=E5=AF=B9--=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=B8=85=E7=A9=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/bikerebate/bicyclerebatemanagement.js | 167 +++++++++--------- .../specialrebate/specialrebatemanagement.js | 7 + .../bicyclerebatetobecheckedByUpdate.vue | 27 +++ .../specialrebatetobecheckedByUpdate.vue | 27 +++ 4 files changed, 148 insertions(+), 80 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatemanagement.js b/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatemanagement.js index e6dfd0ff72..afd0fe6149 100644 --- a/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatemanagement.js +++ b/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatemanagement.js @@ -1,84 +1,91 @@ import request from '@/utils/request' export default { - // 查询分页列表 - listPage: function(data) { - return request({ - url: '/scm/v1/scmvehrebate/listPage', - method: 'post', - data: data, - headers: { 'Content-Type': 'application/json' } - }) - }, - // 查询不分页 - listAll: function(data) { - return request({ - url: '/scm/v1/scmvehrebate/listAll', - method: 'post', - data: data, - headers: { 'Content-Type': 'application/json' } - }) - }, - // 选择车辆信息--查询分页列表 - pageList: function(data) { - return request({ - url: '/base/v1/basevehicle/vehicleRebateList', - method: 'post', - data: data, - headers: { 'Content-Type': 'application/json' } - }) - }, - // 删除 - delete: function(params) { - return request({ - url: '/scm/v1/scmvehrebate/delBySids', - method: 'DELETE', - data: params, - headers: { 'Content-Type': 'application/json' } - }) - }, - // 新增保存修改记录 - save: function(data) { - return request({ - url: '/scm/v1/scmvehrebate/save', - method: 'post', - data: data, - headers: { 'Content-Type': 'application/json' } - }) - }, - // 编辑保存修改记录 - update: function(data) { - return request({ - url: '/scm/v1/scmvehrebate/update', - method: 'post', - data: data, - headers: { 'Content-Type': 'application/json' } - }) - }, - // 通过sid查询一条记录 - fetchBySid: function(data) { - return request({ - url: '/scm/v1/scmvehrebate/fetchDetailsBySid/' + data, - method: 'get' - }) - }, - // 导出 - exportExcel: function(data) { - return request({ - url: '/scm/v1/scmvehrebate/excelList', - method: 'post', - data: data, - responseType: 'blob', // 表明返回服务器返回的数据类型 - headers: { 'Content-Type': 'application/json' } - }) - }, - // 下载模板 - downloadExcel: function() { - return request({ - url: '/scm/v1/scmvehrebate/download', - method: 'post', - responseType: 'blob', // 表明返回服务器返回的数据类型 - headers: { 'Content-Type': 'application/json' } - }) - } + // 查询分页列表 + listPage: function(data) { + return request({ + url: '/scm/v1/scmvehrebate/listPage', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 查询不分页 + listAll: function(data) { + return request({ + url: '/scm/v1/scmvehrebate/listAll', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 选择车辆信息--查询分页列表 + pageList: function(data) { + return request({ + url: '/base/v1/basevehicle/vehicleRebateList', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 清空 + clear: function(data) { + return request({ + url: '/scm/v1/scmvehrebate/clear/' + data, + method: 'get' + }) + }, + // 删除 + delete: function(params) { + return request({ + url: '/scm/v1/scmvehrebate/delBySids', + method: 'DELETE', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 新增保存修改记录 + save: function(data) { + return request({ + url: '/scm/v1/scmvehrebate/save', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 编辑保存修改记录 + update: function(data) { + return request({ + url: '/scm/v1/scmvehrebate/update', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 通过sid查询一条记录 + fetchBySid: function(data) { + return request({ + url: '/scm/v1/scmvehrebate/fetchDetailsBySid/' + data, + method: 'get' + }) + }, + // 导出 + exportExcel: function(data) { + return request({ + url: '/scm/v1/scmvehrebate/excelList', + method: 'post', + data: data, + responseType: 'blob', // 表明返回服务器返回的数据类型 + headers: { 'Content-Type': 'application/json' } + }) + }, + // 下载模板 + downloadExcel: function() { + return request({ + url: '/scm/v1/scmvehrebate/download', + method: 'post', + responseType: 'blob', // 表明返回服务器返回的数据类型 + headers: { 'Content-Type': 'application/json' } + }) + } } diff --git a/anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatemanagement.js b/anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatemanagement.js index 5e4a6fcec0..5f2d3cb064 100644 --- a/anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatemanagement.js +++ b/anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatemanagement.js @@ -44,6 +44,13 @@ export default { method: 'get' }) }, + // 清空 + clear: function(data) { + return request({ + url: '/scm/v1/scmspecialrebate/clear/' + data, + method: 'get' + }) + }, // 导出 exportExcel: function(data) { return request({ diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue index 9fdcd5ac51..927cf03015 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue @@ -7,6 +7,7 @@
{{ viewTitle }}
+ 清空 保存 关闭
@@ -335,6 +336,32 @@ export default { this.formobj.adjustmentRemarks = '' } }, + handleClear() { + const tip = '请确认是否清空上传数据!' + this.$confirm(tip, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + const loading = this.$loading({ + lock: true, + text: 'Loading', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }) + this.submitdisabled = true + req.clear(this.formobj.sid).then((resp) => { + if (resp.success) { + this.$message({ showClose: true, type: 'success', message: '操作成功' }) + this.handleReturn('true') + } + loading.close() + }).catch(e => { + this.submitdisabled = false + loading.close() + }) + }) + }, handleSave() { this.$refs['form_obj'].validate((valid) => { if (valid) { diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobecheckedByUpdate.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobecheckedByUpdate.vue index b671de28dc..348de5b337 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobecheckedByUpdate.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobecheckedByUpdate.vue @@ -7,6 +7,7 @@
{{ viewTitle }}
+ 清空 保存 关闭
@@ -323,6 +324,32 @@ export default { this.formobj.adjustmentRemarks = '' } }, + handleClear() { + const tip = '请确认是否清空上传数据!' + this.$confirm(tip, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + const loading = this.$loading({ + lock: true, + text: 'Loading', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }) + this.submitdisabled = true + req.clear(this.formobj.sid).then((resp) => { + if (resp.success) { + this.$message({ showClose: true, type: 'success', message: '操作成功' }) + this.handleReturn('true') + } + loading.close() + }).catch(e => { + this.submitdisabled = false + loading.close() + }) + }) + }, handleSave() { this.$refs['form_obj'].validate((valid) => { if (valid) { From bc88e1d52b27d12e9ce05abb0e90f296ffdec643 Mon Sep 17 00:00:00 2001 From: ligaode Date: Thu, 29 May 2025 15:22:49 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScmSpecialRebateFeign.java | 6 +++++ .../ScmSpecialRebateRest.java | 16 ++++++------- .../ScmSpecialRebateService.java | 24 +++++++++++++++++++ 3 files changed, 38 insertions(+), 8 deletions(-) diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeign.java index 9ed1a3c108..ef62aded0c 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeign.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.scm.api.scmspecialrebate; +import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; @@ -77,6 +78,11 @@ public interface ScmSpecialRebateFeign { @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + @ApiOperation("清空") + @GetMapping("/clear/{sid}") + @ResponseBody + public ResultBean clear(@PathVariable("sid") String sid); + @ApiOperation("专项返利未预提申请选择专项返利信息") @PostMapping("/withApplyGetSpecialRebate") @ResponseBody diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java index e66023aa45..ee31d6688b 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java @@ -25,14 +25,8 @@ *********************************************************/ package com.yxt.anrui.scm.biz.scmspecialrebate; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.date.DateUtil; import com.yxt.anrui.scm.api.scmspecialrebate.*; -import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.SpecialRebateCheckExcelVo; -import com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApply; -import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateExcelVo; -import com.yxt.anrui.scm.biz.scmspecialrebatewith.ScmSpecialRebateWithService; -import com.yxt.anrui.scm.biz.scmspecialrebatewithapply.ScmSpecialRebateWithApplyService; +import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo; import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -55,7 +49,6 @@ import java.io.OutputStream; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.text.ParseException; -import java.util.ArrayList; import java.util.List; @Api(tags = "专项返利表") @@ -256,6 +249,13 @@ public class ScmSpecialRebateRest implements ScmSpecialRebateFeign { return rb.success().setData(vo); } + @Override + public ResultBean clear(String sid) { + ResultBean rb = ResultBean.fireFail(); + ScmSpecialRebateDetailsVo vo = scmSpecialRebateService.clear(sid); + return rb.success().setData(vo); + } + @Override public ResultBean> withApplyGetSpecialRebate(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java index 1fa3cf2968..0ed252b098 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java @@ -2496,4 +2496,28 @@ public class ScmSpecialRebateService extends MybatisBaseService getTypeDetail(List sids) { return baseMapper.getTypeDetail(sids); } + + public ScmSpecialRebateDetailsVo clear(String sid) { + ScmSpecialRebate scmSpecialRebate = fetchBySid(sid); + scmSpecialRebate.setUploadDate(""); + scmSpecialRebate.setUploadMoney("0"); + scmSpecialRebate.setStayDetermineMoney("0"); + scmSpecialRebate.setStayDetermineMoneyNew("0"); + scmSpecialRebate.setOnceItureCost(BigDecimal.ZERO); + scmSpecialRebate.setOnceTreatCost(BigDecimal.ZERO); + scmSpecialRebate.setOnceSuppCost(BigDecimal.ZERO); + scmSpecialRebate.setOnceSuppRemark(""); + scmSpecialRebate.setSecondaryUploadDate(""); + scmSpecialRebate.setSecondaryUploadMoney("0"); + scmSpecialRebate.setSecondItureCost(BigDecimal.ZERO); + scmSpecialRebate.setSecondTreatCost(BigDecimal.ZERO); + scmSpecialRebate.setSecondSuppCost(BigDecimal.ZERO); + scmSpecialRebate.setSecondSuppRemark(""); + scmSpecialRebate.setIsAdjustment(""); + scmSpecialRebate.setAdjustmentMoney("0"); + scmSpecialRebate.setAdjustmentRemarks(""); + updateById(scmSpecialRebate); + ScmSpecialRebateDetailsVo scmSpecialRebateDetailsVo = fetchDetailsVoBySid(sid); + return scmSpecialRebateDetailsVo; + } } \ No newline at end of file From 9fbaa0cdaf8a1cb79f51385239dbe43a3271705b Mon Sep 17 00:00:00 2001 From: ligaode Date: Thu, 29 May 2025 15:30:50 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanSecondarySalesNotApplyService.java | 7 - .../ScmSpecialRebateFeign.java | 3 +- .../ScmSpecialRebateFeignFallback.java | 141 ------------------ 3 files changed, 1 insertion(+), 150 deletions(-) delete mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeignFallback.java 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 4c1906c5ab..f44a412637 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 @@ -38,15 +38,10 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign; -import com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVehDetailsVo; -import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyDetailsVo; -import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehPdfVo; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; -import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowDetailsVo; import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordSourceLCVo; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; -import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRFeign; @@ -72,7 +67,6 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; -import com.yxt.anrui.riskcenter.api.loanoutboundapply.LoanOutboundApply; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails; import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply; import com.yxt.anrui.riskcenter.api.loanrepurchasecost.LoanRepurchaseCost; @@ -157,7 +151,6 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.anrui.scm.api.scmspecialrebate; - -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import org.springframework.stereotype.Component; -import org.springframework.web.multipart.MultipartFile; - -import javax.servlet.http.HttpServletRequest; -import java.io.IOException; -import java.text.ParseException; -import java.util.List; - -/** - * Project: anrui-scm(专项返利管理)
- * File: ScmSpecialRebateFeignFallback.java
- * Class: com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateFeignFallback
- * Description: 专项返利表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-09-08 16:11:43
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Component -public class ScmSpecialRebateFeignFallback implements ScmSpecialRebateFeign { - - @Override - public ResultBean> listPage(PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-scm/scmspecialrebate/listPage无法访问"); - } - - @Override - public ResultBean> listAll(ScmSpecialRebateQuery query) { - return null; - } - - @Override - public ResultBean save(ScmSpecialRebateDto dto){ - return ResultBean.fireFail().setMsg("接口anrui-scm/scmspecialrebate/save无法访问"); - } - - @Override - public ResultBean adjustment(ScmSpecialRebateSpecialAdjDto dto) { - return null; - } - - @Override - public ResultBean delBySids( String[] sids){ - return ResultBean.fireFail().setMsg("接口anrui-scm/scmspecialrebate/delBySids无法访问"); - } - - @Override - public ResultBean fetchDetailsBySid(String sid){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-scm/scmspecialrebate/fetchDetailsBySid无法访问"); - } - - @Override - public ResultBean> withApplyGetSpecialRebate(PagerQuery pq) { - return null; - } - - @Override - public ResultBean> checkApplyGetSpecialRebate(PagerQuery pq) { - return null; - } - - @Override - public ResultBean> checkApplyGetSpecialRebateAll(ScmSpecialRebateQuery query) { - return null; - } - - @Override - public ResultBean> checkApplyGetAlreadyUploadSpecialRebate(PagerQuery pq) { - return null; - } - - @Override - public ResultBean> stayDisRebate(PagerQuery pq) { - return null; - } - - @Override - public void downloadExcel() { - - } - - @Override - public ResultBean getExcelInfo(MultipartFile file, HttpServletRequest request, String userSid, String orgPath) throws IOException, ParseException { - return null; - } - - @Override - public void excelListOne(ScmSpecialRebateQuery scmSpecialRebateQuery) { - - } - - @Override - public ResultBean getExcelOneInfo(MultipartFile file, HttpServletRequest request, String userSid, String orgPath) throws IOException, ParseException { - return null; - } - - @Override - public void excelListTwo(ScmSpecialRebateQuery scmSpecialRebateQuery) { - - } - - @Override - public ResultBean getExcelTwoInfo(MultipartFile file, HttpServletRequest request, String userSid, String orgPath) throws IOException, ParseException { - return null; - } -} \ No newline at end of file From cba435b98102cc32e1b8b32c02d7c5dffe8e69e9 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 29 May 2025 15:52:37 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=9B=9E=E8=B4=AD?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue | 3 ++- .../src/views/workFlow/huigouFlow/buybackEdit.vue | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue b/anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue index e1067d5e24..f25a1f68b6 100644 --- a/anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue +++ b/anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue @@ -300,7 +300,8 @@ export default { // 公司结清费用模块--公司正常结清合计计算 calculateSettleAll() { let money = 0 - money = Math.round((parseFloat(money) + parseFloat(this.formobj.companyCostVo.overduePrice === '' ? 0 : this.formobj.companyCostVo.overduePrice) + parseFloat(this.formobj.companyCostVo.funfCost === '' ? 0 : this.formobj.companyCostVo.funfCost) + parseFloat(this.formobj.companyCostVo.bankOverInterest === '' ? 0 : this.formobj.companyCostVo.bankOverInterest) + parseFloat(this.formobj.companyCostVo.companyCurrentNotPrice === '' ? 0 : this.formobj.companyCostVo.companyCurrentNotPrice) + parseFloat(this.formobj.companyCostVo.bankNotPrice === '' ? 0 : this.formobj.companyCostVo.bankNotPrice) + parseFloat(this.formobj.companyCostVo.deductionAmount === '' ? 0 : this.formobj.companyCostVo.deductionAmount) + parseFloat(this.formobj.companyCostVo.contractLiquidated === '' ? 0 : this.formobj.companyCostVo.contractLiquidated) + parseFloat(this.formobj.companyCostVo.companyOtherPrice === '' ? 0 : this.formobj.companyCostVo.companyOtherPrice) - parseFloat(this.formobj.companyCostVo.loanDeposit === '' ? 0 : this.formobj.companyCostVo.loanDeposit)) * 100) / 100 + // 公司正常结清合计 = 公司逾期月还 + 资金占用费 + 资方逾期利息 + 公司当期未到期月还 + 公司未到期金额 + 贷款保证金扣罚金额 + 名义价 + 合同违约金 + 其它费用 - 贷款保证金 + money = Math.round((parseFloat(money) + parseFloat(this.formobj.companyCostVo.overduePrice === '' ? 0 : this.formobj.companyCostVo.overduePrice) + parseFloat(this.formobj.companyCostVo.funfCost === '' ? 0 : this.formobj.companyCostVo.funfCost) + parseFloat(this.formobj.companyCostVo.bankOverInterest === '' ? 0 : this.formobj.companyCostVo.bankOverInterest) + parseFloat(this.formobj.companyCostVo.companyCurrentNotPrice === '' ? 0 : this.formobj.companyCostVo.companyCurrentNotPrice) + parseFloat(this.formobj.companyCostVo.bankNotPrice === '' ? 0 : this.formobj.companyCostVo.bankNotPrice) + parseFloat(this.formobj.companyCostVo.deductionAmount === '' ? 0 : this.formobj.companyCostVo.deductionAmount) + parseFloat(this.formobj.companyCostVo.companyNominalPrice === '' ? 0 : this.formobj.companyCostVo.companyNominalPrice) + parseFloat(this.formobj.companyCostVo.contractLiquidated === '' ? 0 : this.formobj.companyCostVo.contractLiquidated) + parseFloat(this.formobj.companyCostVo.companyOtherPrice === '' ? 0 : this.formobj.companyCostVo.companyOtherPrice) - parseFloat(this.formobj.companyCostVo.loanDeposit === '' ? 0 : this.formobj.companyCostVo.loanDeposit)) * 100) / 100 return money }, // 结清利润计算 diff --git a/anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackEdit.vue b/anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackEdit.vue index 4518fef971..b0adf32eb3 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackEdit.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackEdit.vue @@ -299,7 +299,8 @@ export default { // 公司结清费用模块--公司正常结清合计计算 calculateSettleAll() { let money = 0 - money = Math.round((parseFloat(money) + parseFloat(this.formobj.companyCostVo.overduePrice === '' ? 0 : this.formobj.companyCostVo.overduePrice) + parseFloat(this.formobj.companyCostVo.funfCost === '' ? 0 : this.formobj.companyCostVo.funfCost) + parseFloat(this.formobj.companyCostVo.bankOverInterest === '' ? 0 : this.formobj.companyCostVo.bankOverInterest) + parseFloat(this.formobj.companyCostVo.companyCurrentNotPrice === '' ? 0 : this.formobj.companyCostVo.companyCurrentNotPrice) + parseFloat(this.formobj.companyCostVo.bankNotPrice === '' ? 0 : this.formobj.companyCostVo.bankNotPrice) + parseFloat(this.formobj.companyCostVo.deductionAmount === '' ? 0 : this.formobj.companyCostVo.deductionAmount) + parseFloat(this.formobj.companyCostVo.contractLiquidated === '' ? 0 : this.formobj.companyCostVo.contractLiquidated) + parseFloat(this.formobj.companyCostVo.companyOtherPrice === '' ? 0 : this.formobj.companyCostVo.companyOtherPrice) - parseFloat(this.formobj.companyCostVo.loanDeposit === '' ? 0 : this.formobj.companyCostVo.loanDeposit)) * 100) / 100 + // 公司正常结清合计 = 公司逾期月还 + 资金占用费 + 资方逾期利息 + 公司当期未到期月还 + 公司未到期金额 + 贷款保证金扣罚金额 + 名义价 + 合同违约金 + 其它费用 - 贷款保证金 + money = Math.round((parseFloat(money) + parseFloat(this.formobj.companyCostVo.overduePrice === '' ? 0 : this.formobj.companyCostVo.overduePrice) + parseFloat(this.formobj.companyCostVo.funfCost === '' ? 0 : this.formobj.companyCostVo.funfCost) + parseFloat(this.formobj.companyCostVo.bankOverInterest === '' ? 0 : this.formobj.companyCostVo.bankOverInterest) + parseFloat(this.formobj.companyCostVo.companyCurrentNotPrice === '' ? 0 : this.formobj.companyCostVo.companyCurrentNotPrice) + parseFloat(this.formobj.companyCostVo.bankNotPrice === '' ? 0 : this.formobj.companyCostVo.bankNotPrice) + parseFloat(this.formobj.companyCostVo.deductionAmount === '' ? 0 : this.formobj.companyCostVo.deductionAmount) + parseFloat(this.formobj.companyCostVo.companyNominalPrice === '' ? 0 : this.formobj.companyCostVo.companyNominalPrice) + parseFloat(this.formobj.companyCostVo.contractLiquidated === '' ? 0 : this.formobj.companyCostVo.contractLiquidated) + parseFloat(this.formobj.companyCostVo.companyOtherPrice === '' ? 0 : this.formobj.companyCostVo.companyOtherPrice) - parseFloat(this.formobj.companyCostVo.loanDeposit === '' ? 0 : this.formobj.companyCostVo.loanDeposit)) * 100) / 100 return money }, // 结清利润计算