From 54c0d959fd8dde354f94f91a57116158e8b5a142 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Mon, 29 May 2023 11:10:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=BC=80=E7=A5=A8=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fincompanyinvoicing/FinCompanyInvoicing.java  |  2 ++
 .../FinCompanyInvoicingDetailsVo.java             |  2 ++
 .../FinCompanyInvoicingDto.java                   |  4 ++++
 .../FinCompanyInvoicingQuery.java                 | 10 +++++++---
 .../FinCompanyInvoicingVo.java                    |  2 ++
 .../FinCompanyInvoicingMapper.xml                 |  1 +
 .../FinCompanyInvoicingService.java               | 15 +++++++++------
 7 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicing.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicing.java
index 2854b7058f..ca0f957283 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicing.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicing.java
@@ -70,4 +70,6 @@ public class FinCompanyInvoicing extends BaseEntity {
     private String purchaseSystemSid; // 采购系统sid
     @ApiModelProperty("采购系统名称")
     private String purchaseSystemName; // 采购系统名称
+    @ApiModelProperty("组织全路径")
+    private String orgSidPath;
 }
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingDetailsVo.java
index 517e7d08e5..6cd680b7be 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingDetailsVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingDetailsVo.java
@@ -71,4 +71,6 @@ public class FinCompanyInvoicingDetailsVo implements Vo {
     private String purchaseSystemSid; // 采购系统sid
     @ApiModelProperty("采购系统名称")
     private String purchaseSystemName; // 采购系统名称
+    @ApiModelProperty("组织全路径")
+    private String orgSidPath;
 }
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingDto.java
index b358566af2..0d77778b17 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingDto.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingDto.java
@@ -71,4 +71,8 @@ public class FinCompanyInvoicingDto implements Dto {
     private String purchaseSystemSid; // 采购系统sid
     @ApiModelProperty("采购系统名称")
     private String purchaseSystemName; // 采购系统名称
+    @ApiModelProperty("组织全路径")
+    private String orgSidPath;
+    @ApiModelProperty("创建人sid")
+    private String createBySid;
 }
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingQuery.java
index c8ee240704..a0beb0a664 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingQuery.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingQuery.java
@@ -50,11 +50,11 @@ import lombok.Data;
 public class FinCompanyInvoicingQuery implements Query {
 
 	@ApiModelProperty("分公司sid")
-    private String useOrgSid; // 分公司sid
+    private String useOrgSid;
     @ApiModelProperty("组织全路径")
-    private String orgSidPath; // 组织全路径
+    private String orgSidPath;
     @ApiModelProperty("采购系统sid")
-    private String purchaseSystemSid; // 采购系统sid
+    private String purchaseSystemSid;
     @ApiModelProperty("菜单sid")
     private String menuSid;
     @ApiModelProperty("菜单url")
@@ -62,4 +62,8 @@ public class FinCompanyInvoicingQuery implements Query {
     @ApiModelProperty("用户sid")
     private String userSid;
 
+    @ApiModelProperty("名称")
+    private String name;
+    @ApiModelProperty("纳税人识别号")
+    private String taxpayerNo;
 }
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingVo.java
index 792ea446ba..ca126200db 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingVo.java
@@ -71,4 +71,6 @@ public class FinCompanyInvoicingVo implements Vo {
     private String purchaseSystemSid; // 采购系统sid
     @ApiModelProperty("采购系统名称")
     private String purchaseSystemName; // 采购系统名称
+    @ApiModelProperty("组织全路径")
+    private String orgSidPath;
 }
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 bcff028551..87a49a827c 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
@@ -8,6 +8,7 @@
         <where>
             ${ew.sqlSegment}
         </where>
+        AND (fci.purchaseSystemSid IS NULL OR LENGTH(fci.purchaseSystemSid) = 0)
     </select>
 
     <select id="selectListAllVo" resultType="com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingVo">
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 0de61b4d5c..f7ec0a77e5 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
@@ -199,7 +199,6 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
     public PagerVo<FinCompanyInvoicingVo> qyListPage(PagerQuery<FinCompanyInvoicingQuery> pq) {
         FinCompanyInvoicingQuery query = pq.getParams();
         QueryWrapper<FinCompanyInvoicing> qw = new QueryWrapper<>();
-        qw.isNull("fci.purchaseSystemSid");
         //层级筛选
         //=======================
         PrivilegeQuery privilegeQuery = new PrivilegeQuery();
@@ -240,11 +239,11 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
             return p;
         }
         //=======================
-        if (StringUtils.isNotBlank(query.getUseOrgSid())) {
-            qw.eq("fci.useOrgSid", query.getUseOrgSid());
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.like("fci.name", query.getName());
         }
-        if (StringUtils.isNotBlank(query.getPurchaseSystemSid())) {
-            qw.eq("fci.purchaseSystemSid", query.getPurchaseSystemSid());
+        if (StringUtils.isNotBlank(query.getTaxpayerNo())) {
+            qw.like("fci.taxpayerNo", query.getTaxpayerNo());
         }
         IPage<FinCompanyInvoicing> page = PagerUtil.queryToPage(pq);
         IPage<FinCompanyInvoicingVo> pagging = baseMapper.selectPageVo(page, qw);
@@ -258,14 +257,16 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         String useOrgSid = dto.getUseOrgSid();
         String name = dto.getName();
         String taxpayerNo = dto.getTaxpayerNo();
-        if (StringUtils.isNotBlank(dtoSid)) {//新增
+        if (StringUtils.isBlank(dtoSid)) {//新增
             QueryWrapper qw1 = new QueryWrapper<>();
             qw1.eq("useOrgSid", useOrgSid);
             qw1.eq("name", name);
+            qw1.isNull("purchaseSystemSid");
             FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo1 = baseMapper.selByUseOrgSidAndNameOrTaxNo(qw1);
             QueryWrapper qw2 = new QueryWrapper<>();
             qw2.eq("useOrgSid", useOrgSid);
             qw2.eq("taxpayerNo", taxpayerNo);
+            qw1.isNull("purchaseSystemSid");
             FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo2 = baseMapper.selByUseOrgSidAndNameOrTaxNo(qw2);
             if (finCompanyInvoicingDetailsVo1 != null || finCompanyInvoicingDetailsVo2 != null) {
                 return rb.setMsg("该企业开票信息已存在");
@@ -277,11 +278,13 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         qw1.eq("useOrgSid", useOrgSid);
         qw1.notIn("sid", dtoSid);
         qw1.eq("name", name);
+        qw1.isNull("purchaseSystemSid");
         FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo1 = baseMapper.selByUseOrgSidAndNameOrTaxNo(qw1);
         QueryWrapper qw2 = new QueryWrapper<>();
         qw2.eq("useOrgSid", useOrgSid);
         qw1.notIn("sid", dtoSid);
         qw2.eq("taxpayerNo", taxpayerNo);
+        qw1.isNull("purchaseSystemSid");
         FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo2 = baseMapper.selByUseOrgSidAndNameOrTaxNo(qw2);
         if (finCompanyInvoicingDetailsVo1 != null || finCompanyInvoicingDetailsVo2 != null) {
             return rb.setMsg("该企业开票信息已存在");