买家中心--发票管理--分页获取申请增加状态筛选

src/main/java/com/uas/platform/b2c/fa/settlement/controller/BillSubmitController.java

@@ -54,10 +54,10 @@ public class BillSubmitController {
      * @return
      */
     @RequestMapping(method = RequestMethod.GET)
-    public Page<BillSubmit> getBillSubmits(PageParams params, String keyword, String role) {
+    public Page<BillSubmit> getBillSubmits(PageParams params, String keyword, String invoicetype , String status, String role) {
         PageInfo pageInfo = new PageInfo(params);
         logger.log("发票申请", "查找包含关键字的发票申请信息");
-        return billSubmitService.getAll(pageInfo, keyword, role);
+        return billSubmitService.getAll(pageInfo, keyword, invoicetype, status, role);
     }
 
     /**

src/main/java/com/uas/platform/b2c/fa/settlement/service/BillSubmitService.java

@@ -24,10 +24,12 @@ public interface BillSubmitService {
     /**
      * @param pageInfo 分页参数
      * @param keyword 关键词
+     * @param status 开票状态
+     * @param invoicetype 发票类型
      * @param role 角色
      * @return
      */
-    Page<BillSubmit> getAll(PageInfo pageInfo, String keyword, String role);
+    Page<BillSubmit> getAll(PageInfo pageInfo, String keyword, String invoicetype , String status, String role);
 
     /**
      * 审核发票申请

src/main/java/com/uas/platform/b2c/fa/settlement/service/impl/BillSubmitServiceImpl.java

@@ -157,7 +157,7 @@ public class BillSubmitServiceImpl implements BillSubmitService {
     }
 
     @Override
-    public Page<BillSubmit> getAll(final PageInfo pageInfo, String keyword, String role) {
+    public Page<BillSubmit> getAll(final PageInfo pageInfo, String keyword, String invoicetype , String status, String role) {
         if (Type.BUYER.name().equals(role)) {
             pageInfo.expression(PredicateUtils.eq("submituu", SystemSession.getUser().getUserUU(), false));
             if (SystemSession.getUser().getEnterprise() != null)
@@ -172,6 +172,12 @@ public class BillSubmitServiceImpl implements BillSubmitService {
             }
         }
 
+        if (StringUtils.hasText(invoicetype))
+            pageInfo.expression(PredicateUtils.eq("invoicetype", Integer.parseInt(invoicetype), false));
+
+        if (StringUtils.hasText(status))
+            pageInfo.expression(PredicateUtils.eq("status", Integer.parseInt(status), false));
+
         if (StringUtils.hasText(keyword)) {
             SimpleExpression sellername = new SimpleExpression("sellername", keyword, CriterionExpression.Operator.LIKE);
             SimpleExpression orderids = new SimpleExpression("orderids", keyword, CriterionExpression.Operator.LIKE);