寄售订单添加时间查询条件

src/main/java/org/springblade/modules/finance/controller/OrderConsignController.java

@@ -16,6 +16,9 @@
  */
 package org.springblade.modules.finance.controller;
 
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -67,8 +70,17 @@ public class OrderConsignController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入orderConsign")
 	public R<IPage<OrderConsignVO>> list(OrderConsign orderConsign, Query query) {
-		IPage<OrderConsign> pages = orderConsignService.page(Condition.getPage(query),
-			Condition.getQueryWrapper(orderConsign).orderByDesc("create_time"));
+		QueryWrapper<OrderConsign> queryWrapper = Condition.getQueryWrapper(orderConsign).orderByDesc("create_time");
+		if (StrUtil.isNotBlank(orderConsign.getProductNo())) {
+			queryWrapper.eq("product_no", orderConsign.getProductNo());
+		}
+		if (ObjectUtil.isNotNull(orderConsign.getStartTime())) {
+			queryWrapper.ge("create_time", orderConsign.getStartTime());
+		}
+		if (ObjectUtil.isNotNull(orderConsign.getEndTime())) {
+			queryWrapper.le("create_time", orderConsign.getEndTime());
+		}
+		IPage<OrderConsign> pages = orderConsignService.page(Condition.getPage(query), queryWrapper);
 		return R.data(OrderConsignWrapper.build().pageVO(pages));
 	}
 

src/main/java/org/springblade/modules/finance/entity/OrderConsign.java

@@ -17,8 +17,10 @@
 package org.springblade.modules.finance.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
@@ -137,4 +139,17 @@ public class OrderConsign implements Serializable {
 	@ApiModelProperty(value = "信息说明体")
 	private String body;
 
+	@TableField(exist = false)
+	@ApiModelProperty(value = "商品编号")
+	private String productNo;
+
+	@TableField(exist = false)
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "开始时间")
+	private Date startTime;
+
+	@TableField(exist = false)
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "结束时间")
+	private Date endTime;
 }