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 f4159f0341..4de5caecab 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 @@ -199,6 +199,10 @@ public interface BaseDistributorFeign { @GetMapping("/invoiceName") ResultBean> invoiceName(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath, @RequestParam(value = "search", required = false) String search); + @ApiOperation("移动端查询经销商和客户信息") + @GetMapping("/invoiceName2") + ResultBean> invoiceName2(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath, @RequestParam(value = "search", required = false) String search,@RequestParam("invoiceKey") String invoiceKey); + @ApiOperation("根据sid查询所有经销商信息") @GetMapping("/selectDisListBySid/{sid}") ResultBean selectDisListBySid(@PathVariable("sid") String sid); diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractPageQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractPageQuery.java index eabdd8f0cd..74d4980258 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractPageQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractPageQuery.java @@ -17,6 +17,7 @@ public class ContractPageQuery implements Query { private int stateType; @ApiModelProperty("组织全路径") private String orgPath; + private String menuSid; @ApiModelProperty("pc客户名称") private String customerName; 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 6ac06114ed..490b0836f8 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 @@ -353,6 +353,11 @@ public class BaseDistributorRest implements BaseDistributorFeign { return baseDistributorService.invoiceName(userSid, orgPath, search); } + @Override + public ResultBean> invoiceName2(String userSid, String orgPath, String search, String invoiceKey) { + return baseDistributorService.invoiceName2(userSid, orgPath, search,invoiceKey); + } + @Override public ResultBean selectDisListBySid(String sid) { return baseDistributorService.selectDisListBySid(sid); 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 854ee25abd..e25a6991bb 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 @@ -1327,6 +1327,64 @@ public class BaseDistributorService extends MybatisBaseService> invoiceName2(String userSid, String orgPath, String search, String invoiceKey) { + ResultBean rb = ResultBean.fireFail(); + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + List finCompanyInvoicingBillListVos = new ArrayList<>(); + if (StringUtils.isBlank(search)) { + finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qySelByUseOrgSid2(useOrgSid, invoiceKey); + } else { + finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qyAppSelByUseOrgSid2(useOrgSid, search, invoiceKey); + } + List appDisAndCustms = new ArrayList<>(); + for (FinCompanyInvoicingBillListVo finCompanyInvoicingBillListVo : finCompanyInvoicingBillListVos) { + AppDisAndCustm appDisAndCustm = new AppDisAndCustm(); + Extra extra = new Extra(); + String openTickRemarks = ""; + if (StringUtils.isNotBlank(openTickRemarks + finCompanyInvoicingBillListVo.getRegistNum())) { + openTickRemarks = openTickRemarks + finCompanyInvoicingBillListVo.getRegistNum() + "；"; + } + if (StringUtils.isNotBlank(finCompanyInvoicingBillListVo.getRegistDetailAddress())) { + openTickRemarks = openTickRemarks + finCompanyInvoicingBillListVo.getRegistDetailAddress() + "；"; + } + if (StringUtils.isNotBlank(finCompanyInvoicingBillListVo.getInvoPhone())) { + openTickRemarks = openTickRemarks + finCompanyInvoicingBillListVo.getInvoPhone() + "；"; + } + if (StringUtils.isNotBlank(finCompanyInvoicingBillListVo.getInvoBank())) { + openTickRemarks = openTickRemarks + finCompanyInvoicingBillListVo.getInvoBank() + "；"; + } + if (StringUtils.isNotBlank(finCompanyInvoicingBillListVo.getInvoBankNum())) { + openTickRemarks = openTickRemarks + finCompanyInvoicingBillListVo.getInvoBankNum() + "；"; + } + appDisAndCustm.setId(finCompanyInvoicingBillListVo.getSid()); + appDisAndCustm.setDictValue(finCompanyInvoicingBillListVo.getName()); + extra.setSid(appDisAndCustm.getId()); + extra.setName(appDisAndCustm.getDictValue()); + extra.setInfo(openTickRemarks); + appDisAndCustm.setExtra(extra); + appDisAndCustms.add(appDisAndCustm); + } + CrmCustomerTempListQuery crmCustomerTempListQuery = new CrmCustomerTempListQuery(); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData(); + crmCustomerTempListQuery.setStaffSid(sysUserVo.getStaffSid()); + crmCustomerTempListQuery.setOrgPath(orgPath); + crmCustomerTempListQuery.setCertificateTypeKey("01"); + crmCustomerTempListQuery.setSearch(search); + List crmCustomerTempListVos = crmCustomerTempFeign.selectCustomerList(crmCustomerTempListQuery).getData(); + for (CrmCustomerTempListVo crmCustomerTempListVo : crmCustomerTempListVos) { + AppDisAndCustm appDisAndCustm = new AppDisAndCustm(); + Extra extra = new Extra(); + appDisAndCustm.setDictValue(crmCustomerTempListVo.getName()); + appDisAndCustm.setId(crmCustomerTempListVo.getSid()); + extra.setSid(appDisAndCustm.getId()); + extra.setName(appDisAndCustm.getDictValue()); + extra.setInfo(crmCustomerTempListVo.getIdCard()); + appDisAndCustm.setExtra(extra); + appDisAndCustms.add(appDisAndCustm); + } + return rb.success().setData(appDisAndCustms); + } + public ResultBean recordInfo(String sid) { ResultBean rb = ResultBean.fireFail(); BaseDistributorDetailsVo baseDistributorDetailsVo = selBySid(sid); @@ -1391,6 +1449,8 @@ public class BaseDistributorService extends MybatisBaseService SELECT - sid as contractSid, - contractNo as contractId, - customerSid, - partyA, - partyB as customerName, - DATE_FORMAT(createDate, '%Y-%m-%d') as createDate, - modelSid, - modelName + cc.sid AS contractSid, + cc.contractNo AS contractId, + cc.customerSid, + cc.partyA, + cc.partyB AS customerName, + DATE_FORMAT(cc.createDate, '%Y-%m-%d') AS createDate, + cc.modelSid, + cc.modelName FROM - common_contract + common_contract cc + JOIN anrui_buscenter.`bus_sales_order` bo + ON cc.`contractNo` = bo.`contractNo` ${ew.sqlSegment} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index cfc22652d7..8e3b93240a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -69,9 +69,11 @@ 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.sysstafforg.SysStaffOrgVo; +import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.config.DictCommonType; +import com.yxt.anrui.riskcenter.api.loancapitalcreditresult.LoanCapitalCreditResultVo; import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateFeign; import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateQuotationQuery; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign; @@ -2655,44 +2657,84 @@ public class CommonContractService extends MybatisBaseService qw = new QueryWrapper<>(); String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData(); if (params.getStateType() == 2) { - SysUserVo sysUserVo = sysUserFeign.fetchBySid(params.getUserSid()).getData(); - String staffSid = sysUserVo.getStaffSid(); - SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(params.getOrgPath()).getData(); - qw.eq("staffSid", staffSid); - qw.eq("orgSid", sysOrganizationVo.getSid()); + if (StringUtils.isNotBlank(params.getMenuSid())) { + //======================= + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(params.getOrgPath()); + privilegeQuery.setMenuSid(params.getMenuSid()); + privilegeQuery.setUserSid(params.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = params.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + SysUserVo sysUserVo = sysUserFeign.fetchBySid(params.getUserSid()).getData(); + String staffSid = sysUserVo.getStaffSid(); + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(params.getOrgPath()).getData(); + qw.eq("cc.staffSid", staffSid); + qw.eq("cc.orgSid", sysOrganizationVo.getSid()); + } else { + IPage page = PagerUtil.queryToPage(query); + page.setRecords(new ArrayList<>()); + return page; + } + } else { + IPage page = PagerUtil.queryToPage(query); + page.setRecords(new ArrayList<>()); + return page; + } + } ResultBean> busList = busSalesOrderFeign.selectBusinessSidByQKKP(params.getUserSid(), useOrgSid); if (!busList.getData().isEmpty()) { - qw.in("busSid", busList.getData()); + qw.in("cc.busSid", busList.getData()); } else { IPage page = PagerUtil.queryToPage(query); page.setRecords(new ArrayList<>()); return page; } if (StringUtils.isNotBlank(params.getName())) { - qw.and(wrapper -> wrapper.like("partyB", params.getName()).or().like("contractNo", params.getName())); + qw.and(wrapper -> wrapper.like("cc.partyB", params.getName()).or().like("cc.contractNo", params.getName())); } } else { //欠款提车只允许三方金融贷款业务欠款提车 //（含公司非担保贷款业务、二级自主贷款即外部金融，抵押放款的业务）,全款自用资金业务不允许，担保贷款业务不涉及 ResultBean> busList = busSalesOrderFeign.selectBusinessSid(params.getUserSid(), params.getOrgPath()); if (!busList.getData().isEmpty()) { - qw.in("busSid", busList.getData()); + qw.in("cc.busSid", busList.getData()); } else { IPage page = PagerUtil.queryToPage(query); page.setRecords(new ArrayList<>()); return page; } if (StringUtils.isNotBlank(params.getName())) { - qw.and(wrapper -> wrapper.like("partyB", params.getName()).or().like("contractNo", params.getName())); + qw.and(wrapper -> wrapper.like("cc.partyB", params.getName()).or().like("cc.contractNo", params.getName())); } if (StringUtils.isNotBlank(params.getContractNo())) { - qw.like("contractNo", params.getContractNo()); + qw.like("cc.contractNo", params.getContractNo()); } if (StringUtils.isNotBlank(params.getCustomerName())) { - qw.like("partyB", params.getCustomerName()); + qw.like("cc.partyB", params.getCustomerName()); } } - qw.orderByDesc("createDate"); + qw.orderByDesc("cc.createDate"); IPage page = PagerUtil.queryToPage(query); IPage iPage = baseMapper.getApprovalContractList(page, qw); return iPage; diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index 765808abee..d8599bebb1 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -3982,6 +3982,7 @@ public class BusDeliveredApplyService extends MybatisBaseService fetchDetailsVoBySid(@RequestParam("openTickSid") String openTickSid); + + @ApiOperation("企业开票信息管理根据分公司sid查询不带采购系统的开票信息") + @PostMapping("/qySelByUseOrgSid2") + @ResponseBody + List qySelByUseOrgSid2(@RequestParam("useOrgSid") String useOrgSid,@RequestParam("invoiceKey") String invoiceKey); + + @ApiOperation("企业开票信息管理移动端根据分公司sid查询不带采购系统的开票信息") + @PostMapping("/qyAppSelByUseOrgSid2") + @ResponseBody + List qyAppSelByUseOrgSid2(@RequestParam("useOrgSid") String useOrgSid,@RequestParam("search") String search,@RequestParam("invoiceKey") String invoiceKey); } \ No newline at end of file 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 a345a22422..68d941d33b 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 @@ -134,4 +134,14 @@ public class FinCompanyInvoicingFeignFallback implements FinCompanyInvoicingFeig public ResultBean fetchDetailsVoBySid(String openTickSid) { return null; } + + @Override + public List qySelByUseOrgSid2(String useOrgSid, String invoiceKey) { + return null; + } + + @Override + public List qyAppSelByUseOrgSid2(String useOrgSid, String search, String invoiceKey) { + return null; + } } \ 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 bc86fa5a5b..2a966d09f8 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 @@ -477,6 +477,7 @@ public class FinBillApplicationService extends MybatisBaseService finBillVehicles = dto.getFinBillVehicles(); for (FinBillVehicleDto finBillVehicle : finBillVehicles) { int i = finBillVehicleService.checkIsKp(contractNo, finBillVehicle.getVehSid()); - if (i > 0){ + if (i > 0) { return rb.setMsg(finBillVehicle.getVinNo() + "已发起过开票申请"); } } @@ -1916,6 +1917,9 @@ public class FinBillApplicationService extends MybatisBaseService cldjhtApplicationAppendxs = dto.getCldjhtApplicationAppendxs(); List zjApplicationAppendxs = dto.getZjApplicationAppendxs(); List arrearsCollectionAppendxs = dto.getArrearsCollectionAppendxs(); + List pcgsgdhdwdbjy = dto.getPcgsgdhdwdbjy(); + List pczrrdbcns = dto.getPczrrdbcns(); + List pczfxsjt = dto.getPczfxsjt(); if (StringUtils.isBlank(dtoSid)) {//新增 FinBillApplication finBillApplication = new FinBillApplication(); BeanUtil.copyProperties(dto, finBillApplication, "sid"); @@ -2040,6 +2044,42 @@ public class FinBillApplicationService extends MybatisBaseService 0) { + for (FinBillFileDto finBillFileDto : pcgsgdhdwdbjy) { + String filePath = finBillFileDto.getFileUrl(); + if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + finBillFileDto.setFileUrl(filePath); + finBillFileDto.setBillAppSid(finBillApplication.getSid()); + finBillFileDto.setAttachType(FinAttachTypeEnum.GSGDHDWDBJY.getAttachType()); + finBillFileService.saveOrUpdateDto(finBillFileDto); + } + } + if (pczrrdbcns.size() > 0) { + for (FinBillFileDto finBillFileDto : pczrrdbcns) { + String filePath = finBillFileDto.getFileUrl(); + if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + finBillFileDto.setFileUrl(filePath); + finBillFileDto.setBillAppSid(finBillApplication.getSid()); + finBillFileDto.setAttachType(FinAttachTypeEnum.ZRRDBCNS.getAttachType()); + finBillFileService.saveOrUpdateDto(finBillFileDto); + } + } + if (pczfxsjt.size() > 0) { + for (FinBillFileDto finBillFileDto : pczfxsjt) { + String filePath = finBillFileDto.getFileUrl(); + if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + finBillFileDto.setFileUrl(filePath); + finBillFileDto.setBillAppSid(finBillApplication.getSid()); + finBillFileDto.setAttachType(FinAttachTypeEnum.ZFXSJT.getAttachType()); + finBillFileService.saveOrUpdateDto(finBillFileDto); + } + } return rb.success().setMsg("保存成功").setData(finBillApplication.getSid()); } FinBillApplication finBillApplication = fetchBySid(dtoSid); @@ -2111,6 +2151,42 @@ public class FinBillApplicationService extends MybatisBaseService 0) { + for (FinBillFileDto finBillFileDto : pcgsgdhdwdbjy) { + String filePath = finBillFileDto.getFileUrl(); + if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + finBillFileDto.setFileUrl(filePath); + finBillFileDto.setBillAppSid(finBillApplication.getSid()); + finBillFileDto.setAttachType(FinAttachTypeEnum.GSGDHDWDBJY.getAttachType()); + finBillFileService.saveOrUpdateDto(finBillFileDto); + } + } + if (pczrrdbcns.size() > 0) { + for (FinBillFileDto finBillFileDto : pczrrdbcns) { + String filePath = finBillFileDto.getFileUrl(); + if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + finBillFileDto.setFileUrl(filePath); + finBillFileDto.setBillAppSid(finBillApplication.getSid()); + finBillFileDto.setAttachType(FinAttachTypeEnum.ZRRDBCNS.getAttachType()); + finBillFileService.saveOrUpdateDto(finBillFileDto); + } + } + if (pczfxsjt.size() > 0) { + for (FinBillFileDto finBillFileDto : pczfxsjt) { + String filePath = finBillFileDto.getFileUrl(); + if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + finBillFileDto.setFileUrl(filePath); + finBillFileDto.setBillAppSid(finBillApplication.getSid()); + finBillFileDto.setAttachType(FinAttachTypeEnum.ZFXSJT.getAttachType()); + finBillFileService.saveOrUpdateDto(finBillFileDto); + } + } finBillVehicleService.delByBillAppSid(dtoSid); for (FinBillVehicleDto finBillVehicleDto : finBillVehicles) { FinBillVehicle finBillVehicle = new FinBillVehicle(); @@ -2388,7 +2464,7 @@ 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(); @@ -2497,119 +2573,76 @@ public class FinBillApplicationService extends MybatisBaseService finBillVehicleVos = finBillVehicleService.fetchVehBySid(businessSid); - List finBillTrailerVos = finBillTrailerService.fetchByMainSid(businessSid); - if (!data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney())) {//是高低开 - BusValcustFilingDto busValcustFilingDto = new BusValcustFilingDto(); - busValcustFilingDto.setCreateBySid(finBillApplication.getCreateBySid()); - busValcustFilingDto.setCreateByName(finBillApplication.getCreateByName()); - busValcustFilingDto.setOrgSidPath(finBillApplication.getOrgSidPath()); - busValcustFilingDto.setUseOrgSid(finBillApplication.getUseOrgSid()); - SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(finBillApplication.getUseOrgSid()).getData(); - busValcustFilingDto.setUseOrgName(sysOrganizationVo.getName()); - busValcustFilingDto.setApplyDeptSid(finBillApplication.getDeptSid()); - busValcustFilingDto.setApplyDeptName(finBillApplication.getDeptName()); - busValcustFilingDto.setContractNo(finBillApplication.getContractNo()); - busValcustFilingDto.setModelSid(finBillApplication.getModelSid()); - busValcustFilingDto.setModelName(finBillApplication.getModelName()); - String vinSid = ""; - String vinNo = ""; - for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { - vinSid = vinSid + finBillVehicleVo.getVehSid() + ","; - vinNo = vinNo + finBillVehicleVo.getVinNo() + ","; - } - busValcustFilingDto.setVinSid(vinSid.substring(0, vinSid.lastIndexOf(","))); - busValcustFilingDto.setVinNo(vinNo.substring(0, vinNo.lastIndexOf(","))); - BigDecimal money = finBillApplication.getOneBillMoney().subtract(data.getSingleFinalPrice()); - int i = money.compareTo(BigDecimal.ZERO); - if (i == 1) { - busValcustFilingDto.setIsGdk("0"); - String parameterValue = sysParameterFeign.fetchByParNo("CW_JZPZSXFBL").getData(); - busValcustFilingDto.setYsMoney(money.multiply(new BigDecimal(parameterValue)).toString()); - } else { - busValcustFilingDto.setIsGdk("1"); - busValcustFilingDto.setYsMoney("0"); - } - busValcustFilingDto.setMoney(money.abs().toString()); - busValcustFilingDto.setSaleOrderSid(busSalesOrder.getSid()); - busValcustFilingDto.setBusSid(finBillApplication.getSid()); - busValcustFilingDto.setBusSource("0"); - busValcustFilingFeign.save(busValcustFilingDto); - } else {//不是高低开 - for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { - int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid()); - if (count == 0) { - FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto(); - finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName()); - finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo()); - finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName()); - finVehicleInvoiceDto.setVehicleSid(finBillVehicleVo.getVehSid()); - finVehicleInvoiceDto.setVIN(finBillVehicleVo.getVinNo()); - finVehicleInvoiceDto.setInvoiceTypeKey(finBillVehicleVo.getBillTypeKey()); - finVehicleInvoiceDto.setInvoiceType(finBillVehicleVo.getBillTypeValue()); - finVehicleInvoiceDto.setInvoiceAmount(finBillApplication.getOneBillMoney()); - finVehicleInvoiceDto.setBillingStateKey("001"); - finVehicleInvoiceDto.setBillingState("未开票"); - finVehicleInvoiceDto.setTransferStateKey("001"); - finVehicleInvoiceDto.setTransferState("未移交"); - finVehicleInvoiceDto.setVehicleType("主车"); - finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid()); - finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName()); - finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid()); - BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(finBillVehicleVo.getVehSid()).getData(); - if (busArrearsCarryVehicleApplyVo == null) { - finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey()); - finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue()); - } else { - finVehicleInvoiceDto.setBusinessStateKey("005"); - finVehicleInvoiceDto.setBusinessState("欠款提车"); - } - finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid()); - FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid()); - if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) { - finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress()); - finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone()); - finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName()); - finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount()); - finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo()); - } else { - CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillVehicleVo.getOpenTickSid()).getData(); - if (crmCustomerTempVo != null){ - finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile()); - finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); - } - } - finVehicleInvoiceDto.setIsTakeTicket(finBillApplication.getIsLQOrigInvoice()); - finVehicleInvoiceService.mySave(finVehicleInvoiceDto); + if ("01".equals(finBillApplication.getOpenTickTypeKey())) {//判断是否为机动车销售统一发票 + List finBillVehicleVos = finBillVehicleService.fetchVehBySid(businessSid); + List finBillTrailerVos = finBillTrailerService.fetchByMainSid(businessSid); + if (!data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney())) {//是高低开 + BusValcustFilingDto busValcustFilingDto = new BusValcustFilingDto(); + busValcustFilingDto.setCreateBySid(finBillApplication.getCreateBySid()); + busValcustFilingDto.setCreateByName(finBillApplication.getCreateByName()); + busValcustFilingDto.setOrgSidPath(finBillApplication.getOrgSidPath()); + busValcustFilingDto.setUseOrgSid(finBillApplication.getUseOrgSid()); + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(finBillApplication.getUseOrgSid()).getData(); + busValcustFilingDto.setUseOrgName(sysOrganizationVo.getName()); + busValcustFilingDto.setApplyDeptSid(finBillApplication.getDeptSid()); + busValcustFilingDto.setApplyDeptName(finBillApplication.getDeptName()); + busValcustFilingDto.setContractNo(finBillApplication.getContractNo()); + busValcustFilingDto.setModelSid(finBillApplication.getModelSid()); + busValcustFilingDto.setModelName(finBillApplication.getModelName()); + String vinSid = ""; + String vinNo = ""; + for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { + vinSid = vinSid + finBillVehicleVo.getVehSid() + ","; + vinNo = vinNo + finBillVehicleVo.getVinNo() + ","; } - } - if (finBillTrailerVos != null) { - for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) { - String gcVinNo = finBillTrailerVo.getGcVinNo(); - BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData(); - int count = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getVehSid()); + busValcustFilingDto.setVinSid(vinSid.substring(0, vinSid.lastIndexOf(","))); + busValcustFilingDto.setVinNo(vinNo.substring(0, vinNo.lastIndexOf(","))); + BigDecimal money = finBillApplication.getOneBillMoney().subtract(data.getSingleFinalPrice()); + int i = money.compareTo(BigDecimal.ZERO); + if (i == 1) { + busValcustFilingDto.setIsGdk("0"); + String parameterValue = sysParameterFeign.fetchByParNo("CW_JZPZSXFBL").getData(); + busValcustFilingDto.setYsMoney(money.multiply(new BigDecimal(parameterValue)).toString()); + } else { + busValcustFilingDto.setIsGdk("1"); + busValcustFilingDto.setYsMoney("0"); + } + busValcustFilingDto.setMoney(money.abs().toString()); + busValcustFilingDto.setSaleOrderSid(busSalesOrder.getSid()); + busValcustFilingDto.setBusSid(finBillApplication.getSid()); + busValcustFilingDto.setBusSource("0"); + busValcustFilingFeign.save(busValcustFilingDto); + } else {//不是高低开 + for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { + int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid()); if (count == 0) { FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto(); finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName()); finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo()); finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName()); - finVehicleInvoiceDto.setVehicleSid(baseTrailerDetailsVo.getSid()); - finVehicleInvoiceDto.setVIN(gcVinNo); - finVehicleInvoiceDto.setInvoiceTypeKey(finBillTrailerVo.getBillTypeKey()); - finVehicleInvoiceDto.setInvoiceType(finBillTrailerVo.getBillTypeValue()); - finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(finBillTrailerVo.getOneBillMoney())); + finVehicleInvoiceDto.setVehicleSid(finBillVehicleVo.getVehSid()); + finVehicleInvoiceDto.setVIN(finBillVehicleVo.getVinNo()); + finVehicleInvoiceDto.setInvoiceTypeKey(finBillVehicleVo.getBillTypeKey()); + finVehicleInvoiceDto.setInvoiceType(finBillVehicleVo.getBillTypeValue()); + finVehicleInvoiceDto.setInvoiceAmount(finBillApplication.getOneBillMoney()); finVehicleInvoiceDto.setBillingStateKey("001"); finVehicleInvoiceDto.setBillingState("未开票"); finVehicleInvoiceDto.setTransferStateKey("001"); finVehicleInvoiceDto.setTransferState("未移交"); - finVehicleInvoiceDto.setVehicleType("挂车"); + finVehicleInvoiceDto.setVehicleType("主车"); finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid()); - finVehicleInvoiceDto.setInvoicingName(finBillTrailerVo.getOpenTickName()); + finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName()); finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid()); - finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey()); - finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue()); + BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(finBillVehicleVo.getVehSid()).getData(); + if (busArrearsCarryVehicleApplyVo == null) { + finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey()); + finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue()); + } else { + finVehicleInvoiceDto.setBusinessStateKey("005"); + finVehicleInvoiceDto.setBusinessState("欠款提车"); + } finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid()); - FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillTrailerVo.getOpenTickSid()); + FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid()); if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) { finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress()); finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone()); @@ -2617,14 +2650,59 @@ 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(); 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 dc5179bad1..5ece116377 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 @@ -56,115 +56,125 @@ import java.util.List; @RequestMapping("v1/fincompanyinvoicing") public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign { - @Autowired - private FinCompanyInvoicingService finCompanyInvoicingService; - - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = finCompanyInvoicingService.listPageVo(pq); - return rb.success().setData(pv); - } - - @Override - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody FinCompanyInvoicingDto dto){ - return finCompanyInvoicingService.saveOrUpdateDto(dto); - } - - @Override - public ResultBean delBySidsPath(String sid) { - ResultBean rb = ResultBean.fireFail(); - finCompanyInvoicingService.delBySidsPath(sid); - return rb.success(); - } - - @Override - @ApiOperation("根据sid批量删除") + @Autowired + private FinCompanyInvoicingService finCompanyInvoicingService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = finCompanyInvoicingService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody FinCompanyInvoicingDto dto) { + return finCompanyInvoicingService.saveOrUpdateDto(dto); + } + + @Override + public ResultBean delBySidsPath(String sid) { + ResultBean rb = ResultBean.fireFail(); + finCompanyInvoicingService.delBySidsPath(sid); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") @DeleteMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - finCompanyInvoicingService.delBySids(sids); - return rb.success(); - } - - @Override - @ApiOperation("根据SID获取一条记录") + public ResultBean delBySids(@RequestBody String[] sids) { + ResultBean rb = ResultBean.fireFail(); + finCompanyInvoicingService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - FinCompanyInvoicingDetailsVo vo = finCompanyInvoicingService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } - - @Override - public ResultBean fetchDetailsByUseOrgSid(String useOrgSid) { - ResultBean rb = ResultBean.fireFail(); - FinCompanyInvoicingDetailsVo vo = finCompanyInvoicingService.fetchDetailsByUseOrgSid(useOrgSid); - return rb.success().setData(vo); - } - - @Override - public ResultBean getDetailsByUseOrgAndSystem(String useOrgSid, String systemSid) { - return finCompanyInvoicingService.getDetailsByUseOrgAndSystem(useOrgSid,systemSid); - } - - @Override - public ResultBean> selectInvoingList(String busSid) { - return finCompanyInvoicingService.selectInvoingList(busSid); - } - - @Override - public ResultBean selectInvoingByTaxpayerNo(String taxpayerNo) { - return finCompanyInvoicingService.selectInvoingByTaxpayerNo(taxpayerNo); - } - - @Override - public ResultBean> selectInvoingByOrgPath(String orgPath) { - return finCompanyInvoicingService.selectInvoingByOrgPath(orgPath); - } - - @Override - public ResultBean> qyListPage(PagerQuery pq) { - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = finCompanyInvoicingService.qyListPage(pq); - return rb.success().setData(pv); - } - - @Override - public ResultBean> qyFetchListByName(String name,String useOrgSid) { - ResultBean rb = ResultBean.fireFail(); - List finCompanyInvoicingDetailsVos = finCompanyInvoicingService.qyFetchListByName(name,useOrgSid); - return rb.success().setData(finCompanyInvoicingDetailsVos); - } - - @Override - public ResultBean qySaveOrUpdate(FinCompanyInvoicingDto dto) { - return finCompanyInvoicingService.qySaveOrUpdate(dto); - } - - @Override - public List qySelByUseOrgSid(String orgSid) { - return finCompanyInvoicingService.qySelByUseOrgSid(orgSid); - } - - @Override - public List qyAppSelByUseOrgSid(String useOrgSid, String search) { - return finCompanyInvoicingService.qyAppSelByUseOrgSid(useOrgSid,search); - } - - @Override - public ResultBean qyAppFetchDetailsBySid(String sid) { - return finCompanyInvoicingService.qyAppFetchDetailsBySid(sid); - } - - @Override - public ResultBean fetchDetailsVoBySid(String openTickSid) { - ResultBean rb = ResultBean.fireFail(); - FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(openTickSid); - return rb.success().setData(finCompanyInvoicingDetailsVo); - } + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + FinCompanyInvoicingDetailsVo vo = finCompanyInvoicingService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } + + @Override + public ResultBean fetchDetailsByUseOrgSid(String useOrgSid) { + ResultBean rb = ResultBean.fireFail(); + FinCompanyInvoicingDetailsVo vo = finCompanyInvoicingService.fetchDetailsByUseOrgSid(useOrgSid); + return rb.success().setData(vo); + } + + @Override + public ResultBean getDetailsByUseOrgAndSystem(String useOrgSid, String systemSid) { + return finCompanyInvoicingService.getDetailsByUseOrgAndSystem(useOrgSid, systemSid); + } + + @Override + public ResultBean> selectInvoingList(String busSid) { + return finCompanyInvoicingService.selectInvoingList(busSid); + } + + @Override + public ResultBean selectInvoingByTaxpayerNo(String taxpayerNo) { + return finCompanyInvoicingService.selectInvoingByTaxpayerNo(taxpayerNo); + } + + @Override + public ResultBean> selectInvoingByOrgPath(String orgPath) { + return finCompanyInvoicingService.selectInvoingByOrgPath(orgPath); + } + + @Override + public ResultBean> qyListPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = finCompanyInvoicingService.qyListPage(pq); + return rb.success().setData(pv); + } + + @Override + public ResultBean> qyFetchListByName(String name, String useOrgSid) { + ResultBean rb = ResultBean.fireFail(); + List finCompanyInvoicingDetailsVos = finCompanyInvoicingService.qyFetchListByName(name, useOrgSid); + return rb.success().setData(finCompanyInvoicingDetailsVos); + } + + @Override + public ResultBean qySaveOrUpdate(FinCompanyInvoicingDto dto) { + return finCompanyInvoicingService.qySaveOrUpdate(dto); + } + + @Override + public List qySelByUseOrgSid(String orgSid) { + return finCompanyInvoicingService.qySelByUseOrgSid(orgSid); + } + + @Override + public List qyAppSelByUseOrgSid(String useOrgSid, String search) { + return finCompanyInvoicingService.qyAppSelByUseOrgSid(useOrgSid, search); + } + + @Override + public ResultBean qyAppFetchDetailsBySid(String sid) { + return finCompanyInvoicingService.qyAppFetchDetailsBySid(sid); + } + + @Override + public ResultBean fetchDetailsVoBySid(String openTickSid) { + ResultBean rb = ResultBean.fireFail(); + FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(openTickSid); + return rb.success().setData(finCompanyInvoicingDetailsVo); + } + + @Override + public List qySelByUseOrgSid2(String useOrgSid, String invoiceKey) { + return finCompanyInvoicingService.qySelByUseOrgSid2(useOrgSid, invoiceKey); + } + + @Override + public List qyAppSelByUseOrgSid2(String useOrgSid, String search, String invoiceKey) { + return finCompanyInvoicingService.qyAppSelByUseOrgSid2(useOrgSid, search, invoiceKey); + } } 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 432812836a..d9167153dc 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 @@ -448,6 +448,25 @@ public class FinCompanyInvoicingService extends MybatisBaseService qySelByUseOrgSid2(String useOrgSid, String invoiceKey) { + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("useOrgSid", useOrgSid); + qw.eq("isDelete", 0); + qw.eq("openTickTypeKey",invoiceKey); + List finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw); + return finCompanyInvoicingBillListVos; + } + + public List qyAppSelByUseOrgSid2(String useOrgSid, String search, String invoiceKey) { + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("useOrgSid", useOrgSid); + qw.eq("isDelete", 0); + qw.eq("openTickTypeKey",invoiceKey); + qw.like("name", search); + List finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw); + return finCompanyInvoicingBillListVos; + } + public List qyAppSelByUseOrgSid(String useOrgSid, String search) { QueryWrapper qw = new QueryWrapper<>(); qw.eq("useOrgSid", useOrgSid); diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index 3e7a2d4fe2..f0dc31ee96 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -14,7 +14,7 @@ public enum ProcDefEnum { ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"), ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"), SALESPOLICY("销售政策审批流程", "process_biw9gfh7:3:917504"), - FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:5:5665004"), + FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:6:5777504"), QKFINBILLAPPLICATION("欠款开票申请流程", "process_q4evu61h:3:5682504"), QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:6:5682508"), ARREARSCARRYVEHICLE("欠款提车审批流程", "process_f2dkbvny:5:4975004"), diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java index 449f43aba9..51d8b92b3f 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java @@ -565,7 +565,8 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService qw = new QueryWrapper<>(); if (query != null) { //资方信用审核通过的 - qw.eq("la.zffkjgKey", "001"); +// qw.eq("la.zffkjgKey", "001"); + qw.and(wrapper -> wrapper.eq("la.zffkjgKey", "001").or().eq("la.zffkjgKey", "003")); //该销售专员下的客户 qw.eq("la.createBySid", query.getUserSid()); //姓名 diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java index dc6edf4010..6d16fb6f90 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java @@ -34,6 +34,10 @@ public class AdvanceInvoiceInfoVo implements Vo { private String invoicingUnit; @ApiModelProperty("是否领取原件") private String getOriginalValue; + @ApiModelProperty("默认开票类型key") + private String openTickTypeKey; + @ApiModelProperty("默认开票类型value") + private String openTickTypeValue; @ApiModelProperty("默认开票sid") private String openTickSid; @ApiModelProperty("默认开票名称") @@ -58,7 +62,7 @@ public class AdvanceInvoiceInfoVo implements Vo { private String reasonRemarks; @ApiModelProperty("欠款开票挂车信息") private List finBillTrailers; - @ApiModelProperty("欠款承诺书(欠款人、担保人同签)") + @ApiModelProperty("欠款承诺书(欠款人、担保人同签)(欠款领票上传)") private List fjApplicationAppendxs; @ApiModelProperty("公司股东会对外担保决议(公司担保)") private List gsgdhdwdbjy; @@ -76,7 +80,7 @@ public class AdvanceInvoiceInfoVo implements Vo { private List registerContractImages; @ApiModelProperty("确认书") private List invoiceApplyConfirmImages; - @ApiModelProperty("欠款领票附件") + @ApiModelProperty("《欠款承诺书》(欠款人、担保人同签)(欠款开票上传)") private List arrearsCollectionAppendxs; @ApiModelProperty("用户sid") private String userSid; 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 eddc6fa29e..a9a57117f4 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 @@ -16,4 +16,5 @@ public class RovalContractPageQuery implements Query { private int stateType; @ApiModelProperty("组织全路径") private String orgPath; + private String menuSid; } 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 9d4e239285..0a7110d68b 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 @@ -224,6 +224,8 @@ public class AppBusAdvanceGinvoiceapplyService { vo.setInvoicingUnit(finBillApplicationDetailsVo.getOpenTickUnitName()); vo.setName(finBillApplicationDetailsVo.getCustomerName()); vo.setInvoiceMoney(finBillApplicationDetailsVo.getOneBillMoney()); + vo.setOpenTickTypeKey(finBillApplicationDetailsVo.getOpenTickTypeKey()); + vo.setOpenTickTypeValue(finBillApplicationDetailsVo.getOpenTickTypeValue()); vo.setOpenTickSid(finBillApplicationDetailsVo.getOpenTickSid()); vo.setOpenTickName(finBillApplicationDetailsVo.getOpenTickName()); vo.setContractId(finBillApplicationDetailsVo.getContractNo()); @@ -280,11 +282,17 @@ public class AppBusAdvanceGinvoiceapplyService { List cldjhtApplicationAppendxs = finBillApplicationDetailsVo.getCldjhtApplicationAppendxs(); List zjApplicationAppendxs = finBillApplicationDetailsVo.getZjApplicationAppendxs(); List arrearsCollectionAppendxs = finBillApplicationDetailsVo.getArrearsCollectionAppendxs(); + List pcgsgdhdwdbjy = finBillApplicationDetailsVo.getPcgsgdhdwdbjy(); + List pczrrdbcns = finBillApplicationDetailsVo.getPczrrdbcns(); + List pczfxsjt = finBillApplicationDetailsVo.getPczfxsjt(); List customerInvoiceApplyImages = new ArrayList<>();//客户开票申请书 List invoiceApplyConfirmImages = new ArrayList<>();//开票信息确认书 List registerContractImages = new ArrayList<>();//车辆登记合同 List idCardImages = new ArrayList<>(); List qklpfjImages = new ArrayList<>(); + List gsgdhdwdbjy = new ArrayList<>(); + List zrrdbcns = new ArrayList<>(); + List zfxsjt = new ArrayList<>(); if (zjApplicationAppendxs != null) { for (FinBillFileVo zjApplicationAppendx : zjApplicationAppendxs) { idCardImages.add(zjApplicationAppendx.getFileUrl()); @@ -310,11 +318,29 @@ public class AppBusAdvanceGinvoiceapplyService { qklpfjImages.add(arrearsCollectionAppendx.getFileUrl()); } } + if (pcgsgdhdwdbjy != null) { + for (FinBillFileVo pcgsgdhdwdb : pcgsgdhdwdbjy) { + gsgdhdwdbjy.add(pcgsgdhdwdb.getFileUrl()); + } + } + if (pczrrdbcns != null) { + for (FinBillFileVo pczrrdbcn : pczrrdbcns) { + zrrdbcns.add(pczrrdbcn.getFileUrl()); + } + } + if (pczfxsjt != null) { + for (FinBillFileVo pczfxs : pczfxsjt) { + zfxsjt.add(pczfxs.getFileUrl()); + } + } vo.setCustomerInvoiceApplyImages(customerInvoiceApplyImages); vo.setInvoiceApplyConfirmImages(invoiceApplyConfirmImages); vo.setRegisterContractImages(registerContractImages); vo.setIdCardImages(idCardImages); vo.setArrearsCollectionAppendxs(qklpfjImages); + vo.setGsgdhdwdbjy(gsgdhdwdbjy); + vo.setZrrdbcns(zrrdbcns); + vo.setZfxsjt(zfxsjt); BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(finBillApplicationDetailsVo.getContractNo()).getData(); if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) { vo.setIsCanEdit(false); @@ -522,12 +548,18 @@ public class AppBusAdvanceGinvoiceapplyService { List invoiceApplyConfirmImages = dto.getInvoiceApplyConfirmImages();//开票信息确认书 List registerContractImages = dto.getRegisterContractImages();//车辆登记合同 List idCardImages = dto.getIdCardImages();//证件 - List arrearsCollectionAppendxs = dto.getArrearsCollectionAppendxs();//欠款领票附件 + List arrearsCollectionAppendxs = dto.getArrearsCollectionAppendxs(); + List gsgdhdwdbjy = dto.getGsgdhdwdbjy(); + List zrrdbcns = dto.getZrrdbcns(); + List zfxsjt = dto.getZfxsjt(); List khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息 List kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息 List cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息 List idCardImagesPC = new ArrayList<>();//证件 - List qklpfjImages = new ArrayList<>(); // 欠款领票附件 + List qklpfjImages = new ArrayList<>(); + List pcgsgdhdwdbjy = new ArrayList<>(); + List pczrrdbcns = new ArrayList<>(); + List pczfxsjt = new ArrayList<>(); if (customerInvoiceApplyImages != null) { for (String customerInvoiceApplyImage : customerInvoiceApplyImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); @@ -563,11 +595,35 @@ public class AppBusAdvanceGinvoiceapplyService { qklpfjImages.add(finBillFileDto); } } + if (gsgdhdwdbjy != null) { + for (String gsgdhdwdb : gsgdhdwdbjy) { + FinBillFileDto finBillFileDto = new FinBillFileDto(); + finBillFileDto.setFileUrl(gsgdhdwdb); + pcgsgdhdwdbjy.add(finBillFileDto); + } + } + if (zrrdbcns != null) { + for (String zrrdbcn : zrrdbcns) { + FinBillFileDto finBillFileDto = new FinBillFileDto(); + finBillFileDto.setFileUrl(zrrdbcn); + pczrrdbcns.add(finBillFileDto); + } + } + if (zfxsjt != null) { + for (String zfxs : zfxsjt) { + FinBillFileDto finBillFileDto = new FinBillFileDto(); + finBillFileDto.setFileUrl(zfxs); + pczfxsjt.add(finBillFileDto); + } + } finBillApplicationDto.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs); finBillApplicationDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs); finBillApplicationDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs); finBillApplicationDto.setZjApplicationAppendxs(idCardImagesPC); finBillApplicationDto.setArrearsCollectionAppendxs(qklpfjImages); + finBillApplicationDto.setPcgsgdhdwdbjy(pcgsgdhdwdbjy); + finBillApplicationDto.setPczrrdbcns(pczrrdbcns); + finBillApplicationDto.setPczfxsjt(pczfxsjt); ResultBean resultBean = finBillApplicationFeign.saveQK(finBillApplicationDto); return resultBean; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java index 75d879cb7f..c7965a4727 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java @@ -126,6 +126,7 @@ public class CommonService { Map map = new HashMap<>(); map.put("orderSid", orderSid); map.put("state", 1); + map.put("noCalc", true); appSubVersionVo.setJson(JSONObject.toJSONString(map)); BeanUtil.copyProperties(appSubVersionVo, carModelVo); carModelVo.setRequestCode("1003"); @@ -135,8 +136,10 @@ public class CommonService { List aRouterParamType = new ArrayList<>(); aRouterParamType.add("STRING"); aRouterParamType.add("INT"); + aRouterParamType.add("BOOLEAN"); List aRouterParamValue = new ArrayList<>(); aRouterParamValue.add(orderSid); + aRouterParamValue.add("true"); carModelVo.setARouterParamType(aRouterParamType); carModelVo.setARouterParamValue(aRouterParamValue); return rb.success().setData(carModelVo);