diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/controller/AttendanceDetailsController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/controller/AttendanceDetailsController.java index e8883b0..85f8ea4 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/controller/AttendanceDetailsController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/controller/AttendanceDetailsController.java @@ -243,7 +243,7 @@ public class AttendanceDetailsController extends BaseController { attendanceDetailsService.exportAttMonthReportData(response, o); } - @RequiresPermissions("att:public:list") +// @RequiresPermissions("att:public:list") @GetMapping("/getOutCountList") @Log(title = "考勤报表->公用->外出次数查询", businessType = BusinessType.QUERY) public TableDataInfo getOutCountList(AttDataDetailsBean bean) { @@ -256,8 +256,8 @@ public class AttendanceDetailsController extends BaseController { return getDataTableError(new ArrayList<>()); } - @RequiresPermissions("att:public:list") - @GetMapping("/getOutCountList") +// @RequiresPermissions("att:public:list") + @GetMapping("/getAttCountList") @Log(title = "考勤报表->考情明细->打卡次数记录", businessType = BusinessType.QUERY) public TableDataInfo getAttCountList(AttDataDetailsBean bean) { try{ diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttDataDetailsBean.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttDataDetailsBean.java index ba9d2b8..78d7fc9 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttDataDetailsBean.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttDataDetailsBean.java @@ -50,6 +50,14 @@ public class AttDataDetailsBean { * 考勤日期 */ private String attCurrentDay; + /** + * 打卡时间 + */ + private String attCurrentTime; + /** + * 打卡地址 + */ + private String attAddress; /** * 上班打卡时间原始 diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/att/AttendanceDetailsMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/att/AttendanceDetailsMapper.xml index fb12a32..413749d 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/att/AttendanceDetailsMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/att/AttendanceDetailsMapper.xml @@ -295,7 +295,7 @@ att_source_data - and awa.att_current_day = #{attCurrentDay} + and att_current_day = #{attCurrentDay} and locate(#{userName},awa.user_name)