wms / wms_wuhangelinmei · Commits

Commit dc0d7d5e6b9448bf59c0d2d178bbbee1d1f89703

Authored by DESKTOP-AO0VKC8\mahua
2 parents ecc829a3 cbddb20a

Merge remote-tracking branch 'origin/develop' into develop

Inline Side-by-side
Showing 1 changed file with 7 additions and 6 deletions
src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
  View file @dc0d7d5
... ... @@ -52,9 +52,8 @@ public class ReceiptHeaderController extends BaseController {
52 52 private ReceiptDetailService receiptDetailService;
53 53  
54 54 @RequiresPermissions("receipt:receiptHeader:view")
55   - @GetMapping("/{status}")
56   - public String receiptHeader(@PathVariable("status") Integer status, ModelMap map) {
57   - map.put("status", status);
  55 + @GetMapping()
  56 + public String receiptHeader() {
58 57 return prefix + "/receiptHeader";
59 58 }
60 59  
... ... @@ -82,10 +81,12 @@ public class ReceiptHeaderController extends BaseController {
82 81 ReceiptHeader::getReceiptType, receiptHeader.getReceiptType())
83 82 .eq(StringUtils.isNotEmpty(receiptHeader.getCode()), ReceiptHeader::getCode, receiptHeader.getCode())
84 83 .eq(StringUtils.isNotEmpty(receiptHeader.getReferCode()), ReceiptHeader::getReferCode, receiptHeader.getReferCode())
85   - .ge(StringUtils.isNotNull(receiptHeader.getFirstStatus()),
86   - ReceiptHeader::getFirstStatus, receiptHeader.getFirstStatus())
87   - .le(StringUtils.isNotNull(receiptHeader.getLastStatus()),
  84 + .le(StringUtils.isNotNull(receiptHeader.getFirstStatus()),
  85 + ReceiptHeader::getFirstStatus, receiptHeader.getFirstStatus())
  86 + .between(StringUtils.isNull(receiptHeader.getFirstStatus()),ReceiptHeader::getFirstStatus,0,179)
  87 + .ge(StringUtils.isNotNull(receiptHeader.getLastStatus()),
88 88 ReceiptHeader::getLastStatus, receiptHeader.getLastStatus())
  89 + .between(StringUtils.isNull(receiptHeader.getLastStatus()),ReceiptHeader::getLastStatus,0,179)
89 90 .orderByDesc(ReceiptHeader::getCreated);
90 91  
91 92 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
... ...