魏超 преди 5 години
родител
ревизия
57d82c42d7

+ 6
- 2
src/main/java/com/huiju/estateagents/entity/TaRaise.java Целия файл

3
 import com.baomidou.mybatisplus.annotation.IdType;
3
 import com.baomidou.mybatisplus.annotation.IdType;
4
 import com.baomidou.mybatisplus.annotation.TableField;
4
 import com.baomidou.mybatisplus.annotation.TableField;
5
 import com.baomidou.mybatisplus.annotation.TableId;
5
 import com.baomidou.mybatisplus.annotation.TableId;
6
+import com.fasterxml.jackson.annotation.JsonFormat;
6
 import lombok.Data;
7
 import lombok.Data;
7
 import lombok.EqualsAndHashCode;
8
 import lombok.EqualsAndHashCode;
8
 import lombok.experimental.Accessors;
9
 import lombok.experimental.Accessors;
10
+import org.springframework.format.annotation.DateTimeFormat;
9
 
11
 
10
 import java.io.Serializable;
12
 import java.io.Serializable;
11
 import java.time.LocalDateTime;
13
 import java.time.LocalDateTime;
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
      * 锁房方式 auto自动锁房,manual手动锁房
65
      * 锁房方式 auto自动锁房,manual手动锁房

+ 2
- 3
src/main/java/com/huiju/estateagents/service/impl/TaHousingResourcesServiceImpl.java Целия файл

6
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
6
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7
 import com.huiju.estateagents.base.ResponseBean;
7
 import com.huiju.estateagents.base.ResponseBean;
8
 import com.huiju.estateagents.common.CommConstant;
8
 import com.huiju.estateagents.common.CommConstant;
9
-import com.huiju.estateagents.common.DateUtils;
10
 import com.huiju.estateagents.common.StringUtils;
9
 import com.huiju.estateagents.common.StringUtils;
11
 import com.huiju.estateagents.entity.*;
10
 import com.huiju.estateagents.entity.*;
12
 import com.huiju.estateagents.mapper.*;
11
 import com.huiju.estateagents.mapper.*;
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
         LocalDateTime now = LocalDateTime.now();
318
         LocalDateTime now = LocalDateTime.now();
320
         if (now.isBefore(raiseStartTime) || now.isAfter(raiseEndTime)){
319
         if (now.isBefore(raiseStartTime) || now.isAfter(raiseEndTime)){
321
             return false;
320
             return false;