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