|
@@ -408,14 +408,17 @@ public class UserWithBeisenController {
|
|
|
|
|
|
|
|
|
@RequestMapping("/getAttendanceStatisticWithUser")
|
|
|
- public HttpRespMsg getAttendanceStatisticWithUser(String createDate){
|
|
|
+ public HttpRespMsg getAttendanceStatisticWithUser(String userId,String createDate){
|
|
|
HttpRespMsg msg=new HttpRespMsg();
|
|
|
DateTimeFormatter df=DateTimeFormatter.ofPattern("yyyy-MM-dd");
|
|
|
DateTimeFormatter df1=DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
|
DateTimeFormatter df2=DateTimeFormatter.ofPattern("HH:mm");
|
|
|
DateTimeFormatter df3=DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
|
|
|
DateTimeFormatter df4=DateTimeFormatter.ofPattern("HH:mm:ss");
|
|
|
- User user = userMapper.selectById(request.getHeader("token"));
|
|
|
+ if(StringUtils.isEmpty(userId)){
|
|
|
+ userId=request.getHeader("token");
|
|
|
+ }
|
|
|
+ User user = userMapper.selectById(userId);
|
|
|
Integer companyId = user.getCompanyId();
|
|
|
TimeType timeType = timeTypeMapper.selectById(companyId);
|
|
|
List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getCompanyId, companyId));
|