魏超 5 years ago
parent
commit
57d82c42d7

+ 6
- 2
src/main/java/com/huiju/estateagents/entity/TaRaise.java View File

@@ -3,9 +3,11 @@ package com.huiju.estateagents.entity;
3 3
 import com.baomidou.mybatisplus.annotation.IdType;
4 4
 import com.baomidou.mybatisplus.annotation.TableField;
5 5
 import com.baomidou.mybatisplus.annotation.TableId;
6
+import com.fasterxml.jackson.annotation.JsonFormat;
6 7
 import lombok.Data;
7 8
 import lombok.EqualsAndHashCode;
8 9
 import lombok.experimental.Accessors;
10
+import org.springframework.format.annotation.DateTimeFormat;
9 11
 
10 12
 import java.io.Serializable;
11 13
 import java.time.LocalDateTime;
@@ -50,12 +52,14 @@ public class TaRaise implements Serializable {
50 52
     /**
51 53
      * 认筹开始时间
52 54
      */
53
-    private String raiseStartTime;
55
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
56
+    private LocalDateTime raiseStartTime;
54 57
 
55 58
     /**
56 59
      * 认筹结束时间
57 60
      */
58
-    private String raiseEndTime;
61
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
62
+    private LocalDateTime raiseEndTime;
59 63
 
60 64
     /**
61 65
      * 锁房方式 auto自动锁房,manual手动锁房

+ 2
- 3
src/main/java/com/huiju/estateagents/service/impl/TaHousingResourcesServiceImpl.java View File

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 6
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7 7
 import com.huiju.estateagents.base.ResponseBean;
8 8
 import com.huiju.estateagents.common.CommConstant;
9
-import com.huiju.estateagents.common.DateUtils;
10 9
 import com.huiju.estateagents.common.StringUtils;
11 10
 import com.huiju.estateagents.entity.*;
12 11
 import com.huiju.estateagents.mapper.*;
@@ -314,8 +313,8 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
314 313
         }
315 314
         //判断是否在时间之内
316 315
 
317
-        LocalDateTime raiseStartTime = DateUtils.dayToLocalDateime(taRaise.getRaiseStartTime());
318
-        LocalDateTime raiseEndTime = DateUtils.dayToLocalDateime(taRaise.getRaiseEndTime());
316
+        LocalDateTime raiseStartTime = taRaise.getRaiseStartTime();
317
+        LocalDateTime raiseEndTime = taRaise.getRaiseEndTime();
319 318
         LocalDateTime now = LocalDateTime.now();
320 319
         if (now.isBefore(raiseStartTime) || now.isAfter(raiseEndTime)){
321 320
             return false;