bonus
/
gz_att
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

考勤明细 

Signed-off-by: lSun <15893999301@qq.com>
This commit is contained in:
lSun 2024-12-20 19:14:26 +08:00
parent 9ed3545405
commit 4a88b43f4b
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bonus-modules/bonus-system/src/main/java/com/bonus/system/att/controller/AttendanceDetailsController.java
View File

@ -243,7 +243,7 @@ public class AttendanceDetailsController extends BaseController {
attendanceDetailsService.exportAttMonthReportData(response, o); attendanceDetailsService.exportAttMonthReportData(response, o);
} }
@RequiresPermissions("att:public:list") // @RequiresPermissions("att:public:list")
@GetMapping("/getOutCountList") @GetMapping("/getOutCountList")
@Log(title = "考勤报表->公用->外出次数查询", businessType = BusinessType.QUERY) @Log(title = "考勤报表->公用->外出次数查询", businessType = BusinessType.QUERY)
public TableDataInfo getOutCountList(AttDataDetailsBean bean) { public TableDataInfo getOutCountList(AttDataDetailsBean bean) {
@ -256,8 +256,8 @@ public class AttendanceDetailsController extends BaseController {
return getDataTableError(new ArrayList<>()); return getDataTableError(new ArrayList<>());
} }
@RequiresPermissions("att:public:list") // @RequiresPermissions("att:public:list")
@GetMapping("/getOutCountList") @GetMapping("/getAttCountList")
@Log(title = "考勤报表->考情明细->打卡次数记录", businessType = BusinessType.QUERY) @Log(title = "考勤报表->考情明细->打卡次数记录", businessType = BusinessType.QUERY)
public TableDataInfo getAttCountList(AttDataDetailsBean bean) { public TableDataInfo getAttCountList(AttDataDetailsBean bean) {
try{ try{

8
bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttDataDetailsBean.java
View File

@ -50,6 +50,14 @@ public class AttDataDetailsBean {
* 考勤日期 * 考勤日期
*/ */
private String attCurrentDay; private String attCurrentDay;
/**
* 打卡时间
*/
private String attCurrentTime;
/**
* 打卡地址
*/
private String attAddress;
/** /**
* 上班打卡时间原始 * 上班打卡时间原始

2
bonus-modules/bonus-system/src/main/resources/mapper/att/AttendanceDetailsMapper.xml
View File

@ -295,7 +295,7 @@
att_source_data att_source_data
<where> <where>
<if test="attCurrentDay != null and attCurrentDay != ''"> <if test="attCurrentDay != null and attCurrentDay != ''">
and awa.att_current_day = #{attCurrentDay} and att_current_day = #{attCurrentDay}
</if> </if>
<if test="userName != null and userName != ''"> <if test="userName != null and userName != ''">
and locate(#{userName},awa.user_name) and locate(#{userName},awa.user_name)