Commit 9e817ea25289440e37d76aba5e1a11961131d23e
1 parent
36d994d2
update
Showing
2 changed files
with
9 additions
and
3 deletions
src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java
| ... | ... | @@ -284,10 +284,12 @@ public class ReceiptDetailController extends BaseController { |
| 284 | 284 | @RequiresPermissions("receipt:receiptDetail:export") |
| 285 | 285 | @PostMapping("/export") |
| 286 | 286 | @ResponseBody |
| 287 | - public AjaxResult export(ReceiptHeader receiptHeader) | |
| 287 | + public AjaxResult export(ReceiptHeader receiptHeader,@ApiParam(name = "createdBegin", value = "起止时间") String createdBegin, | |
| 288 | + @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd) | |
| 288 | 289 | { |
| 289 | 290 | LambdaQueryWrapper<ReceiptHeader> lambdaQueryWrapper = Wrappers.lambdaQuery(); |
| 290 | - lambdaQueryWrapper | |
| 291 | + lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), ReceiptHeader::getCreated, createdBegin) | |
| 292 | + .le(StringUtils.isNotEmpty(createdEnd), ReceiptHeader::getCreated, createdEnd) | |
| 291 | 293 | .in(StringUtils.isNotEmpty(receiptHeader.getCompanyCode()),ReceiptHeader::getCompanyCode, receiptHeader.getCompanyCode()) |
| 292 | 294 | .in(StringUtils.isEmpty(receiptHeader.getCompanyCode()), ReceiptHeader::getCompanyCode, ShiroUtils.getCompanyCodeList()) |
| 293 | 295 | .eq(ReceiptHeader::getWarehouseCode, ShiroUtils.getWarehouseCode()) |
| ... | ... |
src/main/java/com/huaheng/pc/shipment/shipmentDetail/controller/ShipmentDetailController.java
| ... | ... | @@ -29,6 +29,7 @@ import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetail; |
| 29 | 29 | import com.huaheng.pc.shipment.shipmentDetail.service.ShipmentDetailService; |
| 30 | 30 | import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader; |
| 31 | 31 | import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService; |
| 32 | +import io.swagger.annotations.ApiParam; | |
| 32 | 33 | import org.apache.shiro.authz.annotation.RequiresPermissions; |
| 33 | 34 | import org.springframework.beans.factory.annotation.Autowired; |
| 34 | 35 | import org.springframework.stereotype.Controller; |
| ... | ... | @@ -304,10 +305,13 @@ public class ShipmentDetailController extends BaseController |
| 304 | 305 | @RequiresPermissions("shipment:shipmentDetail:export") |
| 305 | 306 | @PostMapping("/export") |
| 306 | 307 | @ResponseBody |
| 307 | - public AjaxResult export(ShipmentHeader shipmentHeader) | |
| 308 | + public AjaxResult export(ShipmentHeader shipmentHeader,@ApiParam(name = "createdBegin", value = "起止时间") String createdBegin, | |
| 309 | + @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd) | |
| 308 | 310 | { |
| 309 | 311 | LambdaQueryWrapper<ShipmentHeader> lambdaQueryWrapper = Wrappers.lambdaQuery(); |
| 310 | 312 | lambdaQueryWrapper |
| 313 | + .ge(StringUtils.isNotEmpty(createdBegin), ShipmentHeader::getCreated, createdBegin) | |
| 314 | + .le(StringUtils.isNotEmpty(createdEnd), ShipmentHeader::getCreated, createdEnd) | |
| 311 | 315 | .eq(ShipmentHeader::getDeleted,false) |
| 312 | 316 | .in(StringUtils.isNotEmpty(shipmentHeader.getCompanyCode()),ShipmentHeader::getCompanyCode, shipmentHeader.getCompanyCode()) |
| 313 | 317 | .in(StringUtils.isEmpty(shipmentHeader.getCompanyCode()), ShipmentHeader::getCompanyCode, ShiroUtils.getCompanyCodeList()) |
| ... | ... |