销售订单、发货单、报价单时间条件查询

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/vo/OrderVO.java

@@ -22,6 +22,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 
+import java.util.List;
+
 /**
  * 销售或采购订单表视图实体类
  *
@@ -38,5 +40,37 @@ public class OrderVO extends Order {
 	 */
 	@ApiModelProperty(value = "列表客户中文名")
 	private String corpsName;
+	/**
+	 * 要求发货时间开始
+	 */
+	private String deliveryStartDate;
+	/**
+	 * 要求发货时间结束
+	 */
+	private String deliveryEndDate;
+	/**
+	 * 要求到货日期开始
+	 */
+	private String arrivalStartDate;
+	/**
+	 * 要求到货日期结束
+	 */
+	private String arrivalEndDate;
+	/**
+	 * 合同日期开始
+	 */
+	private String contractStartDate;
+	/**
+	 * 合同日期结束
+	 */
+	private String contractEndDate;
+	/**
+	 * 订单日期开始
+	 */
+	private String orderStartDate;
+	/**
+	 * 订单日期结束
+	 */
+	private String orderEndDate;
 
 }

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/DeliveryController.java

@@ -16,6 +16,8 @@
  */
 package org.springblade.deliver.goods.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.trade.purchase.order.enums.OrderTypeEnum;
 import io.swagger.annotations.Api;
@@ -25,6 +27,8 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import org.springblade.client.entity.CorpsDesc;
+import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.SecureUtil;
@@ -37,6 +41,9 @@ import org.springblade.deliver.goods.vo.DeliveryVO;
 import org.springblade.deliver.goods.service.IDeliveryService;
 import org.springblade.core.boot.ctrl.BladeController;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 国内发货通知单 控制器
  *
