From 635f7401e3334b25918470987178c94f07ca5da8 Mon Sep 17 00:00:00 2001 From: 陈杰 <504987307@qq.com> Date: Thu, 16 Apr 2020 09:06:10 +0800 Subject: [PATCH] 晨午检 判断 --- cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/service/impl/UserServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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