优化

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<List<AppDisAndCustm>> invoiceName(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath, @RequestParam(value = "search", required = false) String search);
 
+    @ApiOperation("移动端查询经销商和客户信息")
+    @GetMapping("/invoiceName2")
+    ResultBean<List<AppDisAndCustm>> 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<BaseDistributorListVo> selectDisListBySid(@PathVariable("sid") String sid);

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<List<AppDisAndCustm>> invoiceName2(String userSid, String orgPath, String search, String invoiceKey) {
+        return baseDistributorService.invoiceName2(userSid, orgPath, search,invoiceKey);
+    }
+
     @Override
     public ResultBean<BaseDistributorListVo> selectDisListBySid(String sid) {
         return baseDistributorService.selectDisListBySid(sid);

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<BaseDistributorMa
         return rb.success().setData(appDisAndCustms);
     }
 
+    public ResultBean<List<AppDisAndCustm>> invoiceName2(String userSid, String orgPath, String search, String invoiceKey) {
+        ResultBean rb = ResultBean.fireFail();
+        String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+        List<FinCompanyInvoicingBillListVo> finCompanyInvoicingBillListVos = new ArrayList<>();
+        if (StringUtils.isBlank(search)) {
+            finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qySelByUseOrgSid2(useOrgSid, invoiceKey);
+        } else {
+            finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qyAppSelByUseOrgSid2(useOrgSid, search, invoiceKey);
+        }
+        List<AppDisAndCustm> 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<CrmCustomerTempListVo> 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<BaseDistributorApplyDetailsVo> recordInfo(String sid) {
         ResultBean<BaseDistributorApplyDetailsVo> rb = ResultBean.fireFail();
         BaseDistributorDetailsVo baseDistributorDetailsVo = selBySid(sid);
@@ -1391,6 +1449,8 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
         }
         return rb.success();
     }
+
+
 ////-------------------------------------流程------------------------------------------------/
 //
 //    /**

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java

@@ -140,4 +140,14 @@ public interface FinCompanyInvoicingFeign {
     @PostMapping("/fetchDetailsVoBySid")
     @ResponseBody
     ResultBean<FinCompanyInvoicingDetailsVo> fetchDetailsVoBySid(@RequestParam("openTickSid") String openTickSid);
+
+    @ApiOperation("企业开票信息管理根据分公司sid查询不带采购系统的开票信息")
+    @PostMapping("/qySelByUseOrgSid2")
+    @ResponseBody
+    List<FinCompanyInvoicingBillListVo> qySelByUseOrgSid2(@RequestParam("useOrgSid") String useOrgSid,@RequestParam("invoiceKey") String invoiceKey);
+
+    @ApiOperation("企业开票信息管理移动端根据分公司sid查询不带采购系统的开票信息")
+    @PostMapping("/qyAppSelByUseOrgSid2")
+    @ResponseBody
+    List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSid2(@RequestParam("useOrgSid") String useOrgSid,@RequestParam("search") String search,@RequestParam("invoiceKey") String invoiceKey);
 }

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<FinCompanyInvoicingDetailsVo> fetchDetailsVoBySid(String openTickSid) {
         return null;
     }