@@ -50,6 +57,7 @@ import org.springblade.core.boot.ctrl.BladeController;
 public class DeliveryController extends BladeController {
 
 	private final IDeliveryService deliveryService;
+	private ICorpsDescClient corpsDescClient;//获取客户信息
 
 	/**
 	 * 详情
@@ -69,11 +77,24 @@ public class DeliveryController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入delivery")
 	public R<IPage<Delivery>> list(Delivery delivery, Query query) {
-		delivery.setIsDeleted(0);
-		delivery.setTenantId(SecureUtil.getTenantId());
-		delivery.setBillType(OrderTypeEnum.SHIP.getType());
-		delivery.setTradeType(OrderTypeEnum.DOMESTIC.getType());
-		IPage<Delivery> pages = deliveryService.page(Condition.getPage(query), Condition.getQueryWrapper(delivery));
+		LambdaQueryWrapper<Delivery> lambdaQueryWrapper = new LambdaQueryWrapper();
+		lambdaQueryWrapper.eq(Delivery::getIsDeleted,0);
+		lambdaQueryWrapper.eq(Delivery::getTenantId,SecureUtil.getTenantId());
+		lambdaQueryWrapper.eq(Delivery::getBillType,OrderTypeEnum.SHIP.getType());
+		lambdaQueryWrapper.eq(Delivery::getTradeType,OrderTypeEnum.DOMESTIC.getType());
+		lambdaQueryWrapper.between(StringUtils.isNotBlank(delivery.getCreateStartTime())&&StringUtils.isNotBlank(delivery.getCreateEndTime()),Delivery::getCreateTime,delivery.getCreateStartTime(),delivery.getCreateEndTime());
+		lambdaQueryWrapper.between(StringUtils.isNotBlank(delivery.getBusinessStartDate())&&StringUtils.isNotBlank(delivery.getBusinessEndDate()),Delivery::getBusinessDate,delivery.getBusinessStartDate(),delivery.getBusinessEndDate());
+		IPage<Delivery> pages = deliveryService.page(Condition.getPage(query), lambdaQueryWrapper);
+		if (CollectionUtils.isNotEmpty(pages.getRecords())){
+			pages.getRecords().forEach(item ->{
+				if (item.getCorpId() != null){
+					R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getCorpId());
+					if (corpMessage.isSuccess() && corpMessage.getData() != null){
+						item.setCorpsName(corpMessage.getData().getCname());
+					}
+				}
+			});
+		}
 		return R.data(pages);
 	}
 	/**

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/ExportDeliveryController.java

@@ -16,13 +16,18 @@
  */
 package org.springblade.deliver.goods.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.trade.purchase.order.enums.OrderTypeEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
+import org.springblade.client.entity.CorpsDesc;
+import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -49,6 +54,7 @@ import javax.validation.Valid;
 public class ExportDeliveryController extends BladeController {
 
 	private final IDeliveryService deliveryService;
+	private ICorpsDescClient corpsDescClient;//获取客户信息
 
 	/**
 	 * 详情
@@ -68,11 +74,24 @@ public class ExportDeliveryController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入delivery")
 	public R<IPage<Delivery>> list(Delivery delivery, Query query) {
-		delivery.setIsDeleted(0);
-		delivery.setTenantId(SecureUtil.getTenantId());
-		delivery.setBillType(OrderTypeEnum.SHIP.getType());
-		delivery.setTradeType(OrderTypeEnum.EXPORT.getType());
-		IPage<Delivery> pages = deliveryService.page(Condition.getPage(query), Condition.getQueryWrapper(delivery));
+		LambdaQueryWrapper<Delivery> lambdaQueryWrapper = new LambdaQueryWrapper();
+		lambdaQueryWrapper.eq(Delivery::getIsDeleted,0);
+		lambdaQueryWrapper.eq(Delivery::getTenantId,SecureUtil.getTenantId());
+		lambdaQueryWrapper.eq(Delivery::getBillType,OrderTypeEnum.SHIP.getType());
+		lambdaQueryWrapper.eq(Delivery::getTradeType,OrderTypeEnum.DOMESTIC.getType());
+		lambdaQueryWrapper.between(StringUtils.isNotBlank(delivery.getCreateStartTime())&&StringUtils.isNotBlank(delivery.getCreateEndTime()),Delivery::getCreateTime,delivery.getCreateStartTime(),delivery.getCreateEndTime());
+		lambdaQueryWrapper.between(StringUtils.isNotBlank(delivery.getBusinessStartDate())&&StringUtils.isNotBlank(delivery.getBusinessEndDate()),Delivery::getBusinessDate,delivery.getBusinessStartDate(),delivery.getBusinessEndDate());
+		IPage<Delivery> pages = deliveryService.page(Condition.getPage(query), lambdaQueryWrapper);
+		if (CollectionUtils.isNotEmpty(pages.getRecords())){
+			pages.getRecords().forEach(item ->{
+				if (item.getCorpId() != null){
+					R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getCorpId());
+					if (corpMessage.isSuccess() && corpMessage.getData() != null){
+						item.setCorpsName(corpMessage.getData().getCname());
+					}
+				}
+			});
+		}
 		return R.data(pages);
 	}
 	/**

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/ImportDeliveryController.java

@@ -16,13 +16,18 @@
  */
 package org.springblade.deliver.goods.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.trade.purchase.order.enums.OrderTypeEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
+import org.springblade.client.entity.CorpsDesc;
+import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -49,6 +54,7 @@ import javax.validation.Valid;
 public class ImportDeliveryController extends BladeController {
 
 	private final IDeliveryService deliveryService;
+	private ICorpsDescClient corpsDescClient;//获取客户信息
 
 	/**
 	 * 详情
@@ -68,11 +74,24 @@ public class ImportDeliveryController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入delivery")
 	public R<IPage<Delivery>> list(Delivery delivery, Query query) {
-		delivery.setIsDeleted(0);
-		delivery.setTenantId(SecureUtil.getTenantId());
-		delivery.setBillType(OrderTypeEnum.SHIP.getType());
-		delivery.setTradeType(OrderTypeEnum.IMPORT.getType());
-		IPage<Delivery> pages = deliveryService.page(Condition.getPage(query), Condition.getQueryWrapper(delivery));
+		LambdaQueryWrapper<Delivery> lambdaQueryWrapper = new LambdaQueryWrapper();
+		lambdaQueryWrapper.eq(Delivery::getIsDeleted,0);
+		lambdaQueryWrapper.eq(Delivery::getTenantId,SecureUtil.getTenantId());
+		lambdaQueryWrapper.eq(Delivery::getBillType,OrderTypeEnum.SHIP.getType());
+		lambdaQueryWrapper.eq(Delivery::getTradeType,OrderTypeEnum.DOMESTIC.getType());
+		lambdaQueryWrapper.between(StringUtils.isNotBlank(delivery.getCreateStartTime())&&StringUtils.isNotBlank(delivery.getCreateEndTime()),Delivery::getCreateTime,delivery.getCreateStartTime(),delivery.getCreateEndTime());
+		lambdaQueryWrapper.between(StringUtils.isNotBlank(delivery.getBusinessStartDate())&&StringUtils.isNotBlank(delivery.getBusinessEndDate()),Delivery::getBusinessDate,delivery.getBusinessStartDate(),delivery.getBusinessEndDate());
+		IPage<Delivery> pages = deliveryService.page(Condition.getPage(query), lambdaQueryWrapper);
+		if (CollectionUtils.isNotEmpty(pages.getRecords())){
+			pages.getRecords().forEach(item ->{
+				if (item.getCorpId() != null){
+					R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getCorpId());
+					if (corpMessage.isSuccess() && corpMessage.getData() != null){
+						item.setCorpsName(corpMessage.getData().getCname());
+					}
+				}
+			});
+		}
 		return R.data(pages);
 	}
 	/**

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderMapper.xml

@@ -324,6 +324,30 @@
         <if test="Order.ifShipping!=null and Order.ifShipping != ''">
             and if_shipping = #{Order.ifShipping}
         </if>
+        <if test='Order.deliveryStartDate != null and Order.deliveryStartDate != ""'>
+            and required_delivery_date &gt;= #{Order.deliveryStartDate}
+        </if>
+        <if test='Order.deliveryEndDate != null and Order.deliveryEndDate != ""'>
+            and required_delivery_date &lt;= #{Order.deliveryEndDate}
+        </if>
+        <if test='Order.arrivalStartDate != null and Order.arrivalStartDate!= ""'>
+            and required_arrival_date &gt;= #{Order.arrivalStartDate}
+        </if>
+        <if test='Order.arrivalEndDate != null and Order.arrivalEndDate!= ""'>
+            and required_arrival_date &lt;= #{Order.arrivalEndDate}
+        </if>
+        <if test='Order.contractStartDate != null and Order.contractStartDate!= ""'>
+            and required_delivery_date &gt;= #{Order.contractStartDate}
+        </if>
+        <if test='Order.contractEndDate != null and Order.contractEndDate!= ""'>
+            and required_delivery_date &lt;= #{Order.contractEndDate}
+        </if>
+        <if test='Order.orderStartDate != null and Order.orderStartDate!= ""'>
+            and busines_date &gt;= #{Order.orderStartDate}
+        </if>
+        <if test='Order.orderEndDate != null and Order.orderEndDate!= ""'>
+            and busines_date &lt;= #{Order.orderEndDate}
+        </if>
         order by id
     </select>