feats

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

@@ -68,6 +68,26 @@ public class TaInvoiceDetailController extends BaseController {
         return ResponseBean.success(result);
     }
 
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/invoice/{invoiceId}/detail",method= RequestMethod.GET)
+    @ApiOperation(value="报销列表", notes = "报销列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                @ApiParam("班级ID") @PathVariable(value ="invoiceId") String invoiceId,
+                                @ApiParam("单位名称") @PathVariable(value ="orgName", required = false) String orgName,
+                                @ApiParam("报销人名称") @PathVariable(value ="personName", required = false) String personName) throws Exception{
+
+        IPage<TaInvoiceDetail> pg = new Page<>(pageNum, pageSize);
+        IPage<TaInvoiceDetail> result = iTaInvoiceDetailService.getPageBy(pg, invoiceId, orgName, personName);
+        return ResponseBean.success(result);
+    }
+
     @RequestMapping(value="/admin/invoice/{invoiceId}/detail-tpl",method= RequestMethod.POST)
     @ApiOperation(value="一键生成", notes = "一键生成", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean taInvoiceDetailAdd(@ApiParam("班级ID") @PathVariable(value ="invoiceId") String invoiceId) throws Exception{

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

@@ -103,7 +103,7 @@ public class TaInvoiceFillController extends BaseController {
 
         String tplPath = "excel/invoice_tpl.xlsx";  // 相对 resource 目录位置
         InputStream inputStream = fileUtil.getResourceFile(tplPath);
-        String expFile = String.format("%s开票信息表.xlsx", invoiceFill.getName());
+        String expFile = StringUtils.urlEncode(String.format("%s开票信息表.xlsx", invoiceFill.getName()));
 
         response.setContentType("application/vnd.ms-excel");
         response.setCharacterEncoding("utf-8");
@@ -115,11 +115,12 @@ public class TaInvoiceFillController extends BaseController {
 //                .doFill(list);
 
         List<Object> mergeDataList = list.stream().map(x -> x.getPersonName()).collect(Collectors.toList());
-        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), TaInvoiceDetail.class).build();
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), TaInvoiceDetail.class).withTemplate(inputStream).build();
         WriteSheet writeSheet = EasyExcel.writerSheet().registerWriteHandler(new MergeRowStrategy(mergeDataList, 2, 0)).build();
         FillConfig fillConfig = FillConfig.builder().forceNewRow(true).build();
 
         excelWriter.fill(list, fillConfig, writeSheet);
+        excelWriter.finish();
     }
 
     /**

src/main/java/com/njyunzhi/invoice/mapper/TaInvoiceDetailMapper.java

@@ -38,4 +38,9 @@ public interface TaInvoiceDetailMapper extends BaseMapper<TaInvoiceDetail> {
                                          @Param("personName") String personName);
 
     TaInvoiceDetail getTplByPerson(@Param("invoiceId") String invoiceId, @Param("invoicePersonId") String invoicePersonId);
+
+    IPage<TaInvoiceDetail> getPageBy(IPage<TaInvoiceDetail> pg,
+                                     @Param("invoiceId") String invoiceId,
+                                     @Param("orgName") String orgName,
+                                     @Param("personName") String personName);
 }

src/main/java/com/njyunzhi/invoice/service/ITaInvoiceDetailService.java

@@ -35,4 +35,6 @@ public interface ITaInvoiceDetailService extends IService<TaInvoiceDetail> {
     boolean createOrUpdateItem(TaInvoiceItem taInvoiceItem) throws Exception;
 
     boolean deleteItem(String invoiceId, Integer itemId);
+
+    IPage<TaInvoiceDetail> getPageBy(IPage<TaInvoiceDetail> pg, String invoiceId, String orgName, String personName);
 }

src/main/java/com/njyunzhi/invoice/service/impl/TaInvoiceDetailServiceImpl.java

@@ -130,4 +130,9 @@ public class TaInvoiceDetailServiceImpl extends ServiceImpl<TaInvoiceDetailMappe
     public boolean deleteItem(String invoiceId, Integer itemId) {
         return taInvoiceItemMapper.deleteById(itemId) > 0;
     }
+
+    @Override
+    public IPage<TaInvoiceDetail> getPageBy(IPage<TaInvoiceDetail> pg, String invoiceId, String orgName, String personName) {
+        return baseMapper.getPageBy(pg, invoiceId, orgName, personName);
+    }
 }

src/main/resources/mapper/TaInvoiceDetailMapper.xml

@@ -77,7 +77,8 @@
           AND t.person_id = #{personId}
           AND t.`status` > -1
     </select>
-    <select id="getListByMainId" resultType="com.njyunzhi.invoice.entity.TaInvoiceDetail">
+
+    <sql id="getInvoiceDetail">
         SELECT
             t.`detail_id`,
             t.`invoice_id`,
@@ -103,9 +104,14 @@
             t.`create_date`
         FROM
             ta_invoice_detail t
-                INNER JOIN ta_invoice_item s ON t.invoice_id = s.invoice_id
+                INNER JOIN ta_invoice_item s ON t.invoice_id = s.invoice_id AND t.invoice_person_id = s.invoice_person_id
+    </sql>
+
+    <select id="getListByMainId" resultType="com.njyunzhi.invoice.entity.TaInvoiceDetail">
+        <include refid="getInvoiceDetail"></include>
         WHERE
-            t.invoice_id = #{invoiceId}
+            t.`status` &gt; -1
+            AND t.invoice_id = #{invoiceId}
         ORDER BY
             t.org_name ASC,
             t.person_name ASC,
@@ -182,4 +188,20 @@
             t.org_name ASC,
             t.`name` ASC
     </select>
+    <select id="getPageBy" resultType="com.njyunzhi.invoice.entity.TaInvoiceDetail">
+        <include refid="getInvoiceDetail"></include>
+        WHERE
+            t.`status` &gt; -1
+            AND t.invoice_id = #{invoiceId}
+        <if test="orgName != null and orgName != ''">
+            AND t.org_name LIKE CONCAT( '%', #{orgName}, '%' )
+        </if>
+        <if test="personName != null and personName != ''">
+            AND t.person_name LIKE CONCAT( '%', #{personName}, '%' )
+        </if>
+        ORDER BY
+            t.org_name ASC,
+            t.person_name ASC,
+            s.`name` ASC
+    </select>
 </mapper>