|
|
@@ -93,14 +93,16 @@ public class RestrictProjectServiceImpl extends BaseMybatisDao<RestrictProjectMa
|
|
|
Pagination<RestrictProjectPageList> page =
|
|
|
(Pagination<RestrictProjectPageList>) findPage("RestrictProjectList", "RestrictProjectCount",
|
|
|
param, in.getPageNo(), in.getPageSize());
|
|
|
- pushPageList(page.getList());
|
|
|
+ pushPageList((List<RestrictProjectPageList>)page.getList());
|
|
|
return page;
|
|
|
}
|
|
|
|
|
|
private void pushPageList(List<RestrictProjectPageList> list) {
|
|
|
LocalDateTime now = LocalDateTime.now();
|
|
|
+ now=now.withHour(0).withMinute(0).withSecond(0).withNano(0);
|
|
|
for (RestrictProjectPageList e : list) {
|
|
|
LocalDateTime lockTime = e.getLockTime().toInstant().atZone(java.time.ZoneId.systemDefault()).toLocalDateTime();
|
|
|
+ lockTime=lockTime.withHour(0).withMinute(0).withSecond(0).withNano(0);
|
|
|
if (e.getType()==1){
|
|
|
LocalDateTime endTime = lockTime.plusDays(30);
|
|
|
long between = ChronoUnit.DAYS.between(now, endTime);
|