Browse Source

Changes

master
主管理员 1 week ago
parent
commit
d865a9cede
1 changed files with 12 additions and 0 deletions
  1. +12
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinlog/controller/ClockinLogController.java

+ 12
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinlog/controller/ClockinLogController.java View File

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


Loading…
Cancel
Save