From cfc6edc3a9edc6fb00553ddef6f4971649c8d6b4 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 16 Oct 2023 14:10:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=AC=A0=E6=AC=BE=E9=A2=86?= =?UTF-8?q?=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basedistributor/BaseDistributorFeign.java | 4 ++ .../BaseDistributorFeignFallback.java | 5 ++ .../BaseDistributorListVo.java | 6 +++ .../basedistributor/BaseDistributorRest.java | 5 ++ .../BaseDistributorService.java | 50 +++++++++++++++++++ .../FinCompanyInvoicingBillListVo.java | 6 +++ .../FinCompanyInvoicingFeign.java | 5 ++ .../FinCompanyInvoicingFeignFallback.java | 5 ++ .../FinBillApplicationMapper.java | 1 + .../FinBillApplicationMapper.xml | 8 +++ .../FinBillApplicationService.java | 40 ++++++++++++++- .../FinCollectionConfirmationService.java | 3 ++ .../FinCompanyInvoicingMapper.xml | 7 ++- .../FinCompanyInvoicingRest.java | 5 ++ .../FinCompanyInvoicingService.java | 8 +++ 15 files changed, 154 insertions(+), 4 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java index 4de5caecab..beb7ec2af7 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java @@ -195,6 +195,10 @@ public interface BaseDistributorFeign { @GetMapping("/selectAllDisList") ResultBean> selectAllDisList(@RequestParam("orgSid") String orgSid, @RequestParam("staffSid") String staffSid); + @ApiOperation("开票申请中获取开票名称") + @GetMapping("/selectAllDisList2") + ResultBean> selectAllDisList2(@RequestParam("orgSid") String orgSid, @RequestParam("staffSid") String staffSid,@RequestParam("state")String state); + @ApiOperation("移动端查询经销商和客户信息") @GetMapping("/invoiceName") ResultBean> invoiceName(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath, @RequestParam(value = "search", required = false) String search); diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java index 1d7f586c0d..3b274e0652 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java @@ -214,6 +214,11 @@ public class BaseDistributorFeignFallback implements BaseDistributorFeign { return null; } + @Override + public ResultBean> selectAllDisList2(String orgSid, String staffSid,String state) { + return null; + } + @Override public ResultBean> invoiceName(String userSid, String orgPath, String search) { return null; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorListVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorListVo.java index cfc33a3c81..0b8d484633 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorListVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorListVo.java @@ -1,6 +1,7 @@ package com.yxt.anrui.base.api.basedistributor; import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -24,4 +25,9 @@ public class BaseDistributorListVo implements Vo { private String openTickRemarks;//拼接的开票信息 private String nameAndPhone;//个人名字手机号拼接 + + @ApiModelProperty("开票类型key") + private String openTickTypeKey; + @ApiModelProperty("开票类型value") + private String openTickTypeValue; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java index 48360030c7..c852df3188 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java @@ -348,6 +348,11 @@ public class BaseDistributorRest implements BaseDistributorFeign { return baseDistributorService.selectAllDisList(orgSid, staffSid); } + @Override + public ResultBean> selectAllDisList2(String orgSid, String staffSid,String state) { + return baseDistributorService.selectAllDisList2(orgSid, staffSid,state); + } + @Override public ResultBean> invoiceName(String userSid, String orgPath, String search) { return baseDistributorService.invoiceName(userSid, orgPath, search); 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 0cb932ac7a..b96888987f 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 @@ -1263,6 +1263,56 @@ public class BaseDistributorService extends MybatisBaseService> selectAllDisList2(String orgSid, String staffSid,String state) { + ResultBean rb = ResultBean.fireFail(); + List finCompanyInvoicingBillListVos = new ArrayList<>(); + if("1".equals(state)){//开票申请 + finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qySelByUseOrgSidTwo(orgSid); + }else{ + finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qySelByUseOrgSid(orgSid); + } + List baseDistributorListVos = new ArrayList<>(); + for (FinCompanyInvoicingBillListVo finCompanyInvoicingBillListVo : finCompanyInvoicingBillListVos) { + BaseDistributorListVo baseDistributorListVo = new BaseDistributorListVo(); + BeanUtil.copyProperties(finCompanyInvoicingBillListVo, baseDistributorListVo); + String openTickRemarks = ""; + if (StringUtils.isNotBlank(openTickRemarks + baseDistributorListVo.getRegistNum())) { + openTickRemarks = openTickRemarks + baseDistributorListVo.getRegistNum() + "；"; + } + if (StringUtils.isNotBlank(baseDistributorListVo.getRegistDetailAddress())) { + openTickRemarks = openTickRemarks + baseDistributorListVo.getRegistDetailAddress() + "；"; + } + if (StringUtils.isNotBlank(baseDistributorListVo.getInvoPhone())) { + openTickRemarks = openTickRemarks + baseDistributorListVo.getInvoPhone() + "；"; + } + if (StringUtils.isNotBlank(baseDistributorListVo.getInvoBank())) { + openTickRemarks = openTickRemarks + baseDistributorListVo.getInvoBank() + "；"; + } + if (StringUtils.isNotBlank(baseDistributorListVo.getInvoBankNum())) { + openTickRemarks = openTickRemarks + baseDistributorListVo.getInvoBankNum() + "；"; + } + baseDistributorListVo.setOpenTickRemarks(openTickRemarks); + baseDistributorListVos.add(baseDistributorListVo); + } + CrmCustomerTempListQuery crmCustomerTempListQuery = new CrmCustomerTempListQuery(); + crmCustomerTempListQuery.setStaffSid(staffSid); + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(orgSid).getData(); + crmCustomerTempListQuery.setOrgPath(sysOrganizationVo.getOrgSidPath()); + crmCustomerTempListQuery.setCertificateTypeKey("01"); + List crmCustomerTempListVos = crmCustomerTempFeign.selectCustomerList(crmCustomerTempListQuery).getData(); + for (CrmCustomerTempListVo crmCustomerTempListVo : crmCustomerTempListVos) { + BaseDistributorListVo baseDistributorListVo = new BaseDistributorListVo(); + baseDistributorListVo.setName(crmCustomerTempListVo.getName()); + baseDistributorListVo.setSid(crmCustomerTempListVo.getSid()); + baseDistributorListVo.setOpenTickRemarks(crmCustomerTempListVo.getIdCard()); + baseDistributorListVo.setRegistNum(crmCustomerTempListVo.getIdCard()); + baseDistributorListVo.setInvoPhone(crmCustomerTempListVo.getMobile()); + baseDistributorListVo.setNameAndPhone(crmCustomerTempListVo.getName() + crmCustomerTempListVo.getMobile()); + baseDistributorListVos.add(baseDistributorListVo); + } + return rb.success().setData(baseDistributorListVos); + } + public ResultBean selectDisListBySid(String sid) { ResultBean rb = ResultBean.fireFail(); BaseDistributorListVo baseDistributorListVo = baseMapper.selectDisListBySid(sid); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingBillListVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingBillListVo.java index 519cd44727..1441114523 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingBillListVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingBillListVo.java @@ -1,6 +1,7 @@ package com.yxt.anrui.fin.api.fincompanyinvoicing; import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -21,4 +22,9 @@ public class FinCompanyInvoicingBillListVo implements Vo { private String invoBankNum;//开票银行账号 private String openTickRemarks; + + @ApiModelProperty("开票类型key") + private String openTickTypeKey; + @ApiModelProperty("开票类型value") + private String openTickTypeValue; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java index 1ba5b269c0..233d9f6f44 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java @@ -126,6 +126,11 @@ public interface FinCompanyInvoicingFeign { @ResponseBody List qySelByUseOrgSid(@RequestParam("orgSid") String orgSid); + @ApiOperation("企业开票信息管理根据分公司sid查询不带采购系统的开票信息") + @PostMapping("/qySelByUseOrgSidTwo") + @ResponseBody + List qySelByUseOrgSidTwo(@RequestParam("orgSid") String orgSid); + @ApiOperation("企业开票信息管理移动端根据分公司sid查询不带采购系统的开票信息") @PostMapping("/qyAppSelByUseOrgSid") @ResponseBody diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java index 68d941d33b..48e570b7db 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java @@ -120,6 +120,11 @@ public class FinCompanyInvoicingFeignFallback implements FinCompanyInvoicingFeig return null; } + @Override + public List qySelByUseOrgSidTwo(String orgSid) { + return null; + } + @Override public List qyAppSelByUseOrgSid(String useOrgSid, String search) { return null; diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.java index c1a3be6e3b..01f9ecb88f 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.java @@ -85,4 +85,5 @@ public interface FinBillApplicationMapper extends BaseMapper @Update("update fin_bill_application set nodeState = '终止' where sid = #{businessSid}") void updateZZ(String businessSid); + List getSelectBySid(String businessSid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml index 61eb9fdf2d..a839135356 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml @@ -128,4 +128,12 @@ ${ew.sqlSegment} + + \ No newline at end of file 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 f5496d77ef..8499340b91 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 @@ -3456,7 +3456,12 @@ public class FinBillApplicationService extends MybatisBaseService orgPathList = Arrays.asList(finBillApplication1.getOrgSidPath().split("/")); SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData(); String nextNodeUserSids_ = sysOrganization.getManagerSid(); - bv.setNextNodeUserSids(nextNodeUserSids_); + if(StringUtils.isBlank(nextNodeUserSids_)){//若主管人员为空，则默认为管理员 + bv.setNextNodeUserSids(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId()); + }else{ + bv.setNextNodeUserSids(nextNodeUserSids_); + } + } //======================================= if (r == 1) { @@ -3529,7 +3534,12 @@ public class FinBillApplicationService extends MybatisBaseService orgPathList = Arrays.asList(finBillApplication.getOrgSidPath().split("/")); SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData(); String nextNodeUserSids_ = sysOrganization.getManagerSid(); - bv.setNextNodeUserSids(nextNodeUserSids_); + if(StringUtils.isBlank(nextNodeUserSids_)){ + bv.setNextNodeUserSids(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId()); + }else{ + bv.setNextNodeUserSids(nextNodeUserSids_); + } + } //======================================= if (bv.getTaskId().equals(finBillApplication.getTaskId())) { @@ -3702,6 +3712,32 @@ public class FinBillApplicationService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + Future future1 = pool.submit(() -> { + List dtoList = new ArrayList<>(); + List vehicleList = baseMapper.getSelectBySid(bv.getBusinessSid()); +// List vehicleList = busSalesOrderVehicleService.selectListByOrderSid(bv.getBusinessSid()); + vehicleList.removeAll(Collections.singleton(null)); + if (!vehicleList.isEmpty()) { + vehicleList.stream().forEach(v -> { + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.LPSQTG.getTypeKey()); + baseVehicleStateDto.setBusSid(v); + dtoList.add(baseVehicleStateDto); + }); + ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } + //============================================================================ try { ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() .setNameFormat("demo-pool-%d").build(); 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 cfde0de6e4..e5ba5d67d9 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 @@ -1020,6 +1020,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedDtos = dto.getContractList(); + if(finSelectedReceivablesDetailedDtos.isEmpty()){ + return rb.setMsg("请添加认款信息"); + } //认款金额相加 BigDecimal subscriptionMoneyAll = finSelectedReceivablesDetailedDtos.stream().map(AppFinSelectedReceivablesDetailedDto::getConfirmMoney).reduce(BigDecimal.ZERO, BigDecimal::add); //判断收款金额与所选的总认款金额是否相等 diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml index 65935daa3c..795a35a950 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml @@ -65,13 +65,16 @@ address AS registDetailAddress, phone AS invoPhone, bankName AS invoBank, - bankAccount AS invoBankNum + bankAccount AS invoBankNum, + invoiceType AS openTickTypeValue, + invoiceTypeKey AS openTickTypeKey FROM fin_company_invoicing ${ew.sqlSegment} + AND (purchaseSystemSid IS NULL OR LENGTH(purchaseSystemSid) = 0) - AND (purchaseSystemSid IS NULL OR LENGTH(purchaseSystemSid) = 0) + diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java index 5ece116377..30ab998acb 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java @@ -151,6 +151,11 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign { return finCompanyInvoicingService.qySelByUseOrgSid(orgSid); } + @Override + public List qySelByUseOrgSidTwo(String orgSid) { + return finCompanyInvoicingService.qySelByUseOrgSidTwo(orgSid); + } + @Override public List qyAppSelByUseOrgSid(String useOrgSid, String search) { return finCompanyInvoicingService.qyAppSelByUseOrgSid(useOrgSid, search); 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 6f371f730f..6cff4366f6 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 @@ -454,6 +454,14 @@ public class FinCompanyInvoicingService extends MybatisBaseService qySelByUseOrgSidTwo(String orgSid) { + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("useOrgSid", orgSid); + qw.eq("isDelete", 0); + List finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw); + return finCompanyInvoicingBillListVos; + } + public List qySelByUseOrgSid2(String useOrgSid, String invoiceKey) { QueryWrapper qw = new QueryWrapper<>(); qw.eq("useOrgSid", useOrgSid);