|
|
@ -1,6 +1,7 @@ |
|
|
package org.jeecg.modules.clockinlog.controller; |
|
|
package org.jeecg.modules.clockinlog.controller; |
|
|
|
|
|
|
|
|
import java.io.*; |
|
|
import java.io.*; |
|
|
|
|
|
import java.text.SimpleDateFormat; |
|
|
import java.time.DayOfWeek; |
|
|
import java.time.DayOfWeek; |
|
|
import java.time.LocalDateTime; |
|
|
import java.time.LocalDateTime; |
|
|
import java.time.YearMonth; |
|
|
import java.time.YearMonth; |
|
|
@ -362,6 +363,9 @@ public class ClockinLogController extends JeecgController<ClockinLog, IClockinLo |
|
|
String[] userIds = parameterMap.get("userId"); |
|
|
String[] userIds = parameterMap.get("userId"); |
|
|
String[] projectIds = parameterMap.get("projectId"); |
|
|
String[] projectIds = parameterMap.get("projectId"); |
|
|
|
|
|
|
|
|
|
|
|
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss"); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// QueryWrapper<ClockinLog> queryWrapper = QueryGenerator.initQueryWrapper(object, request.getParameterMap()); |
|
|
// QueryWrapper<ClockinLog> queryWrapper = QueryGenerator.initQueryWrapper(object, request.getParameterMap()); |
|
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); |
|
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); |
|
|
LambdaQueryChainWrapper<ClockinTeamLog> queryChainWrapper = clockinTeamLogService.lambdaQuery() |
|
|
LambdaQueryChainWrapper<ClockinTeamLog> queryChainWrapper = clockinTeamLogService.lambdaQuery() |
|
|
@ -526,6 +530,14 @@ public class ClockinLogController extends JeecgController<ClockinLog, IClockinLo |
|
|
|
|
|
|
|
|
if(StringUtils.isBlank(clockInLogResp.getTime())){ |
|
|
if(StringUtils.isBlank(clockInLogResp.getTime())){ |
|
|
clockInLogResp.setClockStartTime("--:--:--"); |
|
|
clockInLogResp.setClockStartTime("--:--:--"); |
|
|
|
|
|
}else { |
|
|
|
|
|
try { |
|
|
|
|
|
clockInLogResp.setClockStartTime(clockInLogResp.getTime().split(" ")[1]);//clockInLogResp.getTime() |
|
|
|
|
|
// clockInLogResp.setClockStartTime(formatter.parse(clockInLogResp.getTime()).toString());//clockInLogResp.getTime() |
|
|
|
|
|
}catch (Exception e){ |
|
|
|
|
|
clockInLogResp.setClockStartTime("--:--:--"); |
|
|
|
|
|
log.error(e.getMessage(), e); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
clockInTime = clockInTime+"\n"+clockInLogResp.getClockStartTime(); |
|
|
clockInTime = clockInTime+"\n"+clockInLogResp.getClockStartTime(); |
|
|
// strings.add(clockInLogResp.getClockStartTime()); |
|
|
// strings.add(clockInLogResp.getClockStartTime()); |
|
|
|