From b56500a1a0f25e407f48990009d8abc722caab22 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 26 Jul 2023 10:42:28 +0800 Subject: [PATCH] =?UTF-8?q?=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 --- .../FinFundsCarriedForwardApplyDto.java | 2 + .../FinFundsCarriedForwardApplyVo.java | 2 + .../FinFundsCarriedForwardApplyMapper.xml | 1 + .../FinFundsCarriedForwardApplyService.java | 49 +- .../ScmApplyInboundService.java | 8 +- .../risk/creditreview/CreditReviewDto.java | 71 + .../risk/creditreview/CreditReviewFeign.java | 7 +- .../CreditReviewFeignFallback.java | 5 + .../risk/creditreview/CreditReviewRest.java | 5 + .../款项结转打印模板/jzsqjg.ftl | 2667 +++++++++++++++++ .../{kxjz.ftl => jzsqzks.ftl} | 1467 +++++---- .../款项结转模板(激光打印机).doc | Bin 0 -> 21504 bytes .../款项结转模板(针式打印机).doc | Bin 0 -> 19456 bytes .../款项结转(调账申请).doc | Bin 17408 -> 0 bytes 14 files changed, 3750 insertions(+), 534 deletions(-) create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewDto.java create mode 100644 工作内容需要的文档/单据模板/款项结转打印模板/jzsqjg.ftl rename 工作内容需要的文档/单据模板/款项结转打印模板/{kxjz.ftl => jzsqzks.ftl} (69%) create mode 100644 工作内容需要的文档/单据模板/款项结转打印模板/款项结转模板(激光打印机).doc create mode 100644 工作内容需要的文档/单据模板/款项结转打印模板/款项结转模板(针式打印机).doc delete mode 100644 工作内容需要的文档/单据模板/款项结转打印模板/款项结转(调账申请).doc diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyDto.java index 9bdd3cc161..d9cbd122a3 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyDto.java @@ -92,6 +92,8 @@ public class FinFundsCarriedForwardApplyDto implements Dto { private String jzjehj; // 结转金额合计 @ApiModelProperty("pdf路径") private String pdfPath; + @ApiModelProperty("下载类型") + private String pdfType; @ApiModelProperty("是否为相同销售订单") private Boolean isOneSale = false; @ApiModelProperty("款项确认书附件") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyVo.java index 5357adc823..bd6694e725 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyVo.java @@ -50,6 +50,8 @@ import lombok.Data; public class FinFundsCarriedForwardApplyVo implements Vo { private String sid; + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("流程状态") private String nodeState; @ApiModelProperty("申请部门名称") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyMapper.xml index 5b65c960ba..9a0e2f3ebf 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyMapper.xml @@ -6,6 +6,7 @@