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

考勤明细应用数据问题修改

This commit is contained in:
fl 2025-01-06 18:53:54 +08:00
parent 1f42175b89
commit 9edf29cc29
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/AttTasks.java
View File

@ -139,7 +139,7 @@ public class AttTasks {
*/ */
private void pushAttData(String pushDate, int pushType) { private void pushAttData(String pushDate, int pushType) {
//获取黔送云的考勤数据 //获取黔送云的考勤数据
// getQsyAttendanceData(pushDate, pushType); getQsyAttendanceData(pushDate, pushType);
//获取考勤机中的考勤数据 //获取考勤机中的考勤数据
getMachineAttendanceData(pushDate, pushType); getMachineAttendanceData(pushDate, pushType);
// //查出每一个考勤组的应出勤天数以及考勤组的规则 // //查出每一个考勤组的应出勤天数以及考勤组的规则
@ -660,19 +660,19 @@ public class AttTasks {
// System.out.println("c.getAttCurrentTime() = "); // System.out.println("c.getAttCurrentTime() = ");
// } // }
// 处理逻辑 出入异常的逻辑 // 处理逻辑 出入异常的逻辑
try { // try {
Map<Boolean, List<AttSourceDataBean>> result = checkAdjacentAttType1WithGapAndCheckTypesBefore(v, attGroupBean.getEntryAbnormalMinute()); // Map<Boolean, List<AttSourceDataBean>> result = checkAdjacentAttType1WithGapAndCheckTypesBefore(v, attGroupBean.getEntryAbnormalMinute());
if (result.containsKey(true)) { // if (result.containsKey(true)) {
List<AttSourceDataBean> matchingItems = result.get(true); // List<AttSourceDataBean> matchingItems = result.get(true);
frontToWorkBean = matchingItems.get(0); // frontToWorkBean = matchingItems.get(0);
frontToWorkBean.setAbnormalAttTime(matchingItems.get(1).getAttCurrentTime()); // frontToWorkBean.setAbnormalAttTime(matchingItems.get(1).getAttCurrentTime());
frontToWorkBean.setAbnormalAttAddress(matchingItems.get(1).getAttAddress()); // frontToWorkBean.setAbnormalAttAddress(matchingItems.get(1).getAttAddress());
frontToWorkBean.setAttStatus(8); // frontToWorkBean.setAttStatus(8);
} // }
}catch(Exception e){ // }catch(Exception e){
e.printStackTrace(); // e.printStackTrace();
log.error("出入异常处理报错"); // log.error("出入异常处理报错");
} // }
//没有下班卡则添加第一次打卡数据 //没有下班卡则添加第一次打卡数据
newList.add(frontToWorkBean); newList.add(frontToWorkBean);
//获取工作异常 //获取工作异常

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

@ -337,7 +337,7 @@
</select> </select>
<select id="getLeaveData" resultType="com.bonus.system.att.entity.LeaveBean"> <select id="getLeaveData" resultType="com.bonus.system.att.entity.LeaveBean">
SELECT la.*, SELECT agpr.org_id,la.*,
sdd.dict_value AS attStatus sdd.dict_value AS attStatus
FROM leave_apply la FROM leave_apply la
LEFT JOIN sys_dict_data sdd ON sdd.dict_label = if(la.type is not null, la.type, la.leave_type) LEFT JOIN sys_dict_data sdd ON sdd.dict_label = if(la.type is not null, la.type, la.leave_type)