+
+    @Override
+    public List<FinCompanyInvoicingBillListVo> qySelByUseOrgSid2(String useOrgSid, String invoiceKey) {
+        return null;
+    }
+
+    @Override
+    public List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSid2(String useOrgSid, String search, String invoiceKey) {
+        return null;
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java

@@ -62,7 +62,7 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign {
     @Override
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
-	public ResultBean<PagerVo<FinCompanyInvoicingVo>> listPage(@RequestBody PagerQuery<FinCompanyInvoicingQuery> pq){
+    public ResultBean<PagerVo<FinCompanyInvoicingVo>> listPage(@RequestBody PagerQuery<FinCompanyInvoicingQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         PagerVo<FinCompanyInvoicingVo> pv = finCompanyInvoicingService.listPageVo(pq);
         return rb.success().setData(pv);
@@ -71,7 +71,7 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign {
     @Override
     @ApiOperation("新增或修改")
     @PostMapping("/save")
-	public ResultBean save(@RequestBody FinCompanyInvoicingDto dto){
+    public ResultBean save(@RequestBody FinCompanyInvoicingDto dto) {
         return finCompanyInvoicingService.saveOrUpdateDto(dto);
     }
 
@@ -85,7 +85,7 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign {
     @Override
     @ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
+    public ResultBean delBySids(@RequestBody String[] sids) {
         ResultBean rb = ResultBean.fireFail();
         finCompanyInvoicingService.delBySids(sids);
         return rb.success();
@@ -94,7 +94,7 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign {
     @Override
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<FinCompanyInvoicingDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+    public ResultBean<FinCompanyInvoicingDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
         ResultBean rb = ResultBean.fireFail();
         FinCompanyInvoicingDetailsVo vo = finCompanyInvoicingService.fetchDetailsVoBySid(sid);
         return rb.success().setData(vo);
@@ -109,7 +109,7 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign {
 
     @Override
     public ResultBean<FinCompanyInvoicingDetailsVo> getDetailsByUseOrgAndSystem(String useOrgSid, String systemSid) {
-		return finCompanyInvoicingService.getDetailsByUseOrgAndSystem(useOrgSid,systemSid);
+        return finCompanyInvoicingService.getDetailsByUseOrgAndSystem(useOrgSid, systemSid);
     }
 
     @Override
@@ -135,9 +135,9 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign {
     }
 
     @Override
-	public ResultBean<List<FinCompanyInvoicingDetailsVo>> qyFetchListByName(String name,String useOrgSid) {
+    public ResultBean<List<FinCompanyInvoicingDetailsVo>> qyFetchListByName(String name, String useOrgSid) {
         ResultBean rb = ResultBean.fireFail();
-		List<FinCompanyInvoicingDetailsVo> finCompanyInvoicingDetailsVos = finCompanyInvoicingService.qyFetchListByName(name,useOrgSid);
+        List<FinCompanyInvoicingDetailsVo> finCompanyInvoicingDetailsVos = finCompanyInvoicingService.qyFetchListByName(name, useOrgSid);
         return rb.success().setData(finCompanyInvoicingDetailsVos);
     }
 
@@ -153,7 +153,7 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign {
 
     @Override
     public List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSid(String useOrgSid, String search) {
-		return finCompanyInvoicingService.qyAppSelByUseOrgSid(useOrgSid,search);
+        return finCompanyInvoicingService.qyAppSelByUseOrgSid(useOrgSid, search);
     }
 
     @Override
@@ -167,4 +167,14 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign {
         FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(openTickSid);
         return rb.success().setData(finCompanyInvoicingDetailsVo);
     }
+
+    @Override
+    public List<FinCompanyInvoicingBillListVo> qySelByUseOrgSid2(String useOrgSid, String invoiceKey) {
+        return finCompanyInvoicingService.qySelByUseOrgSid2(useOrgSid, invoiceKey);
+    }
+
+    @Override
+    public List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSid2(String useOrgSid, String search, String invoiceKey) {
+        return finCompanyInvoicingService.qyAppSelByUseOrgSid2(useOrgSid, search, invoiceKey);
+    }
 }

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<FinCompanyInv
         return finCompanyInvoicingBillListVos;
     }
 
+    public List<FinCompanyInvoicingBillListVo> qySelByUseOrgSid2(String useOrgSid, String invoiceKey) {
+        QueryWrapper qw = new QueryWrapper<>();
+        qw.eq("useOrgSid", useOrgSid);
+        qw.eq("isDelete", 0);
+        qw.eq("openTickTypeKey",invoiceKey);
+        List<FinCompanyInvoicingBillListVo> finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw);
+        return finCompanyInvoicingBillListVos;
+    }
+
+    public List<FinCompanyInvoicingBillListVo> 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<FinCompanyInvoicingBillListVo> finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw);
+        return finCompanyInvoicingBillListVos;
+    }
+
     public List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSid(String useOrgSid, String search) {
         QueryWrapper qw = new QueryWrapper<>();
         qw.eq("useOrgSid", useOrgSid);