feats\

pom.xml

@@ -134,6 +134,7 @@
 						<directory>src/main/resources</directory>
 						<filtering>true</filtering>
 						<includes>
+							<include>**/*.xlsx</include>
 							<include>**/*.xml</include>
 							<include>**/*.p12</include>
 							<include>**/*.pem</include>
@@ -200,6 +201,7 @@
 						<directory>src/main/resources</directory>
 						<filtering>true</filtering>
 						<includes>
+							<include>**/*.xlsx</include>
 							<include>**/*.xml</include>
 							<include>**/*.p12</include>
 							<include>**/*.pem</include>

src/main/java/com/njyunzhi/invoice/config/MybatisPlusConfig.java

@@ -1,8 +1,17 @@
 package com.njyunzhi.invoice.config;
 
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
 public class MybatisPlusConfig {
-
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+        return interceptor;
+    }
 }

src/main/java/com/njyunzhi/invoice/controller/TaInvoicePersonController.java

@@ -61,7 +61,7 @@ public class TaInvoicePersonController extends BaseController {
     public ResponseBean taInvoicePersonList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                             @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                             @ApiParam("班级ID") @PathVariable(value ="invoiceId") String invoiceId,
-                                            @ApiParam("所属单位") @RequestParam(value ="invoiceOrgId") String invoiceOrgId) throws Exception {
+                                            @ApiParam("所属单位") @RequestParam(value ="invoiceOrgId", required = false) String invoiceOrgId) throws Exception {
         IPage<TaInvoicePerson> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaInvoicePerson> queryWrapper = new QueryWrapper<>();
         queryWrapper.gt("status", Constants.STATUS_DELETE);

src/main/java/com/njyunzhi/invoice/vo/excel/InvoiceHead.java

@@ -0,0 +1,11 @@
+package com.njyunzhi.invoice.vo.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+@Data
+public class InvoiceHead {
+
+    @ExcelProperty({"开票信息表", ""})
+    Integer serialNo;
+}

src/main/resources/mapper/TaInvoiceDetailMapper.xml

@@ -11,6 +11,7 @@
             `person_id`,
             `person_name`,
             `invoice_org_id`,
+            `invoice_org_name`,
             `org_id`,
             `org_name`,
             `tax_no`,
@@ -33,7 +34,6 @@
               NULL,
               t.`name`,
               t.invoice_org_id,
-              NULL,
               t.org_name,
               NULL,
               NULL,
@@ -41,6 +41,8 @@
               NULL,
               NULL,
               NULL,
+              NULL,
+              NULL,
               s.invoice_item_tpl_id,
               s.`name`,
               s.charge,