魏超 5 gadus atpakaļ
vecāks
revīzija
a401f6b64e

+ 5
- 2
src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageController.java Parādīt failu

6
 import com.huiju.estateagents.base.BaseController;
6
 import com.huiju.estateagents.base.BaseController;
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;
9
 import com.huiju.estateagents.common.StringUtils;
10
 import com.huiju.estateagents.common.StringUtils;
10
 import com.huiju.estateagents.drainage.entity.TaDrainage;
11
 import com.huiju.estateagents.drainage.entity.TaDrainage;
11
 import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
12
 import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
32
 import org.springframework.web.bind.annotation.RestController;
33
 import org.springframework.web.bind.annotation.RestController;
33
 
34
 
34
 import javax.servlet.http.HttpServletRequest;
35
 import javax.servlet.http.HttpServletRequest;
36
+import java.text.DateFormat;
35
 import java.time.LocalDateTime;
37
 import java.time.LocalDateTime;
38
+import java.time.format.DateTimeFormatter;
36
 import java.util.List;
39
 import java.util.List;
37
 import java.util.UUID;
40
 import java.util.UUID;
38
 
41
 
135
             taDrainage.setOrgId(getOrgId(request));
138
             taDrainage.setOrgId(getOrgId(request));
136
             taDrainage.setCreateDate(LocalDateTime.now());
139
             taDrainage.setCreateDate(LocalDateTime.now());
137
             taDrainage.setStatus(CommConstant.STATUS_UNACCALIMED);
140
             taDrainage.setStatus(CommConstant.STATUS_UNACCALIMED);
138
-            if (taDrainage.getEndDate().isAfter(LocalDateTime.now())){
141
+            if (DateUtils.dayToLocalDateime(taDrainage.getEndDate()).isAfter(LocalDateTime.now())){
139
                 taDrainage.setStatus(CommConstant.STATUS_NORMAL);
142
                 taDrainage.setStatus(CommConstant.STATUS_NORMAL);
140
             }
143
             }
141
             if (iTaDrainageService.save(taDrainage)){
144
             if (iTaDrainageService.save(taDrainage)){
301
                     e.setStatus(CommConstant.STATUS_UNACCALIMED);
304
                     e.setStatus(CommConstant.STATUS_UNACCALIMED);
302
                 });
305
                 });
303
             }else{
306
             }else{
304
-                if (taDrainage.getEndDate().isBefore(LocalDateTime.now())){
307
+                if (DateUtils.dayToLocalDateime(taDrainage.getEndDate()).isBefore(LocalDateTime.now())){
305
                     responseBean.addError("已过下架时间,无法上架");
308
                     responseBean.addError("已过下架时间,无法上架");
306
                     return responseBean;
309
                     return responseBean;
307
                 }
310
                 }

+ 1
- 1
src/main/java/com/huiju/estateagents/drainage/entity/TaDrainage.java Parādīt failu

54
     /**
54
     /**
55
      * 截止时间
55
      * 截止时间
56
      */
56
      */
57
-    private LocalDateTime endDate;
57
+    private String endDate;
58
 
58
 
59
     /**
59
     /**
60
      * 参与数
60
      * 参与数