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-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 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/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);