|
|
@ -4,6 +4,7 @@ import com.ai.ipu.data.JMap;
|
|
4
|
4
|
import com.ai.ipu.server.dao.interfaces.TrackAnalysisDao;
|
|
5
|
5
|
import com.ai.ipu.server.enums.UserEnums;
|
|
6
|
6
|
import com.ai.ipu.server.service.interfaces.TrackAnalysisService;
|
|
|
7
|
import com.ai.ipu.server.util.DateUtil;
|
|
7
|
8
|
import com.github.pagehelper.PageInfo;
|
|
8
|
9
|
import org.slf4j.Logger;
|
|
9
|
10
|
import org.slf4j.LoggerFactory;
|
|
|
@ -29,6 +30,9 @@ public class TrackAnalysisServiceImpl implements TrackAnalysisService {
|
|
29
|
30
|
List<Map<String, Object>> userList = UserEnums.getUserList();
|
|
30
|
31
|
PageInfo pageInfo = trackAnalysisDao.queryTrackAnalysisInfo(params, pageNum, pageSize);
|
|
31
|
32
|
List<Map<String,Object>> pageInfoList = pageInfo.getList();
|
|
|
33
|
|
|
|
34
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
35
|
|
|
32
|
36
|
for(Map<String,Object> areaInOutRecord:pageInfoList ){
|
|
33
|
37
|
for(Map<String,Object> userMap: userList){
|
|
34
|
38
|
long employeeId = (long)areaInOutRecord.get("EMPLOYEE_ID");
|
|
|
@ -43,8 +47,7 @@ public class TrackAnalysisServiceImpl implements TrackAnalysisService {
|
|
43
|
47
|
areaInOutRecord.put("stayTime",null);
|
|
44
|
48
|
}else{
|
|
45
|
49
|
Date out_date = (Date)areaInOutRecord.get("OUT_DATE");
|
|
46
|
|
// Date stayTime=out_date-in_date;
|
|
47
|
|
Date stayTime=null;
|
|
|
50
|
String stayTime = DateUtil.getDifferenceString(sdf.format(in_date), sdf.format(out_date));
|
|
48
|
51
|
areaInOutRecord.put("stayTime",stayTime);
|
|
49
|
52
|
}
|
|
50
|
53
|
}
|
