From f3051d351cc1d9a6415aac20f98cd8e2a2ea3ee4 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 7 Dec 2022 15:50:05 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E7=AE=80=E6=98=93=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=AE=A2=E9=87=91=E6=B7=BB=E5=8A=A0=E8=B4=A2=E5=8A=A1=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../busmaindeposit/AppBusMainDepositVo.java | 6 ++- .../busmaindeposit/BusMainDepositService.java | 41 ++++++++++--------- .../FinCollectionConfirmation.java | 14 ++++++- .../FinCollectionConfirmationFeign.java | 5 ++- ...inCollectionConfirmationFeignFallback.java | 5 +++ .../app/FinConfirmDto.java | 4 ++ .../FinCollectionConfirmationMapper.java | 2 + .../FinCollectionConfirmationMapper.xml | 4 ++ .../FinCollectionConfirmationRest.java | 5 +++ .../FinCollectionConfirmationService.java | 32 +++++++++------ .../virtualOrders/orders/MainDepositVo.java | 3 ++ 11 files changed, 83 insertions(+), 38 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java index b46cd06b21..2b0fa71b4b 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java @@ -26,7 +26,6 @@ package com.yxt.anrui.buscenter.api.busmaindeposit; -import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -114,7 +113,10 @@ public class AppBusMainDepositVo implements Vo { @ApiModelProperty("订车特殊：审批成功后不再显示流程状态显示为 ： 有效期：3天/2天/1天;失效") private String virtualOrderState2; - + @ApiModelProperty("已使用订金") private String usedDeposit; + @ApiModelProperty("财务确认状态") + private String paymentState; + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java index d00c0c13b3..91c29bf821 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java @@ -64,6 +64,7 @@ import com.yxt.anrui.buscenter.biz.busdepositvehiclecustomer.BusDepositVehicleCu import com.yxt.anrui.buscenter.biz.flow.FlowableService; import com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempInfoVo; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; +import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmation; import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto; import com.yxt.anrui.flowable.api.flow.FlowableFeign; @@ -676,6 +677,23 @@ public class BusMainDepositService extends MybatisBaseService finCollectionConfirmationResultBean = finCollectionConfirmationFeign.selectByBusSid(record.getVirtualOrderSid()); + //审核状态（1待审核/2已驳回/3已审核） + FinCollectionConfirmation finCollectionConfirmation = finCollectionConfirmationResultBean.getData(); + if(finCollectionConfirmation != null){ + if("1".equals(finCollectionConfirmation.getAuditState())){ + record.setPaymentState("待确认"); + }else if("2".equals(finCollectionConfirmation.getAuditState())){ + record.setPaymentState("驳回"); + }else{ + record.setPaymentState("已确认"); + } + } + } + } else if (record.getVirtualOrderType().equals("02")) { BusDepositVehicleCustomer busDepositVehicleCustomer = baseMapper.selectVehicleCustomerByBillSid(virtualOrderSid); int count = baseMapper.selByBillSidCount(virtualOrderSid); @@ -684,8 +702,6 @@ public class BusMainDepositService extends MybatisBaseService resultBean = sysFormLinkFeign.selectStateByBusinessSid(record.getVirtualOrderSid()); - // 状态判断:0未提交,1办理中, 2已办结, -1退回到发起人,-2终止 if ("待提交".equals(record.getVirtualOrderState())) { record.setShowDeleteBtn(true); @@ -2110,24 +2126,9 @@ public class BusMainDepositService extends MybatisBaseService list = new ArrayList<>(); - if (StringUtils.isNotBlank(busDeposit.getVehicleNum())) { - List customerList = busDepositCustomerService.selectListByBillSid(bv.getBusinessSid()); - for (int i = 0; i < Integer.valueOf(busDeposit.getVehicleNum()); i++) { - FinSelectDto finSelectDto = new FinSelectDto(); - BusDepositCustomerVo bus = customerList.get(0); - if (bus != null) { - finSelectDto.setCustomerName(bus.getCustomerName()); - finSelectDto.setCustomerSid(bus.getCustomerSid()); - finSelectDto.setCustomerPhone(bus.getCustomerMobile()); - finSelectDto.setCurrentReceivableMoney(busDeposit.getDeposit().divide(new BigDecimal(busDeposit.getVehicleNum())).toString()); - finSelectDto.setSubscriptionDate(DateUtil.today()); - finSelectDto.setReceivablesName("订金"); - list.add(finSelectDto); - } - } - } - finConfirmDto.setFinSelectList(list);*/ + finConfirmDto.setRemarks(busDeposit.getRemarks()); + //查询打款凭证 + finConfirmDto.setPaymentVoucherUrl(busDeposit.getPaymentProof()); finCollectionConfirmationFeign.saveFinConfirm(finConfirmDto); } if (DictCommonEnum.DepositBillType.JYDD_DC.getCode().equals(busMainDeposit.getDepositBillTypeKey())) { diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java index b8c01a2f6a..16b5e024ee 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java @@ -52,7 +52,7 @@ import java.math.BigDecimal; public class FinCollectionConfirmation extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("创建人接口") + @ApiModelProperty("创建人") private String createByName; // 创建人接口 @ApiModelProperty("收款日期") private String collectionDate; // 收款日期 @@ -91,5 +91,17 @@ public class FinCollectionConfirmation extends BaseEntity { private String busSid; @ApiModelProperty("业务单据编号") private String busNo; + @ApiModelProperty("是否是首次：0是，1不是") private int first; + + @ApiModelProperty("申请部门") + private String createDept; + @ApiModelProperty("申请日期") + private String createDate; + @ApiModelProperty("收款账户名称") + private String receivingName; + @ApiModelProperty("付款账号后4位") + private String payAccount; + @ApiModelProperty("付款银行") + private String payBank; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java index 1959c8ccb2..1cacb2ac60 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java @@ -32,7 +32,6 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.SpringQueryMap; @@ -127,5 +126,7 @@ public interface FinCollectionConfirmationFeign { @GetMapping("/selectArrearsMoneyOrCollectionMoney/{contractNo}") ResultBean selectArrearsMoneyOrCollectionMoney(@PathVariable("contractNo") String contractNo); - + @ApiOperation("根据业务sid查询款项信息") + @GetMapping("/selectByBusSid") + ResultBean selectByBusSid(@RequestParam("virtualOrderSid") String virtualOrderSid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java index 4b93ae0232..bfd911bc6d 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java @@ -132,4 +132,9 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf public ResultBean selectArrearsMoneyOrCollectionMoney(String contractNo) { return null; } + + @Override + public ResultBean selectByBusSid(String virtualOrderSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/FinConfirmDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/FinConfirmDto.java index eef702f8f5..f85dfcdfd9 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/FinConfirmDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/FinConfirmDto.java @@ -64,5 +64,9 @@ public class FinConfirmDto implements Dto { @ApiModelProperty("创建人名称") private String createByName; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("打款凭证url") + private String paymentVoucherUrl; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java index fdd395d390..f32f3962d3 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java @@ -105,4 +105,6 @@ public interface FinCollectionConfirmationMapper extends BaseMapper getList(@Param("stringList") List stringList, @Param("createBySid") String createBySid, @Param("useOrgSid") String useOrgSid); + + FinCollectionConfirmation selectByBusSid(String virtualOrderSid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml index fe336a666a..65ba63b55c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml @@ -98,4 +98,8 @@ #{item} + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java index a45aeebe61..ea8796ce81 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java @@ -205,4 +205,9 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF public ResultBean selectArrearsMoneyOrCollectionMoney(String contractNo) { return finCollectionConfirmationService.selectArrearsMoneyOrCollectionMoney(contractNo); } + + @Override + public ResultBean selectByBusSid(String virtualOrderSid) { + return finCollectionConfirmationService.selectByBusSid(virtualOrderSid); + } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 9b24afb55a..329a3a5e25 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -249,16 +249,16 @@ public class FinCollectionConfirmationService extends MybatisBaseService 0){ - for(FinSelectedReceivablesDetailedDto v : finSelectedReceivablesDetailedDtos){ - if(StringUtils.isBlank(v.getSubscriptionMoney())){ - return rb.setMsg("认款金额不允许为空"); - } - if(StringUtils.isBlank(v.getSubscriptionDate())){ - return rb.setMsg("认款申请日期不能为空"); - } + if (finSelectedReceivablesDetailedDtos.size() > 0) { + for (FinSelectedReceivablesDetailedDto v : finSelectedReceivablesDetailedDtos) { + if (StringUtils.isBlank(v.getSubscriptionMoney())) { + return rb.setMsg("认款金额不允许为空"); + } + if (StringUtils.isBlank(v.getSubscriptionDate())) { + return rb.setMsg("认款申请日期不能为空"); + } - } + } } //对收款申请进行赋值操作 @@ -350,12 +350,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedDtos = dto.getFinSelectedReceivablesDetaileds(); - if(finSelectedReceivablesDetailedDtos.size() > 0){ - for(FinSelectedReceivablesDetailedDto v : finSelectedReceivablesDetailedDtos){ - if(StringUtils.isBlank(v.getSubscriptionMoney())){ + if (finSelectedReceivablesDetailedDtos.size() > 0) { + for (FinSelectedReceivablesDetailedDto v : finSelectedReceivablesDetailedDtos) { + if (StringUtils.isBlank(v.getSubscriptionMoney())) { return rb.setMsg("认款金额不允许为空"); } - if(StringUtils.isBlank(v.getSubscriptionDate())){ + if (StringUtils.isBlank(v.getSubscriptionDate())) { return rb.setMsg("认款申请日期不能为空"); } } @@ -1405,4 +1405,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService getList(List stringList, String createBySid, String useOrgSid) { return baseMapper.getList(stringList, createBySid, useOrgSid); } + + public ResultBean selectByBusSid(String virtualOrderSid) { + ResultBean rb = ResultBean.fireFail(); + FinCollectionConfirmation finCollectionConfirmation = baseMapper.selectByBusSid(virtualOrderSid); + return rb.success().setData(finCollectionConfirmation); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/orders/MainDepositVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/orders/MainDepositVo.java index 222a4c88d2..2ba063f417 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/orders/MainDepositVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/orders/MainDepositVo.java @@ -74,4 +74,7 @@ public class MainDepositVo implements Vo { @ApiModelProperty("订车特殊：审批成功后不再显示流程状态显示为 ： 有效期：3天/2天/1天;失效") private String virtualOrderState2; + + @ApiModelProperty("财务确认状态") + private String paymentState; } From bf16760ba472de40865ec8d0b3db3d18e147fbb4 Mon Sep 17 00:00:00 2001 From: hp <2969694837@qq.com> Date: Wed, 7 Dec 2022 17:48:25 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E7=AE=80=E6=98=93=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../busdeposit/AppBusDepositBusDetailsVo.java | 11 +++ .../AppBusDepositBuscenterDetailVo.java | 11 +++ .../buscenter/api/busdeposit/BusDeposit.java | 10 +++ .../AppBusDepositBuscenterDto.java | 9 +++ .../biz/busdeposit/BusDepositMapper.xml | 10 ++- .../FinManufacturerBankFeign.java | 11 +++ .../FinManufacturerBankFeignFallback.java | 10 +++ .../FinManufacturerOrgPathQuery.java | 21 +++++ .../FinManufacturerVo.java | 7 ++ .../FinManufacturerBankMapper.java | 6 ++ .../FinManufacturerBankMapper.xml | 40 +++++++++- .../FinManufacturerBankRest.java | 15 ++++ .../FinManufacturerBankService.java | 33 ++++++++ .../deposit/DepositBusDetailsVo.java | 10 +++ .../deposit/DepositBuscenterDetailVo.java | 10 +++ .../deposit/DepositBuscenterDto.java | 9 +++ .../account/AppFinManufacturerBankFeign.java | 63 +++++++++++++++ .../AppFinManufacturerBankFeignFallback.java | 56 +++++++++++++ .../account/AppManufacturerOrgPathQuery.java | 19 +++++ .../api/base/account/AppManufacturerVo.java | 19 +++++ .../account/AppFinManufacturerBankRest.java | 67 ++++++++++++++++ .../AppFinManufacturerBankService.java | 80 +++++++++++++++++++ 22 files changed, 523 insertions(+), 4 deletions(-) create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerOrgPathQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppFinManufacturerBankFeign.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppFinManufacturerBankFeignFallback.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppManufacturerOrgPathQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppManufacturerVo.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/account/AppFinManufacturerBankRest.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/account/AppFinManufacturerBankService.java diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBusDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBusDetailsVo.java index bda053d969..8d8ed28dc1 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBusDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBusDetailsVo.java @@ -98,5 +98,16 @@ public class AppBusDepositBusDetailsVo implements Vo { @ApiModelProperty("制单日期") private String createDate; + @ApiModelProperty("收款账户名称") + private String collectionAccountName; + + @ApiModelProperty("本分公司开户账号sid") + private String accountSid; + + @ApiModelProperty("开户银行") + private String depositBank; + + + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java index 833c0450eb..dc770d0366 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java @@ -85,4 +85,15 @@ public class AppBusDepositBuscenterDetailVo implements Vo { @ApiModelProperty(value = "任务id") private String taskId; + @ApiModelProperty("收款账户名称") + private String collectionAccountName; + + @ApiModelProperty("本分公司开户账号sid") + private String accountSid; + + @ApiModelProperty("开户银行") + private String depositBank; + + + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDeposit.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDeposit.java index 9acf45a211..4b384a3a5e 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDeposit.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDeposit.java @@ -107,6 +107,16 @@ public class BusDeposit extends BaseEntity { @ApiModelProperty("付款凭证") private String paymentProof; + @ApiModelProperty("收款账户名称") + private String collectionAccountName; + + @ApiModelProperty("本分公司开户账号sid") + private String accountSid; + + @ApiModelProperty("开户银行") + private String depositBank; + + // @ApiModelProperty(value = "节点状态") // private String nodeState; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusDepositBuscenterDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusDepositBuscenterDto.java index 6b90e7b127..d4841f75f4 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusDepositBuscenterDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusDepositBuscenterDto.java @@ -84,4 +84,13 @@ public class AppBusDepositBuscenterDto implements Dto { @ApiModelProperty("收款银行") private String collectionBankKey; + @ApiModelProperty("收款账户名称") + private String collectionAccountName; + + @ApiModelProperty("本分公司开户账号sid") + private String accountSid; + + @ApiModelProperty("开户银行") + private String depositBank; + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml index afcb4809c3..8bfc206d7a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml @@ -22,7 +22,10 @@ draweeMobile AS phone, vehicleNum AS carNumber, staffName AS sellerName, - orgName AS departmentName + orgName AS departmentName, + collectionAccountName, + depositBank, + accountSid FROM bus_deposit WHERE billSid = #{virtualOrderSid} @@ -45,7 +48,10 @@ payBankAcc AS payNumber, proBankValue AS collectionBank, proBankKey AS collectionBankKey, - proBankAccKey AS collectionNumberKey + proBankAccKey AS collectionNumberKey, + collectionAccountName, + depositBank, + accountSid FROM bus_deposit WHERE billSid = #{virtualOrderSid} AND staffSid = #{staffSid} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeign.java index d73019f61c..64abbd054e 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeign.java @@ -31,6 +31,7 @@ import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -80,4 +81,14 @@ public interface FinManufacturerBankFeign { @GetMapping("/selectAccountByUseOrgSid/{userSid}") @ResponseBody public ResultBean> selectAccountByUseOrgSid(@PathVariable("userSid") String userSid); + + @ApiOperation("获取该本分公司下的开户账号") + @GetMapping("/selAccountByOrgSid") + @ResponseBody + public ResultBean> selAccountByOrgSid(@SpringQueryMap FinManufacturerOrgPathQuery query); + + @ApiOperation("App获取该本分公司下的开户账号") + @PostMapping("/selAppAccountByOrgSid") + @ResponseBody + public ResultBean> selAppAccountByOrgSid(@RequestBody PagerQuery query); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeignFallback.java index 1f7f0a1dcb..84ba3b87c3 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeignFallback.java @@ -74,4 +74,14 @@ public class FinManufacturerBankFeignFallback implements FinManufacturerBankFeig public ResultBean> selectAccountByUseOrgSid(String userSid) { return null; } + + @Override + public ResultBean> selAccountByOrgSid(FinManufacturerOrgPathQuery query) { + return null; + } + + @Override + public ResultBean> selAppAccountByOrgSid(PagerQuery query) { + return null; + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerOrgPathQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerOrgPathQuery.java new file mode 100644 index 0000000000..9c2d0f01f8 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerOrgPathQuery.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.fin.api.finmanufacturerbank; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class FinManufacturerOrgPathQuery implements Query { + + private static final long serialVersionUID = -2101692843030171417L; + + @ApiModelProperty(value = "用户sid") + private String userSid; + + @ApiModelProperty(value = "机构sid") + private String orgPath; + + @ApiModelProperty(value = "查询条件") + private String name; + +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerVo.java index 20a0b484d6..da77b45c21 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerVo.java @@ -12,8 +12,15 @@ import lombok.Data; @Data public class FinManufacturerVo implements Vo { private static final long serialVersionUID = 1452730449728139855L; + + @ApiModelProperty("本分公司开户账号sid") + private String accountSid; @ApiModelProperty("银行账号") private String bankAccount; @ApiModelProperty("账户名称") private String accountName; + @ApiModelProperty("开户银行") + private String depositBank; + @ApiModelProperty("开户银行key") + private String depositBankKey; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.java index 0f2939b68b..e28da4eecf 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.java @@ -26,9 +26,11 @@ package com.yxt.anrui.fin.biz.finmanufacturerbank; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageQuery; import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBank; import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankDetailsVo; import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankVo; @@ -63,4 +65,8 @@ public interface FinManufacturerBankMapper extends BaseMapper selectAccountByUseOrgSid(String useOrgSid); + + List selAccountByOrgSid(@Param("useOrgSid") String useOrgSid,@Param("name") String name); + + IPage selAppAccountByOrgSid(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw,@Param("name") String name); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.xml index 1ff5185ec4..0021db3b1f 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.xml @@ -42,13 +42,49 @@ where bankAccount = #{bankAccount} and useOrgSid = #{useOrgSid} and sid - <> + <> #{sid} + + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankRest.java index a41e70a906..2000f37437 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankRest.java @@ -25,11 +25,14 @@ *********************************************************/ package com.yxt.anrui.fin.biz.finmanufacturerbank; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo; import com.yxt.anrui.fin.api.finmanufacturerbank.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; @@ -87,4 +90,16 @@ public class FinManufacturerBankRest implements FinManufacturerBankFeign { public ResultBean> selectAccountByUseOrgSid(String userSid) { return finManufacturerBankService.selectAccountByUseOrgSid(userSid); } + + @Override + public ResultBean> selAccountByOrgSid(FinManufacturerOrgPathQuery query) { + return finManufacturerBankService.selAccountByOrgSid(query); + } + + @Override + public ResultBean> selAppAccountByOrgSid(PagerQuery query) { + ResultBean rb = ResultBean.fireFail(); + IPage voIPage = finManufacturerBankService.selAppAccountByOrgSid(query); + return rb.success().setData(voIPage); + } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java index 8937a96ffa..dc3865e2a7 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java @@ -28,6 +28,8 @@ package com.yxt.anrui.fin.biz.finmanufacturerbank; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageQuery; +import com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo; import com.yxt.anrui.fin.api.finmanufacturerbank.*; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.cnbankcnt.CNBankacnt; @@ -167,4 +169,35 @@ public class FinManufacturerBankService extends MybatisBaseService> selAccountByOrgSid(FinManufacturerOrgPathQuery query) { + ResultBean> rb = ResultBean.fireFail(); + String userSid = query.getUserSid(); + String orgPath = query.getOrgPath(); + String useOrgSid = ""; + if (StringUtils.isBlank(orgPath)) { + useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); + } else { + useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + } + List list = baseMapper.selAccountByOrgSid(useOrgSid,query.getName()); + list.removeAll(Collections.singleton(null)); + return rb.success().setData(list); + } + + public IPage selAppAccountByOrgSid(PagerQuery query) { + QueryWrapper qw = new QueryWrapper<>(); + String name = query.getParams().getName(); + IPage page = PagerUtil.queryToPage(query); + String orgPath = query.getParams().getOrgPath(); + String orgSid = ""; + if (StringUtils.isNotBlank(orgPath)) { + orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + } else { + orgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getParams().getUserSid()).getData(); + } + qw.eq("useOrgSid", orgSid); + IPage iPage = baseMapper.selAppAccountByOrgSid(page, qw, name); + return iPage; + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBusDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBusDetailsVo.java index fe42ab73f2..7fc5c243a5 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBusDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBusDetailsVo.java @@ -89,4 +89,14 @@ public class DepositBusDetailsVo implements Vo { @ApiModelProperty("收款银行账号") private String collectionNumberKey; + + @ApiModelProperty("收款账户名称") + private String collectionAccountName; + + @ApiModelProperty("本分公司开户账号sid") + private String accountSid; + + @ApiModelProperty("开户银行") + private String depositBank; + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDetailVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDetailVo.java index 6f2f432a9b..6e911878cb 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDetailVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDetailVo.java @@ -74,4 +74,14 @@ public class DepositBuscenterDetailVo implements Vo { private String procInsId; @ApiModelProperty(value = "任务id") private String taskId; + + @ApiModelProperty("收款账户名称") + private String collectionAccountName; + + @ApiModelProperty("本分公司开户账号sid") + private String accountSid; + + @ApiModelProperty("开户银行") + private String depositBank; + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDto.java index b5ccbf5cfa..4eecffe934 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDto.java @@ -90,4 +90,13 @@ public class DepositBuscenterDto implements Dto { @ApiModelProperty("制单日期") private String createDate; + @ApiModelProperty("收款账户名称") + private String collectionAccountName; + + @ApiModelProperty("本分公司开户账号sid") + private String accountSid; + + @ApiModelProperty("开户银行") + private String depositBank; + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppFinManufacturerBankFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppFinManufacturerBankFeign.java new file mode 100644 index 0000000000..7ad0c64288 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppFinManufacturerBankFeign.java @@ -0,0 +1,63 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.base.account; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; +import org.springframework.web.bind.annotation.*; + + +/** + * Project: anrui-fin(安瑞财务)
+ * File: FinManufacturerBankFeign.java
+ * Class: com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankFeign
+ * Description: 公司开户账号表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-08-03 15:00:11
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "公司开户账号表") +@FeignClient( + contextId = "anrui-terminal-FinManufacturerBank", + name = "anrui-terminal", + path = "base/v1/account", + fallback = AppFinManufacturerBankFeignFallback.class) +public interface AppFinManufacturerBankFeign { + + @ApiOperation("获取该本分公司下的开户账号") + @PostMapping("/selAccountByOrgSid") + @ResponseBody + public ResultBean> selAccountByOrgSid(@RequestBody PagerQuery query); +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppFinManufacturerBankFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppFinManufacturerBankFeignFallback.java new file mode 100644 index 0000000000..7ce9eb4b98 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppFinManufacturerBankFeignFallback.java @@ -0,0 +1,56 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.base.account; + +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 java.util.List; + +/** + * Project: anrui-fin(安瑞财务)
+ * File: FinManufacturerBankFeignFallback.java
+ * Class: com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankFeignFallback
+ * Description: 公司开户账号表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-08-03 15:00:11
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class AppFinManufacturerBankFeignFallback implements AppFinManufacturerBankFeign { + + + @Override + public ResultBean> selAccountByOrgSid(PagerQuery query) { + return null; + } +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppManufacturerOrgPathQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppManufacturerOrgPathQuery.java new file mode 100644 index 0000000000..2752a4518c --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppManufacturerOrgPathQuery.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.terminal.api.base.account; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppManufacturerOrgPathQuery implements Query { + private static final long serialVersionUID = 5132061239127199612L; + + @ApiModelProperty(value = "用户sid") + private String userSid; + + @ApiModelProperty(value = "机构sid") + private String orgPath; + + @ApiModelProperty(value = "查询条件") + private String name; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppManufacturerVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppManufacturerVo.java new file mode 100644 index 0000000000..566cf1c84a --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppManufacturerVo.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.terminal.api.base.account; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppManufacturerVo implements Vo { + private static final long serialVersionUID = 6743866407572366715L; + + @ApiModelProperty("银行账号") + private String bankAccount; + @ApiModelProperty("账户名称") + private String accountName; + @ApiModelProperty("开户银行") + private String depositBank; + @ApiModelProperty("开户银行key") + private String depositBankKey; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/account/AppFinManufacturerBankRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/account/AppFinManufacturerBankRest.java new file mode 100644 index 0000000000..d5ca4ba19b --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/account/AppFinManufacturerBankRest.java @@ -0,0 +1,67 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.biz.base.account; + + +import com.yxt.anrui.terminal.api.base.account.AppFinManufacturerBankFeign; +import com.yxt.anrui.terminal.api.base.account.AppManufacturerOrgPathQuery; +import com.yxt.anrui.terminal.api.base.account.AppManufacturerVo; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * Project: anrui-fin(安瑞财务)
+ * File: FinManufacturerBankFeignFallback.java
+ * Class: com.yxt.anrui.fin.biz.finmanufacturerbank.FinManufacturerBankRest
+ * Description: 公司开户账号表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-08-03 15:00:11
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "公司开户账号表") +@RestController +@RequestMapping("base/v1/account") +public class AppFinManufacturerBankRest implements AppFinManufacturerBankFeign { + + @Autowired + private AppFinManufacturerBankService appFinManufacturerBankService; + + @Override + public ResultBean> selAccountByOrgSid(PagerQuery query) { + return appFinManufacturerBankService.selAccountByOrgSid(query); + } +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/account/AppFinManufacturerBankService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/account/AppFinManufacturerBankService.java new file mode 100644 index 0000000000..1503c0a120 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/account/AppFinManufacturerBankService.java @@ -0,0 +1,80 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.biz.base.account; + +import cn.hutool.core.bean.BeanUtil; +import com.alibaba.fastjson.JSON; +import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoicePageQuery; +import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoicePageVo; +import com.yxt.anrui.fin.api.finmanufacturerbank.*; +import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoicePageVo; +import com.yxt.anrui.terminal.api.base.account.AppManufacturerOrgPathQuery; +import com.yxt.anrui.terminal.api.base.account.AppManufacturerVo; +import com.yxt.anrui.terminal.config.CoverUtils; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; + +import com.yxt.common.core.vo.PagerVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +/** + * Project: anrui-fin(安瑞财务)
+ * File: FinManufacturerBankService.java
+ * Class: com.yxt.anrui.fin.biz.finmanufacturerbank.FinManufacturerBankService
+ * Description: 公司开户账号表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-08-03 15:00:11
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class AppFinManufacturerBankService { + + @Autowired + private FinManufacturerBankFeign finManufacturerBankFeign; + + public ResultBean> selAccountByOrgSid(PagerQuery query) { + ResultBean> rb = ResultBean.fireFail(); + PagerQuery pq = CoverUtils.getPagerQuery(query); + ResultBean> resultBean = finManufacturerBankFeign.selAppAccountByOrgSid(pq); + List voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppManufacturerVo.class)).collect(Collectors.toList()); + PagerVo v = new PagerVo<>(); + BeanUtil.copyProperties(resultBean.getData(), v); + v.setRecords(voList); + return rb.success().setData(v); + } + + +} \ No newline at end of file From 434d8a3807ea076b357394f028ccaa4abb4f5374 Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Wed, 7 Dec 2022 18:29:53 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=93=B6=E8=A1=8C?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/anrui/fin/biz/kingdee/cnbankcnt/CNBankcntService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/CNBankcntService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/CNBankcntService.java index 58f69337cb..0dd916620f 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/CNBankcntService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/CNBankcntService.java @@ -101,7 +101,7 @@ public class CNBankcntService extends FinKingDeeService { } /** - * 查看物料 + * 查看银行账号 * @param bankName * @return * @throws Exception From 74a11b240738afd132776f74db698c21cbf1ece9 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 8 Dec 2022 09:04:24 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../busmaindeposit/BusMainDepositService.java | 16 ++++++ .../AppFinCollectionConfirmationDto.java | 15 ++++++ .../AppFinCollectionConfirmationInitVo.java | 15 ++++++ .../AppFinCollectionConfirmationPageVo.java | 13 +++++ .../FinCollectionConfirmation.java | 2 + .../FinCollectionConfirmationDetailsVo.java | 14 +++++ .../FinCollectionConfirmationDto.java | 14 +++++ .../FinCollectionConfirmationVo.java | 11 ++++ .../app/FinConfirmDto.java | 13 +++++ .../FinCollectionConfirmationMapper.xml | 17 +++++- .../FinCollectionConfirmationService.java | 54 +++++++++++++++++-- .../collectionConfirm/ConfirmationDto.java | 16 +++++- .../collectionConfirm/ConfirmationInitVo.java | 15 ++++++ .../collectionConfirm/ConfirmationPageVo.java | 5 ++ 14 files changed, 212 insertions(+), 8 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java index 91c29bf821..2402ef27fc 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java @@ -2127,8 +2127,24 @@ public class BusMainDepositService extends MybatisBaseService orgList = Arrays.asList(bv.getOrgSidPath().split("/")); + String deptSid = orgList.get(orgList.size() - 1); + ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(deptSid); + if(sysOrganizationVoResultBean.getData() != null){ + finConfirmDto.setCreateDept(sysOrganizationVoResultBean.getData().getName()); + } + //申请日期 + finConfirmDto.setCreateDate(DateUtil.today()); + //收款账户名称 + finConfirmDto.setReceivingName(busDeposit.getCollectionAccountName()); + //付款账号后4位 + finConfirmDto.setPayAccount(busDeposit.getPayBankAcc()); + //付款银行 + finConfirmDto.setPayBank(busDeposit.getDepositBank()); finCollectionConfirmationFeign.saveFinConfirm(finConfirmDto); } if (DictCommonEnum.DepositBillType.JYDD_DC.getCode().equals(busMainDeposit.getDepositBillTypeKey())) { diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDto.java index eabe9e0a1c..6d59d66efe 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDto.java @@ -72,4 +72,19 @@ public class AppFinCollectionConfirmationDto implements Dto { @ApiModelProperty("款项明细") private List contractList; + + @ApiModelProperty("申请部门") + private String createDept; + @ApiModelProperty("申请日期") + private String createDate; + @ApiModelProperty("收款账户名称") + private String receivingName; + @ApiModelProperty("付款账号后4位") + private String payAccount; + @ApiModelProperty("付款银行") + private String payBank; + @ApiModelProperty("收款银行账号sid") + private String accountSid; + @ApiModelProperty("申请人") + private String createByName; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationInitVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationInitVo.java index 49db1dd475..5f84d557d0 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationInitVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationInitVo.java @@ -68,5 +68,20 @@ public class AppFinCollectionConfirmationInitVo implements Vo { @ApiModelProperty("") private boolean handle; + @ApiModelProperty("申请部门") + private String createDept; + @ApiModelProperty("申请日期") + private String createDate; + @ApiModelProperty("收款账户名称") + private String receivingName; + @ApiModelProperty("付款账号后4位") + private String payAccount; + @ApiModelProperty("付款银行") + private String payBank; + @ApiModelProperty("收款银行账号sid") + private String accountSid; + @ApiModelProperty("申请人名称") + private String createByName; + } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationPageVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationPageVo.java index 57e6e520d8..470a33016f 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationPageVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationPageVo.java @@ -40,5 +40,18 @@ public class AppFinCollectionConfirmationPageVo implements Vo { @ApiModelProperty("余额") private BigDecimal balance; + @ApiModelProperty("申请部门") + private String createDept; + @ApiModelProperty("申请日期") + private String createDate; + @ApiModelProperty("收款账户名称") + private String receivingName; + @ApiModelProperty("付款账号后4位") + private String payAccount; + @ApiModelProperty("付款银行") + private String payBank; + @ApiModelProperty("申请人") + private String createByName; + } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java index 16b5e024ee..2d7e9cc6d7 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java @@ -104,4 +104,6 @@ public class FinCollectionConfirmation extends BaseEntity { private String payAccount; @ApiModelProperty("付款银行") private String payBank; + @ApiModelProperty("收款银行账号sid") + private String accountSid; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDetailsVo.java index 5ecb7aad3b..7068636fa0 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDetailsVo.java @@ -90,4 +90,18 @@ public class FinCollectionConfirmationDetailsVo implements Vo { private List paymentVoucherAppendixs; // 打款凭证附件 @ApiModelProperty("汇款确认书附件") private List remittanceConfirmationAppendixs; // 汇款确认书附件 + + + @ApiModelProperty("申请部门") + private String createDept; + @ApiModelProperty("申请日期") + private String createDate; + @ApiModelProperty("收款账户名称") + private String receivingName; + @ApiModelProperty("付款账号后4位") + private String payAccount; + @ApiModelProperty("付款银行") + private String payBank; + + } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDto.java index 6ee167cfd2..d563ced2b7 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDto.java @@ -96,4 +96,18 @@ public class FinCollectionConfirmationDto implements Dto { private List paymentVoucherAppendixs; // 打款凭证附件 @ApiModelProperty("汇款确认书附件") private List remittanceConfirmationAppendixs; // 汇款确认书附件 + + @ApiModelProperty("申请部门") + private String createDept; + @ApiModelProperty("申请日期") + private String createDate; + @ApiModelProperty("收款账户名称") + private String receivingName; + @ApiModelProperty("付款账号后4位") + private String payAccount; + @ApiModelProperty("付款银行") + private String payBank; + @ApiModelProperty("收款银行账号sid") + private String accountSid; + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java index d77df63829..46e37700cc 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java @@ -75,4 +75,15 @@ public class FinCollectionConfirmationVo implements Vo { @ApiModelProperty("余额") private String balance; + + @ApiModelProperty("申请部门") + private String createDept; + @ApiModelProperty("申请日期") + private String createDate; + @ApiModelProperty("收款账户名称") + private String receivingName; + @ApiModelProperty("付款账号后4位") + private String payAccount; + @ApiModelProperty("付款银行") + private String payBank; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/FinConfirmDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/FinConfirmDto.java index f85dfcdfd9..e4334bc871 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/FinConfirmDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/FinConfirmDto.java @@ -69,4 +69,17 @@ public class FinConfirmDto implements Dto { @ApiModelProperty("打款凭证url") private String paymentVoucherUrl; + @ApiModelProperty("申请部门") + private String createDept; + @ApiModelProperty("申请日期") + private String createDate; + @ApiModelProperty("收款账户名称") + private String receivingName; + @ApiModelProperty("付款账号后4位") + private String payAccount; + @ApiModelProperty("付款银行") + private String payBank; + @ApiModelProperty("收款银行账号sid") + private String accountSid; + } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml index 65ba63b55c..2336ef9d2a 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml @@ -29,7 +29,13 @@ payerName, collectionMoney, remarks, - balance + balance, + createDate, + createDept, + receivingName, + payAccount, + payBank, + createByName FROM fin_collection_confirmation @@ -51,7 +57,14 @@ payerName AS paymentName, collectionMoney AS paymentMoney, remarks, - balance + balance, + createDept, + createDate, + receivingName, + payAccount, + payBank, + accountSid, + createByName FROM fin_collection_confirmation WHERE sid = #{collectionBillSid} AND useOrgSid = #{useOrgSid} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 329a3a5e25..ee02dcc737 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -58,8 +58,11 @@ import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedRec import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService; import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedService; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -73,10 +76,7 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; /** @@ -572,7 +572,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //申请部门 if (StringUtils.isNotBlank(dto.getOrgPath())) { orgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); + if(StringUtils.isBlank(deptName)){ + List orgList = Arrays.asList(dto.getOrgPath().split("/")); + String deptSid = orgList.get(orgList.size()-1); + ResultBean organizationVoResultBean = sysOrganizationFeign.fetchBySid(deptSid); + if(organizationVoResultBean.getData() != null){ + deptName = organizationVoResultBean.getData().getName(); + } + } } else { orgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData(); + //根据staffSid获取用户的组织全路径 + ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!staffOrgResultBean.getSuccess()) { + return rb.setMsg(staffOrgResultBean.getMsg()); + } + if(StringUtils.isBlank(deptName)){ + deptName = staffOrgResultBean.getData().getOrgName(); + } + } + if(StringUtils.isBlank(createName)){ + createName =userVoResultBean.getData().getName(); } //新增收款申请 FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation(); BeanUtil.copyProperties(dto, finCollectionConfirmation, "sid"); finCollectionConfirmation.setUseOrgSid(orgSid); + finCollectionConfirmation.setCreateByName(createName); + finCollectionConfirmation.setCreateDate(deptName); + finCollectionConfirmation.setCreateDate(DateUtil.today()); finCollectionConfirmation.setCreateBySid(dto.getUserSid()); //打款凭证 List payFiles = dto.getPayFiles(); @@ -1374,6 +1404,20 @@ public class FinCollectionConfirmationService extends MybatisBaseService stringList = Arrays.asList(confirmation.getPaymentVoucherUrl().split(",")); + //附件保存:打款凭证附件 + stringList.stream().forEach(v -> { + CommonAppendixDto commonAppendixDto = new CommonAppendixDto(); + commonAppendixDto.setFilePath(v); + commonAppendixDto.setFileName(CommonAttachTypeEnum.PAYMENT_VOUCHER.getMark()); + commonAppendixDto.setLinkSid(confirmation.getSid()); + commonAppendixDto.setCreateBySid(confirmation.getCreateBySid()); + commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()); + commonAppendixFeign.save(commonAppendixDto); + }); + } return rb.success(); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDto.java index aa4460b10f..3c4ae4d4b9 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDto.java @@ -1,7 +1,6 @@ package com.yxt.anrui.terminal.api.finance.collectionConfirm; import com.fasterxml.jackson.annotation.JsonProperty; -import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.AppFinSelectedReceivablesDetailedDto; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -75,4 +74,19 @@ public class ConfirmationDto implements Dto { @ApiModelProperty("机构sid") private String orgPath; + @ApiModelProperty("申请部门") + private String createDept; + @ApiModelProperty("申请日期") + private String createDate; + @ApiModelProperty("收款账户名称") + private String receivingName; + @ApiModelProperty("付款账号后4位") + private String payAccount; + @ApiModelProperty("付款银行") + private String payBank; + @ApiModelProperty("收款银行账号sid") + private String accountSid; + @ApiModelProperty("申请人") + private String createByName; + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationInitVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationInitVo.java index f9d10d1a56..c83a85cab2 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationInitVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationInitVo.java @@ -64,4 +64,19 @@ public class ConfirmationInitVo implements Vo { @ApiModelProperty("用户sid") private String userSid; + + @ApiModelProperty("申请部门") + private String createDept; + @ApiModelProperty("申请日期") + private String createDate; + @ApiModelProperty("收款账户名称") + private String receivingName; + @ApiModelProperty("付款账号后4位") + private String payAccount; + @ApiModelProperty("付款银行") + private String payBank; + @ApiModelProperty("收款银行账号sid") + private String accountSid; + @ApiModelProperty("申请人名称") + private String createByName; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationPageVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationPageVo.java index 4b5978a332..162fab0228 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationPageVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationPageVo.java @@ -45,4 +45,9 @@ public class ConfirmationPageVo implements Vo { @ApiModelProperty("是否显示删除") private boolean showDelete; + @ApiModelProperty("收款账户名称") + private String receivingName; + @ApiModelProperty("付款账号后4位") + private String payAccount; + } From 546ec55486dc598de013812b9a3c9b947b06b798 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 8 Dec 2022 09:10:39 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=AE=80=E6=98=93?= =?UTF-8?q?=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/dictcommons/dictcommons.js | 9 + .../xunidingdanFlow/dingjinshouqu.vue | 65 ++++--- .../xunidingdanFlow/dingjinshouquEdit.vue | 158 ++++++++--------- .../xunidingdanFlow/dingjinshouquInfo.vue | 73 +++++--- .../xunidingdan/xunidingjinAdd.vue | 162 +++++++++--------- .../xunidingdan/xunidingjininfo.vue | 73 +++++--- 6 files changed, 297 insertions(+), 243 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/dictcommons/dictcommons.js b/anrui-buscenter/anrui-buscenter-ui/src/api/dictcommons/dictcommons.js index 4128471010..8dd5c55eb5 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/api/dictcommons/dictcommons.js +++ b/anrui-buscenter/anrui-buscenter-ui/src/api/dictcommons/dictcommons.js @@ -28,6 +28,15 @@ export function typeValues(data) { }) } +// 根据用户sid获取本分公司下的银行账号 +export function selAccountByOrgSid(data) { + return request({ + url: '/fin/v1/finmanufacturerbank/selAccountByOrgSid', + method: 'get', + params: data + }) +} + // 品牌下拉 export function brandDown(data) { return request({ diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouqu.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouqu.vue index 13a6c2ba36..91e8a31278 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouqu.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouqu.vue @@ -12,12 +12,7 @@
销售简易订单
- - - 金额单位: 元 - - - + 分公司 @@ -71,17 +66,25 @@ - 车辆台数 + 付款方式 - {{ temp.carNumber }} + {{ temp.payTypeValue }} - 订金金额 + 付款日期 - + + + {{ temp.payDate }} + + + + 订金金额(元) + + {{ temp.deposit }} @@ -89,29 +92,43 @@ - 付款日期 + 付款账号后4位 - {{ temp.payDate }} + {{ temp.payNumber }} - 付款方式 + 开户银行 - {{ temp.payTypeValue }} + {{ temp.depositBank }} - 付款银行账号 + + + + + + + 车辆台数 - {{ temp.payNumber }} + {{ temp.carNumber }} + + + + + + + + @@ -122,10 +139,18 @@ {{ temp.collectionNumber }} + + 收款银行名称 + + + + {{ temp.collectionAccountName }} + + 收款银行 - + {{ temp.collectionBank }} @@ -492,12 +517,6 @@ export default { text-align: center; padding: 30px 0 20px 0; } -.rowStyle { - border-left: 0px !important; -} -.colStyle { - border-right: 0px !important; -} .rowClass{ border-top: 1px solid #E0E3EB; } diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquEdit.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquEdit.vue index f8df25ce4c..62386cebe5 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquEdit.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquEdit.vue @@ -11,12 +11,7 @@
销售简易订单
- - - 金额单位: 元 - - - + 分公司 @@ -70,17 +65,27 @@ - 车辆台数 + *付款方式 - - + + + + - *订金金额 + *付款日期 - + + + + + + + *订金金额(元) + + @@ -88,53 +93,71 @@ - *付款日期 + *付款账号后4位 - - + + - *付款方式 + 开户银行 - - - - + + - *付款银行账号 - - - - *收款银行 + 车辆台数 - - - - - + + + + + + + + + + + + + *收款银行账号 - + + + 收款银行名称 + + + + {{ temp.collectionAccountName }} + + + + *收款银行 + + + + {{ temp.collectionBank }} + + @@ -196,7 +219,7 @@ From 5b07fd187cc7475b12b44f693a720a56d4721769 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 8 Dec 2022 09:13:16 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=AE=80=E6=98=93?= =?UTF-8?q?=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquEdit.vue | 2 +- .../src/views/xiaoshouguanli/xunidingdan/xunidingjinAdd.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquEdit.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquEdit.vue index 62386cebe5..1644be72a4 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquEdit.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquEdit.vue @@ -137,7 +137,7 @@ - + diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjinAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjinAdd.vue index cfb4f83fbb..3ea235fba5 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjinAdd.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjinAdd.vue @@ -138,7 +138,7 @@ - + From a294e8f06623f87713c03fcbb781b3be3617bd0f Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 8 Dec 2022 09:26:56 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=AC=BE=E9=A1=B9?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4--=E6=94=B6=E6=AC=BE=E7=A1=AE=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anruifinmanagement/paymentConfirmation.js | 10 +- .../src/api/jichuxinxi/dictcommons.js | 9 + .../acknowledgementReceipt.vue | 70 ++++-- .../acknowledgementReceiptAdd.vue | 200 ++++++++++++------ .../acknowledgementReceiptInfo.vue | 93 +++++--- .../cashierConfirmationInfo.vue | 4 +- 6 files changed, 267 insertions(+), 119 deletions(-) diff --git a/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/paymentConfirmation.js b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/paymentConfirmation.js index 314817d8ef..8fd7c82925 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/paymentConfirmation.js +++ b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/paymentConfirmation.js @@ -1,5 +1,4 @@ import request from '@/utils/request' -import qs from 'querystring' // 收款确认管理和出纳款项管理分页列表条件查询 export function listPage(data) { @@ -24,11 +23,11 @@ export function listAll(data) { }) } -// 收款确认管理h和出纳款项确认管理--回显、详情 -export function fetchBySid(data) { +// 收款确认管理和出纳款项确认管理--回显、详情 +export function fetchDetailBySid(data) { return request({ url: '/fin/fincollectionconfirmation/fetchBySid/' + data, - method: 'get', + method: 'get' }) } @@ -111,7 +110,8 @@ export function dataDictionary(data) { // 上传文件 export function upload(data) { return request({ - url: '/fin/file/upload',data, + url: '/fin/file/upload', + data, method: 'post', headers: { 'Content-Type': 'multipart/form-data' diff --git a/anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js b/anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js index 987b79bcd2..bfc96fa673 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js +++ b/anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js @@ -64,6 +64,15 @@ export function selectAccountByUseOrgSid(data) { }) } +// 根据用户sid获取本分公司下的银行账号 +export function selAccountByOrgSid(data) { + return request({ + url: '/fin/v1/finmanufacturerbank/selAccountByOrgSid', + method: 'get', + params: data + }) +} + // 获取厂家回款通路 export function selectNameByOrg(data) { return request({ diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue index f2ff190c8e..c0bcbf0a42 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue @@ -8,7 +8,7 @@
- + @@ -17,9 +17,7 @@ - - - + @@ -48,54 +46,84 @@
- - + + - + - + - + - + - + + + + - + - + + + + - + + + + + + + - + + + + + + + @@ -204,7 +232,7 @@ export default { this.receiptBank_list = res.data } }) - dataDictionary({ type: 'receiptType' }).then((res) => { + dataDictionary({ type: 'customerPayType' }).then((res) => { if (res.code === '200') { this.collectionType_list = res.data } diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue index 51af126a8b..9559179988 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue @@ -13,59 +13,109 @@ - 收款日期 + 申请部门 - + - + {{ formobj.createDept }} - 收款银行 + 申请人 - + - - - + {{ formobj.createByName }} - 收款银行账号 + 申请日期 - + + {{ formobj.createDate }} + + + + + + *收款银行账号 + + + - + + + 收款银行名称 + + + + {{ formobj.receivingName }} + + + + *收款银行 + + + + {{ formobj.collectionBank }} + + - 收款方式 + *收款金额(元) - + + + + + + *收款日期 + + + + + + + + *收款方式 + + + + + - 付款方名称 + *付款方 - + - 收款金额 + *付款账号后4位 + + + + + + + + 付款银行 - + @@ -234,8 +284,9 @@ diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue index 214303a3fe..e0ad95383b 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue @@ -168,7 +168,7 @@