diff --git a/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java b/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java index 7058aae..660d989 100644 --- a/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java +++ b/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java @@ -52,9 +52,8 @@ public class ReceiptHeaderController extends BaseController { private ReceiptDetailService receiptDetailService; @RequiresPermissions("receipt:receiptHeader:view") - @GetMapping("/{status}") - public String receiptHeader(@PathVariable("status") Integer status, ModelMap map) { - map.put("status", status); + @GetMapping() + public String receiptHeader() { return prefix + "/receiptHeader"; } @@ -82,10 +81,12 @@ public class ReceiptHeaderController extends BaseController { ReceiptHeader::getReceiptType, receiptHeader.getReceiptType()) .eq(StringUtils.isNotEmpty(receiptHeader.getCode()), ReceiptHeader::getCode, receiptHeader.getCode()) .eq(StringUtils.isNotEmpty(receiptHeader.getReferCode()), ReceiptHeader::getReferCode, receiptHeader.getReferCode()) - .ge(StringUtils.isNotNull(receiptHeader.getFirstStatus()), - ReceiptHeader::getFirstStatus, receiptHeader.getFirstStatus()) - .le(StringUtils.isNotNull(receiptHeader.getLastStatus()), + .le(StringUtils.isNotNull(receiptHeader.getFirstStatus()), + ReceiptHeader::getFirstStatus, receiptHeader.getFirstStatus()) + .between(StringUtils.isNull(receiptHeader.getFirstStatus()),ReceiptHeader::getFirstStatus,0,179) + .ge(StringUtils.isNotNull(receiptHeader.getLastStatus()), ReceiptHeader::getLastStatus, receiptHeader.getLastStatus()) + .between(StringUtils.isNull(receiptHeader.getLastStatus()),ReceiptHeader::getLastStatus,0,179) .orderByDesc(ReceiptHeader::getCreated); if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){