|
|
@@ -1,6 +1,7 @@
|
|
|
package com.xjrsoft.module.databoard.controller;
|
|
|
|
|
|
import cn.dev33.satoken.annotation.SaCheckPermission;
|
|
|
+import cn.dev33.satoken.stp.StpUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.github.yulichang.toolkit.MPJWrappers;
|
|
|
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
|
|
@@ -469,6 +470,9 @@ public class DataboardController {
|
|
|
@ApiOperation(value="个人考勤")
|
|
|
@SaCheckPermission("databoard:detail")
|
|
|
public RT<AttendanceStatisticsVo> attendanceStatistics(@Valid StatisticsDetailDto dto){
|
|
|
+ if(dto.getUserId() == null){
|
|
|
+ dto.setUserId(StpUtil.getLoginIdAsLong());
|
|
|
+ }
|
|
|
LocalDateTime startTime = null;
|
|
|
LocalDateTime endTime = null;
|
|
|
if(dto.getStartDate() != null){
|
|
|
@@ -532,7 +536,7 @@ public class DataboardController {
|
|
|
sql +=" AND t1.adjust_date between '" + startTime.format(formatter) + "' and '" + endTime.format(formatter) + "'";
|
|
|
}
|
|
|
if(dto.getUserId() != null){
|
|
|
- sql += " t1.and user_id = " + dto.getUserId();
|
|
|
+ sql += " and t1.user_id = " + dto.getUserId();
|
|
|
}
|
|
|
list = SqlRunnerAdapter.db().selectList(sql);
|
|
|
result.setExchangeCount(Integer.parseInt(list.get(0).get("a_count").toString()));
|