Merge remote-tracking branch 'origin/dev_nft_411' into dev_nft_411

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinGoodsAnticipateValueParam.java

@@ -36,14 +36,14 @@ public class GoblinGoodsAnticipateValueParam{
     /**
      * 预约开始时间
      */
-    /*@ApiModelProperty(position = 18, required = false, value = "预约开始时间")
-    private String aboutStartDate;*/
+    @ApiModelProperty(position = 18, required = false, value = "预约开始时间")
+    private String aboutStartDate;
 
     /**
      * 预约结束时间
      */
-   /* @ApiModelProperty(position = 18, required = false, value = "预约结束时间")
-    private String aboutEndDate;*/
+    @ApiModelProperty(position = 18, required = false, value = "预约结束时间")
+    private String aboutEndDate;
 
     /**
      * 预约名称

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinMongoUtils.java

@@ -69,22 +69,22 @@ public class GoblinMongoUtils {
             LocalDateTime createdAtBegin = createDt.withHour(0).withMinute(0).withSecond(0).withNano(0);
             LocalDateTime createdAtEnd = createDt.withHour(23).withMinute(59).withSecond(59).withNano(999);
 
-            criteria.and("createdDate").gte(createdAtBegin).lte(createdAtEnd);
+            criteria =  criteria.and("createdDate").gte(createdAtBegin).lte(createdAtEnd);
         }
-        /*if (StringUtils.isNotBlank(goblinGoodsAnticipateValueParam.getAboutStartDate())){
+        if (StringUtils.isNotBlank(goblinGoodsAnticipateValueParam.getAboutStartDate())){
             LocalDateTime createDt = DateUtil.Formatter.yyyyMMddHHmmss.parse(goblinGoodsAnticipateValueParam.getAboutStartDate());
             LocalDateTime createdAtBegin = createDt.withHour(0).withMinute(0).withSecond(0).withNano(0);
             LocalDateTime createdAtEnd = createDt.withHour(23).withMinute(59).withSecond(59).withNano(999);
 
-            criteria.and("aboutStartDate").gte(createdAtBegin).lte(createdAtEnd);
+            criteria = criteria.and("aboutStartDate").gte(createdAtBegin).lte(createdAtEnd);
         }
         if (StringUtils.isNotBlank(goblinGoodsAnticipateValueParam.getAboutEndDate())){
             LocalDateTime createDt = DateUtil.Formatter.yyyyMMddHHmmss.parse(goblinGoodsAnticipateValueParam.getAboutEndDate());
             LocalDateTime createdAtBegin = createDt.withHour(0).withMinute(0).withSecond(0).withNano(0);
             LocalDateTime createdAtEnd = createDt.withHour(23).withMinute(59).withSecond(59).withNano(999);
 
-            criteria.and("aboutEndDate").gte(createdAtBegin).lte(createdAtEnd);
-        }*/
+            criteria = criteria.and("aboutEndDate").gte(createdAtBegin).lte(createdAtEnd);
+        }
         Query query = Query.query(criteria);
         //查询总数
         long count = mongoTemplate.count(query, GoblinGoodsAnticipateValueVo.class, GoblinGoodsAnticipateValueVo.class.getSimpleName());