浏览代码

Merge remote-tracking branch 'origin/feature-201834-wangcz' into feature-201834-wangcz

hejq 7 年之前
父节点
当前提交
29d98ad444
共有 1 个文件被更改,包括 6 次插入0 次删除
  1. 6 0
      src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/GoodsServiceImpl.java

+ 6 - 0
src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/GoodsServiceImpl.java

@@ -3628,6 +3628,12 @@ public class GoodsServiceImpl implements GoodsService {
     }
     }
 
 
 	private void convertPageInfo(PageInfo info, GoodsFilter goodsFilter) {
 	private void convertPageInfo(PageInfo info, GoodsFilter goodsFilter) {
+        if (!StringUtils.isEmpty(goodsFilter.getStartTime())) {
+            info.expression(PredicateUtils.gte("createdDate", goodsFilter.getStartTime(), false));
+        }
+        if (!StringUtils.isEmpty(goodsFilter.getEndTime())) {
+            info.expression(PredicateUtils.lte("createdDate", goodsFilter.getEndTime(), false));
+        }
 		if (!StringUtils.isEmpty(goodsFilter.getCode())) {
 		if (!StringUtils.isEmpty(goodsFilter.getCode())) {
 			info.filter("code", goodsFilter.getCode());
 			info.filter("code", goodsFilter.getCode());
 		}
 		}