企业开票信息管理

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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">

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("该企业开票信息已存在");