From 7f8c00200135a6666c315bd73963e390fd4a3995 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 13 Oct 2023 17:42:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseDistributorService.java | 12 +++++-- .../api/bussalesorder/BusSalesOrderFeign.java | 5 +++ .../BusSalesOrderFeignFallback.java | 5 +++ .../bussalesorder/BusSalesOrderMapper.java | 1 + .../biz/bussalesorder/BusSalesOrderMapper.xml | 26 ++++++++++------ .../biz/bussalesorder/BusSalesOrderRest.java | 5 +++ .../bussalesorder/BusSalesOrderService.java | 31 +++++++++++++------ .../FinCompanyInvoicingService.java | 10 ++++++ .../flowable/api/flow/FlowableFallback.java | 5 +++ 9 files changed, 79 insertions(+), 21 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java index e25a6991bb..0cb932ac7a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java @@ -1332,9 +1332,17 @@ public class BaseDistributorService extends MybatisBaseService finCompanyInvoicingBillListVos = new ArrayList<>(); if (StringUtils.isBlank(search)) { - finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qySelByUseOrgSid2(useOrgSid, invoiceKey); + if ("02".equals(invoiceKey)){ + finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qySelByUseOrgSid2(useOrgSid, invoiceKey); + }else { + finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qySelByUseOrgSid(useOrgSid); + } } else { - finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qyAppSelByUseOrgSid2(useOrgSid, search, invoiceKey); + if ("02".equals(search)){ + finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qyAppSelByUseOrgSid2(useOrgSid, search, invoiceKey); + }else { + finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qyAppSelByUseOrgSid(useOrgSid, search); + } } List appDisAndCustms = new ArrayList<>(); for (FinCompanyInvoicingBillListVo finCompanyInvoicingBillListVo : finCompanyInvoicingBillListVos) { diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java index fbca4c4883..48379f42ef 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java @@ -90,6 +90,11 @@ public interface BusSalesOrderFeign { @ResponseBody public ResultBean fetchByContractNo(@PathVariable("contractNo") String contractNo); + @ApiOperation("根据合同编号查询金融方案开票价") + @GetMapping("/fetchByContractNo2/{contractNo}") + @ResponseBody + public ResultBean fetchByContractNo2(@PathVariable("contractNo") String contractNo); + @ApiOperation("根据sid获取一条数据") @GetMapping("/fetchBySid/{sid}") @ResponseBody diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java index a82c2e2afd..484c6cd539 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java @@ -81,6 +81,11 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign { return null; } + @Override + public ResultBean fetchByContractNo2(String contractNo) { + return null; + } + @Override public ResultBean fetchBySid(String sid) { return null; diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java index 34a058c859..8dcd129394 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java @@ -222,4 +222,5 @@ public interface BusSalesOrderMapper extends BaseMapper { String selectBySid(String sid); + String selKpj(String contractNo); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index 043b28af0a..943236ccb7 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -507,15 +507,15 @@ + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java index b560df9e71..f384cd532b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java @@ -119,6 +119,11 @@ public class BusSalesOrderRest implements BusSalesOrderFeign { return busSalesOrderService.fetchByContractNo(contractNo); } + @Override + public ResultBean fetchByContractNo2(String contractNo) { + return busSalesOrderService.fetchByContractNo2(contractNo); + } + @Override public ResultBean fetchBySid(String sid) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index fa520ed7bb..bd05ab8af5 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -2278,7 +2278,7 @@ public class BusSalesOrderService extends MybatisBaseService fetchByContractNo2(String contractNo) { + ResultBean rb = ResultBean.fireFail(); + BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = new BusSalesOrderIsDTKPJVo(); + String kpj = baseMapper.selKpj(contractNo); + busSalesOrderIsDTKPJVo.setIsEdit(true); + busSalesOrderIsDTKPJVo.setOneBillMoney(kpj); + return rb.success().setData(busSalesOrderIsDTKPJVo); + } + public ResultBean rePublishSaleOrder(String saleOrderSid, String customerSid, String customerName, String customerMobile) throws InvocationTargetException, IllegalAccessException { ResultBean rb = ResultBean.fireFail(); @@ -7330,7 +7339,7 @@ public class BusSalesOrderService extends MybatisBaseService vinList = new ArrayList<>(); // int pos = 0; String pos = ""; - if(borrowSidList.size()>0){ + if (borrowSidList.size() > 0) { for (int j = 0; j < borrowSidList.size(); j++) { VinListVo2 vinListVo2 = new VinListVo2(); String borrowSid = borrowSidList.get(j); @@ -7490,8 +7499,8 @@ public class BusSalesOrderService extends MybatisBaseService 0) { for (int i = 0; i < vins.size(); i++) { String busVinSid = vins.get(i); - BusSalesOrderVehicle busSalesOrderVehicle =busSalesOrderVehicleService.fetchBySid(busVinSid); - if(StringUtils.isBlank(busSalesOrderVehicle.getBorrowerSid())){ + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.fetchBySid(busVinSid); + if (StringUtils.isBlank(busSalesOrderVehicle.getBorrowerSid())) { busSalesOrderVehicle.setBorrowerSid(busSalesOrderBorrower.getSid()); busSalesOrderVehicle.setBorrowName(busSalesOrderBorrower.getBorrowerName()); busSalesOrderVehicleService.updateById(busSalesOrderVehicle); @@ -7524,8 +7533,8 @@ public class BusSalesOrderService extends MybatisBaseService lenderVoResultBean = saleOrderInputLender(saleOrderSid); return lenderVoResultBean; } + + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java index 1ba93385cb..67009f6b44 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java @@ -26,6 +26,7 @@ package com.yxt.anrui.fin.biz.fincompanyinvoicing; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.buscenter.api.busbillfile.BusAttachTypeEnum; @@ -58,6 +59,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -444,6 +446,8 @@ public class FinCompanyInvoicingService extends MybatisBaseService(); qw.eq("useOrgSid", orgSid); qw.eq("isDelete", 0); + qw.isNotNull("effectiveDate"); + qw.ge("effectiveDate", DateUtil.formatDate(new Date())); List finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw); return finCompanyInvoicingBillListVos; } @@ -453,6 +457,8 @@ public class FinCompanyInvoicingService extends MybatisBaseService finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw); return finCompanyInvoicingBillListVos; } @@ -463,6 +469,8 @@ public class FinCompanyInvoicingService extends MybatisBaseService finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw); return finCompanyInvoicingBillListVos; } @@ -472,6 +480,8 @@ public class FinCompanyInvoicingService extends MybatisBaseService finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw); return finCompanyInvoicingBillListVos; } diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFallback.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFallback.java index f152fbda16..e85b7da756 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFallback.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFallback.java @@ -106,5 +106,10 @@ public class FlowableFallback implements FlowableFeign { return null; } + @Override + public ResultBean> getMapQKKP(FlowProcessMapQuery query) { + return null; + } + }