From 624675be1f70c0deaeee93b5ca00ae2416f09b92 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 14 Mar 2024 13:55:38 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=8A=B5=E6=8A=BC=E5=8A=9E=E7=90=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanMortgageInformationTransactDto.java | 3 +++ ...LoanMortgageInformationTransactService.java | 18 +++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactDto.java index 3f670840ac..717c9a52b6 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactDto.java @@ -46,4 +46,7 @@ public class LoanMortgageInformationTransactDto implements Dto { @ApiModelProperty("使用组织全路径") private String orgSidPath; private String createBySid; + private String auditName; //审核人 + private String auditSid; //审核人sid + private String auditDate; //审核日期 } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java index 2d5135f054..f111fcf416 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java @@ -46,6 +46,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -507,6 +509,7 @@ public class LoanMortgageInformationTransactService extends MybatisBaseService rb = ResultBean.fireFail(); LoanMortgageInformationTransactDetailsVo vo = baseMapper.getMortgageInfo(busVinSid); if (null != vo) { - if (StringUtils.isNotBlank(vo.getAuditSid())) { + if (StringUtils.isBlank(vo.getAuditSid())) { vo.setAuditDate(DateUtil.today()); vo.setAuditSid(userSid); SysUserVo userVo = sysUserFeign.fetchBySid(userSid).getData(); From 0baeeda8f01e787e42f4b92edaa60c28a83e7436 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 14 Mar 2024 15:07:16 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=B5=84=E6=96=B9?= =?UTF-8?q?=E5=88=92=E6=89=A3=E8=BF=98=E6=AC=BE=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-riskcenter-ui/src/api/monthlypayment/monthlypayment.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/anrui-riskcenter-ui/src/api/monthlypayment/monthlypayment.js b/anrui-riskcenter-ui/src/api/monthlypayment/monthlypayment.js index 0af79d1ae2..38a9cb0b95 100644 --- a/anrui-riskcenter-ui/src/api/monthlypayment/monthlypayment.js +++ b/anrui-riskcenter-ui/src/api/monthlypayment/monthlypayment.js @@ -29,7 +29,8 @@ export default { return request({ url: '/riskcenter/v1/loanrepaymenthistory/noImportUpdate', method: 'post', - params: data + data: data, + headers: { 'Content-Type': 'application/json' } }) }, deleteBySids: function(data) { From 2f0d3a2a1d0d32276e03c17792dae040f900c698 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 14 Mar 2024 15:16:06 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=9D=9E=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=95=B0=E6=8D=AE=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml index b56bf7eb94..4c875a54e3 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml @@ -3,7 +3,7 @@ update loan_repayment_plan_details - set updateTime = #{formatDate}, + set updateTime = #{formatDate} where sid in #{sid} From 674cccb3c32de5d118f0be24bfd64d76736dfe24 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 14 Mar 2024 16:13:00 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=A2=9E=E5=8A=A0=E7=94=9F=E6=88=90=E5=90=88?= =?UTF-8?q?=E5=90=8C=E3=80=81=E4=B8=8B=E8=BD=BD=E5=90=88=E5=90=8C=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anruifinmanagement/finwaitinvoiceapply.js | 12 +++ .../backups/finginvoiceapplyAdd.vue | 75 +++++++++++++++++- .../finginvoiceapplyEdit.vue | 76 ++++++++++++++++++- 3 files changed, 160 insertions(+), 3 deletions(-) diff --git a/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/finwaitinvoiceapply.js b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/finwaitinvoiceapply.js index e10086a970..e1095136d0 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/finwaitinvoiceapply.js +++ b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/finwaitinvoiceapply.js @@ -205,3 +205,15 @@ export function deliveredFinSelect(data) { }) } +// 生成合同 +export function saveInvoicedApplyInfoPdf(data) { + return request({ + url: '/fin/v1/finbillapplication/saveInvoicedApplyInfoPdf', + method: 'get', + params: data, + headers: { + 'Content-Type': 'application/json' + } + }) +} + diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/finginvoiceapplyAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/finginvoiceapplyAdd.vue index 5ab72b5da1..f11eb53fd0 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/finginvoiceapplyAdd.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/finginvoiceapplyAdd.vue @@ -171,6 +171,13 @@ +
+
注:若开票信息需要修改时,请在修改后点击生成合同按钮重新生成相关附件
+
+ 生成合同 + 下载合同 +
+
证件(营业执照或身份证)
@@ -201,7 +208,7 @@