update

tongzhonghao
1 parent 36d994d2
Showing 2 changed files with 9 additions and 3 deletions
src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java
src/main/java/com/huaheng/pc/shipment/shipmentDetail/controller/ShipmentDetailController.java
@@ -284,10 +284,12 @@ public class ReceiptDetailController extends BaseController {
     @RequiresPermissions("receipt:receiptDetail:export")
     @PostMapping("/export")
     @ResponseBody
-    public AjaxResult export(ReceiptHeader receiptHeader)
+    public AjaxResult export(ReceiptHeader receiptHeader,@ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
+                             @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd)
     {
         LambdaQueryWrapper<ReceiptHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
-        lambdaQueryWrapper
+        lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), ReceiptHeader::getCreated, createdBegin)
+                .le(StringUtils.isNotEmpty(createdEnd), ReceiptHeader::getCreated, createdEnd)
                 .in(StringUtils.isNotEmpty(receiptHeader.getCompanyCode()),ReceiptHeader::getCompanyCode, receiptHeader.getCompanyCode())
                 .in(StringUtils.isEmpty(receiptHeader.getCompanyCode()), ReceiptHeader::getCompanyCode, ShiroUtils.getCompanyCodeList())
                 .eq(ReceiptHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
@@ -29,6 +29,7 @@ import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetail;
 import com.huaheng.pc.shipment.shipmentDetail.service.ShipmentDetailService;
 import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
 import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
+import io.swagger.annotations.ApiParam;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -304,10 +305,13 @@ public class ShipmentDetailController extends BaseController
 	@RequiresPermissions("shipment:shipmentDetail:export")
 	@PostMapping("/export")
 	@ResponseBody
-	public AjaxResult export(ShipmentHeader shipmentHeader)
+	public AjaxResult export(ShipmentHeader shipmentHeader,@ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
+							 @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd)
 	{
 		LambdaQueryWrapper<ShipmentHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
 		lambdaQueryWrapper
+				.ge(StringUtils.isNotEmpty(createdBegin), ShipmentHeader::getCreated, createdBegin)
+				.le(StringUtils.isNotEmpty(createdEnd), ShipmentHeader::getCreated, createdEnd)
 				.eq(ShipmentHeader::getDeleted,false)
 				.in(StringUtils.isNotEmpty(shipmentHeader.getCompanyCode()),ShipmentHeader::getCompanyCode, shipmentHeader.getCompanyCode())
 				.in(StringUtils.isEmpty(shipmentHeader.getCompanyCode()), ShipmentHeader::getCompanyCode, ShiroUtils.getCompanyCodeList())