优化

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java

@@ -201,7 +201,7 @@ public interface BaseDistributorFeign {
 
     @ApiOperation("移动端查询经销商和客户信息")
     @GetMapping("/invoiceName")
-    ResultBean<List<AppDisAndCustm>> invoiceName(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath, @RequestParam(value = "search", required = false) String search);
+    ResultBean<List<AppDisAndCustm>> invoiceName(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath, @RequestParam(value = "search", required = false) String search,@RequestParam("invoiceKey") String invoiceKey);
 
     @ApiOperation("移动端查询经销商和客户信息")
     @GetMapping("/invoiceName2")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java

@@ -220,7 +220,7 @@ public class BaseDistributorFeignFallback implements BaseDistributorFeign {
     }
 
     @Override
-    public ResultBean<List<AppDisAndCustm>> invoiceName(String userSid, String orgPath, String search) {
+    public ResultBean<List<AppDisAndCustm>> invoiceName(String userSid, String orgPath, String search,String invoiceKey) {
         return null;
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java

@@ -354,8 +354,8 @@ public class BaseDistributorRest implements BaseDistributorFeign {
     }
 
     @Override
-    public ResultBean<List<AppDisAndCustm>> invoiceName(String userSid, String orgPath, String search) {
-        return baseDistributorService.invoiceName(userSid, orgPath, search);
+    public ResultBean<List<AppDisAndCustm>> invoiceName(String userSid, String orgPath, String search,String invoiceKey) {
+        return baseDistributorService.invoiceName(userSid, orgPath, search,invoiceKey);
     }
 
     @Override

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@@ -1320,14 +1320,23 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
         return rb.success().setData(baseDistributorListVo);
     }
 
-    public ResultBean<List<AppDisAndCustm>> invoiceName(String userSid, String orgPath, String search) {
+    public ResultBean<List<AppDisAndCustm>> invoiceName(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.qySelByUseOrgSid(useOrgSid);
+            if("01".equals(invoiceKey)){
+                finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qySelByUseOrgSidTwo(useOrgSid);
+            }else{
+                finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qySelByUseOrgSid3(useOrgSid,invoiceKey);
+            }
         } else {
-            finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qyAppSelByUseOrgSid(useOrgSid, search);
+            if("01".equals(invoiceKey)){
+                finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qyAppSelByUseOrgSidTwo(useOrgSid, search,"");
+            }else{
+                finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qyAppSelByUseOrgSidTwo(useOrgSid, search,invoiceKey);
+            }
+
         }
         List<AppDisAndCustm> appDisAndCustms = new ArrayList<>();
         for (FinCompanyInvoicingBillListVo finCompanyInvoicingBillListVo : finCompanyInvoicingBillListVos) {

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

@@ -131,11 +131,21 @@ public interface FinCompanyInvoicingFeign {
     @ResponseBody
     List<FinCompanyInvoicingBillListVo> qySelByUseOrgSidTwo(@RequestParam("orgSid") String orgSid);
 
+    @ApiOperation("企业开票信息管理根据分公司sid查询不带采购系统的开票信息")
+    @PostMapping("/qySelByUseOrgSid3")
+    @ResponseBody
+    List<FinCompanyInvoicingBillListVo> qySelByUseOrgSid3(@RequestParam("orgSid") String orgSid,@RequestParam("invoiceKey") String invoiceKey);
+
     @ApiOperation("企业开票信息管理移动端根据分公司sid查询不带采购系统的开票信息")
     @PostMapping("/qyAppSelByUseOrgSid")
     @ResponseBody
     List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSid(@RequestParam("useOrgSid") String useOrgSid, @RequestParam("search") String search);
 
+    @ApiOperation("企业开票信息管理移动端根据分公司sid查询不带采购系统的开票信息")
+    @PostMapping("/qyAppSelByUseOrgSidTwo")
+    @ResponseBody
+    List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSidTwo(@RequestParam("useOrgSid") String useOrgSid, @RequestParam("search") String search,@RequestParam(value = "invoiceKey",required = false)String invoiceKey);
+
     @ApiOperation("企业开票信息管理移动端维护初始化")
     @GetMapping("/qyAppFetchDetailsBySid/{sid}")
     @ResponseBody

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

@@ -125,11 +125,21 @@ public class FinCompanyInvoicingFeignFallback implements FinCompanyInvoicingFeig
         return null;
     }
 
+    @Override
+    public List<FinCompanyInvoicingBillListVo> qySelByUseOrgSid3(String orgSid, String invoiceKey) {
+        return null;
+    }
+
     @Override
     public List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSid(String useOrgSid, String search) {
         return null;
     }
 
+    @Override
+    public List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSidTwo(String useOrgSid, String search,String invoiceKey) {
+        return null;
+    }
+
     @Override
     public ResultBean<FinCompanyInvoicingDetailsVo> qyAppFetchDetailsBySid(String sid) {
         return null;

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

@@ -156,11 +156,21 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign {
         return finCompanyInvoicingService.qySelByUseOrgSidTwo(orgSid);
     }
 
+    @Override
+    public List<FinCompanyInvoicingBillListVo> qySelByUseOrgSid3(String orgSid, String invoiceKey) {
+        return finCompanyInvoicingService.qySelByUseOrgSid3(orgSid,invoiceKey);
+    }
+
     @Override
     public List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSid(String useOrgSid, String search) {
         return finCompanyInvoicingService.qyAppSelByUseOrgSid(useOrgSid, search);
     }
 
+    @Override
+    public List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSidTwo(String useOrgSid, String search,String invoiceKey) {
+        return finCompanyInvoicingService.qyAppSelByUseOrgSidTwo(useOrgSid,search,invoiceKey);
+    }
+
     @Override
     public ResultBean<FinCompanyInvoicingDetailsVo> qyAppFetchDetailsBySid(String sid) {
         return finCompanyInvoicingService.qyAppFetchDetailsBySid(sid);

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

@@ -536,4 +536,25 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         }
         return rb.success().setData(voList);
     }
+
+    public List<FinCompanyInvoicingBillListVo> qySelByUseOrgSid3(String orgSid, String invoiceKey) {
+        QueryWrapper qw = new QueryWrapper<>();
+        qw.eq("useOrgSid", orgSid);
+        qw.eq("isDelete", 0);
+        qw.eq("invoiceTypeKey",invoiceKey);
+        List<FinCompanyInvoicingBillListVo> finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw);
+        return finCompanyInvoicingBillListVos;
+    }
+
+    public List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSidTwo(String useOrgSid, String search, String invoiceKey) {
+        QueryWrapper qw = new QueryWrapper<>();
+        qw.eq("useOrgSid", useOrgSid);
+        qw.eq("isDelete", 0);
+        qw.like("name", search);
+        if(StringUtils.isNotBlank(invoiceKey)){
+            qw.eq("invoiceTypeKey",invoiceKey);
+        }
+        List<FinCompanyInvoicingBillListVo> finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw);
+        return finCompanyInvoicingBillListVos;
+    }
 }