diff --git a/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/service/impl/UserServiceImpl.java b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/service/impl/UserServiceImpl.java index b69d5b5..058797b 100644 --- a/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/service/impl/UserServiceImpl.java +++ b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/service/impl/UserServiceImpl.java @@ -81,9 +81,9 @@ public class UserServiceImpl implements UserService { String today = DateUtils.getToday(DateUtils.format1); record.setType(1); for(CwCheck cwCheck : list){ - Date begin = DateUtils.string2Date(today+cwCheck.getBegintime()+":00",DateUtils.format2); - Date end = DateUtils.string2Date(today+cwCheck.getEndtime()+":00",DateUtils.format2); - if(end.compareTo(record.getIntime()) > 1 && record.getIntime().compareTo(begin) > 1){ + Date begin = DateUtils.string2Date(today+ " "+ cwCheck.getBegintime()+":00",DateUtils.format2); + Date end = DateUtils.string2Date(today+ " "+ cwCheck.getEndtime()+":00",DateUtils.format2); + if(end.compareTo(record.getIntime()) == 1 && record.getIntime().compareTo(begin) == 1){ record.setType(cwCheck.getCheckname().equals("晨检")?1:2); } } -- libgit2 0.21.0