From 783629720674abcfb01047d8485a205a57503b48 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 26 Jul 2023 09:57:39 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/busdelivered/BusDeliveredMapper.java | 1 + .../biz/busdelivered/BusDeliveredMapper.xml | 53 +++++++++++++++++-- .../biz/busdelivered/BusDeliveredService.java | 29 ++++++++++ doc/databases/base_tables.sql | 2 + 4 files changed, 81 insertions(+), 4 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java index 7e5f2c0d19..9ce3c72e8a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java @@ -78,6 +78,7 @@ public interface BusDeliveredMapper extends BaseMapper { * @return */ IPage getRetrievalNotList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); + IPage getRetrievalNotLists(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); /** * 查询车架号 diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml index 5abae9bed0..57f269701b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml @@ -51,10 +51,55 @@ , #{name} , '%') - and (select count (*) from bus_sales_order_vehicle bbv left join bus_sales_order bo on bo.sid = bbv.salesOrderSid where length(bbv.linkSid) - >0 - and bo.contractNo = bd.contractNo) - >0 + AND ( + SELECT + count(*) + FROM + bus_sales_order_vehicle bbv + LEFT JOIN bus_sales_order bo ON bo.sid = bbv.salesOrderSid + WHERE + length( bbv.linkSid )> 0 + AND bo.contractNo = bd.contractNo + )> 0 + + group by bd.contractNo + + + + + + + + + + + diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java index 2eed9f28dc..5df7bed883 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java @@ -271,6 +271,35 @@ public class BusDeliveredService extends MybatisBaseService getRetrievalNotLists(PagerQuery pq) { + QueryWrapper qw = new QueryWrapper<>(); + String name = pq.getParams().getName(); + IPage page = PagerUtil.queryToPage(pq); + String orgPath = pq.getParams().getOrgPath(); + String orgSid = ""; + if (StringUtils.isNotBlank(orgPath)) { + orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + } else { + orgSid = sysStaffOrgFeign.getPathSidByUserSid(pq.getParams().getUserSid()).getData(); + } + qw.eq("bd.useOrgSid", orgSid); + qw.eq("bd.state", 1); + if (StringUtils.isNotBlank(pq.getParams().getUserSid())) { + qw.eq("bd.createBySid", pq.getParams().getUserSid()); + } + IPage iPage = baseMapper.getRetrievalNotLists(page, qw, name); + for (AppBusDeliveredPageVo record : iPage.getRecords()) { + String contractNo = record.getContractNo(); + QueryWrapper qw2 = new QueryWrapper<>(); + //待出库:1,出库申请:0 + qw2.eq("bd.state", 1); + qw2.eq("bd.contractNo", contractNo); + List vinListVo = baseMapper.selVinListVo(contractNo, qw2); + record.setVinList(vinListVo); + } + return iPage; + } + public ResultBean getRetrievalApplyInfo(AppDeliveredDetailsQuery query) { ResultBean rb = ResultBean.fireFail(); AppDeliveredDetailsVo appDeliveredDetailsVo = new AppDeliveredDetailsVo(); diff --git a/doc/databases/base_tables.sql b/doc/databases/base_tables.sql index 7dcdfa35be..634fce3c49 100644 --- a/doc/databases/base_tables.sql +++ b/doc/databases/base_tables.sql @@ -993,6 +993,8 @@ CREATE TABLE `base_vehicle_state` `carryInvoiceState` varchar(64) DEFAULT NULL COMMENT '欠款开票状态', `packageBusiness` varchar(64) DEFAULT NULL COMMENT '包牌业务', `contractState` varchar(64) DEFAULT NULL COMMENT '合同状态', + `saleTypeKey` varchar(64) DEFAULT NULL COMMENT '销售类型:1全款,2贷款', + `finSourceKey` varchar(64) DEFAULT NULL COMMENT '款项来源:1自有资金、2三方金融、3担保、4非担保', PRIMARY KEY (`id`), KEY `id` (`id`) ) ENGINE = INNODB 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 2/5] =?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 @@