From c720061663f8475e25b5e24a552f2a7b87e29e3e Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 25 Apr 2023 09:03:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=94=B3=E8=AF=B7=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E9=94=80=E5=94=AE=E5=8F=B0=E8=B4=A6=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract/AppRovalContractPageQuery.java | 4 +- .../BusAdvanceGinvoiceapplyService.java | 2 +- .../BusArrearsCarryVehicleApplyService.java | 6 +-- .../bussalesorder/BusSalesOrderService.java | 37 +++++++++++-------- .../FinBillApplicationService.java | 10 +++-- .../approval/AppRovalFeignFallback.java | 5 +++ .../approval/RovalContractPageQuery.java | 2 + .../AppBusAdvanceGinvoiceapplyService.java | 30 ++++++++------- 8 files changed, 56 insertions(+), 40 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/contract/AppRovalContractPageQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/contract/AppRovalContractPageQuery.java index 026e538cc9..7833234f47 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/contract/AppRovalContractPageQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/contract/AppRovalContractPageQuery.java @@ -11,10 +11,10 @@ public class AppRovalContractPageQuery implements Query { @ApiModelProperty("用户sid") private String userSid; - @ApiModelProperty("车架号 客户名称 合同编号") private String name; - @ApiModelProperty("状态") private int stateType; + @ApiModelProperty("组织全路径") + private String orgPath; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java index 46e6182c0c..54bb35b6c6 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java @@ -430,7 +430,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService 0) { for (AppRovalContractPageVo appRovalContractPageVo : vinLists) { AdCarListVo adCarListVo = new AdCarListVo(); - adCarListVo.setVin(appRovalContractPageVo.getVin()); + //adCarListVo.setVin(appRovalContractPageVo.getVin()); CommonContractVo commonContractVo = commonContractFeign.getContractBySalesOrderSid(appRovalContractPageVo.getBusSid()).getData(); if (commonContractVo != null) { adCarListVo.setPrice(commonContractVo.getPrice()); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java index b330bd3683..5984159fe6 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java @@ -502,12 +502,12 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService 0) { for (AppRovalContractPageVo appRovalContractPageVo : vinLists) { AdCarListVo adCarListVo = new AdCarListVo(); - adCarListVo.setVin(appRovalContractPageVo.getVin()); + //adCarListVo.setVin(appRovalContractPageVo.getVin()); //获取车辆sid - BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(appRovalContractPageVo.getVin(), useOrgSid).getData(); + /*BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(appRovalContractPageVo.getVin(), useOrgSid).getData(); if (baseVehicle != null) { adCarListVo.setCarSid(baseVehicle.getSid()); - } + }*/ CommonContractVo commonContractVo = commonContractFeign.getContractBySalesOrderSid(appRovalContractPageVo.getBusSid()).getData(); if (commonContractVo != null) { adCarListVo.setPrice(commonContractVo.getPrice()); 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 c6707b1702..14ca375f33 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 @@ -5300,22 +5300,27 @@ public class BusSalesOrderService extends MybatisBaseService getApprovalContractList(PagerQuery pagerQuery) { AppRovalContractPageQuery params = pagerQuery.getParams(); SysUserVo sysUserVo = sysUserFeign.fetchBySid(params.getUserSid()).getData(); - QueryWrapper qw = new QueryWrapper<>(); - qw.eq("staffSid",sysUserVo.getStaffSid()); - qw.eq("orgSid",sysUserVo.getDepartmentSid()); - if (StringUtils.isNotBlank(params.getName())){ - qw.and(wrapper -> wrapper.like("partyB", params.getName()).or().like("contractNo", params.getName())); - } - qw.orderByDesc("createDate"); - IPage page = PagerUtil.queryToPage(pagerQuery); - IPage iPage = baseMapper.selectByStaffSid(page, qw); - for (AppRovalContractPageVo record : iPage.getRecords()) { - String createDate = record.getCreateDate(); - DateTime dateTime = DateUtil.parse(createDate, "yyyy-MM-dd"); - createDate = DateUtil.formatDate(dateTime); - record.setCreateDate(createDate); - } - return iPage; + String orgPath = params.getOrgPath(); + String deptSid = orgPath.substring(orgPath.lastIndexOf("/") + 1); + if (params.getStateType() == 2){ + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("staffSid",sysUserVo.getStaffSid()); + qw.eq("orgSid",deptSid); + if (StringUtils.isNotBlank(params.getName())){ + qw.and(wrapper -> wrapper.like("partyB", params.getName()).or().like("contractNo", params.getName())); + } + qw.orderByDesc("createDate"); + IPage page = PagerUtil.queryToPage(pagerQuery); + IPage iPage = baseMapper.selectByStaffSid(page, qw); + for (AppRovalContractPageVo record : iPage.getRecords()) { + String createDate = record.getCreateDate(); + DateTime dateTime = DateUtil.parse(createDate, "yyyy-MM-dd"); + createDate = DateUtil.formatDate(dateTime); + record.setCreateDate(createDate); + } + return iPage; + } + return null; } public List selectByContractNo(String contractNo) { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index bf1ff21c6e..823b9c5001 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -2059,18 +2059,20 @@ public class FinBillApplicationService extends MybatisBaseService> getApprovalContractList(PagerQuery pagerQuery) { return null; } + + @Override + public ResultBean> getVehicleQKKPList(PagerQuery pagerQuery) { + return null; + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/RovalContractPageQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/RovalContractPageQuery.java index 859c4a398b..eddc6fa29e 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/RovalContractPageQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/RovalContractPageQuery.java @@ -14,4 +14,6 @@ public class RovalContractPageQuery implements Query { private String name; @ApiModelProperty("状态") private int stateType; + @ApiModelProperty("组织全路径") + private String orgPath; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java index 2329768f63..c32558af44 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java @@ -167,16 +167,18 @@ public class AppBusAdvanceGinvoiceapplyService { //车辆信息 List vinListVos = new ArrayList<>(); List finBillVehicles = finBillApplicationDetailsVo.getFinBillVehicles(); - for (FinBillVehicleVo finBillVehicle : finBillVehicles) { - AppCarListVo vinListVo = new AppCarListVo(); - vinListVo.setVin(finBillVehicle.getVinNo()); - vinListVo.setCertificateStateKey(finBillVehicle.getCertificateStateKey()); - vinListVo.setCertificateState(finBillVehicle.getCertificateStateValue()); - vinListVo.setInvoiceTypeKey(finBillVehicle.getBillTypeKey()); - vinListVo.setInvoiceType(finBillVehicle.getBillTypeValue()); - vinListVo.setInvoiceName(finBillVehicle.getOpenTickName()); - vinListVo.setInvoiceInfo(finBillVehicle.getOpenTickRemarks()); - vinListVos.add(vinListVo); + if (finBillVehicles != null){ + for (FinBillVehicleVo finBillVehicle : finBillVehicles) { + AppCarListVo vinListVo = new AppCarListVo(); + vinListVo.setVin(finBillVehicle.getVinNo()); + vinListVo.setCertificateStateKey(finBillVehicle.getCertificateStateKey()); + vinListVo.setCertificateState(finBillVehicle.getCertificateStateValue()); + vinListVo.setInvoiceTypeKey(finBillVehicle.getBillTypeKey()); + vinListVo.setInvoiceType(finBillVehicle.getBillTypeValue()); + vinListVo.setInvoiceName(finBillVehicle.getOpenTickName()); + vinListVo.setInvoiceInfo(finBillVehicle.getOpenTickRemarks()); + vinListVos.add(vinListVo); + } } vo.setVinList(vinListVos); //挂车信息 @@ -203,22 +205,22 @@ public class AppBusAdvanceGinvoiceapplyService { List invoiceApplyConfirmImages = new ArrayList<>();//开票信息确认书 List registerContractImages = new ArrayList<>();//车辆登记合同 List idCardImages = new ArrayList<>(); - if (zjApplicationAppendxs.size() > 0){ + if (zjApplicationAppendxs != null){ for (FinBillFileVo zjApplicationAppendx : zjApplicationAppendxs) { idCardImages.add(zjApplicationAppendx.getFileUrl()); } } - if (khkpsqsApplicationAppendxs.size() > 0){ + if (khkpsqsApplicationAppendxs != null){ for (FinBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) { customerInvoiceApplyImages.add(khkpsqsApplicationAppendx.getFileUrl()); } } - if (kpxxqrsApplicationAppendxs.size() > 0){ + if (kpxxqrsApplicationAppendxs != null){ for (FinBillFileVo kpxxqrsApplicationAppendx : kpxxqrsApplicationAppendxs) { invoiceApplyConfirmImages.add(kpxxqrsApplicationAppendx.getFileUrl()); } } - if (cldjhtApplicationAppendxs.size() > 0){ + if (cldjhtApplicationAppendxs != null){ for (FinBillFileVo cldjhtApplicationAppendx : cldjhtApplicationAppendxs) { registerContractImages.add(cldjhtApplicationAppendx.getFileUrl()); }