Commit ab109295 authored by 廖旭伟's avatar 廖旭伟

考勤汇总增加只汇总某个人的数据

parent f71898b3
...@@ -45,6 +45,9 @@ public class AttendSummaryService implements IApplicationStartedService { ...@@ -45,6 +45,9 @@ public class AttendSummaryService implements IApplicationStartedService {
List<String> dateList = getDatesBetween(query.getSummaryTimeStart(), query.getSummaryTimeEnd()); List<String> dateList = getDatesBetween(query.getSummaryTimeStart(), query.getSummaryTimeEnd());
for (String day : dateList) { for (String day : dateList) {
AttendanceSummaryQuery temp = new AttendanceSummaryQuery(day); AttendanceSummaryQuery temp = new AttendanceSummaryQuery(day);
if(query.getStaffId()!=null){
temp.setStaffId(query.getStaffId());
}
attendanceStatService.doAttendanceSummary(temp); attendanceStatService.doAttendanceSummary(temp);
} }
} else { } else {
......
...@@ -229,11 +229,17 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc ...@@ -229,11 +229,17 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
condition.put("year",y); condition.put("year",y);
condition.put("month",m); condition.put("month",m);
condition.put("day",d); condition.put("day",d);
if(query.getStaffId()!=null){
condition.put("staffId",query.getStaffId());
}
this.dao.delete(condition); this.dao.delete(condition);
AttendanceStaffStatEntity staffStatDelete = new AttendanceStaffStatEntity(); AttendanceStaffStatEntity staffStatDelete = new AttendanceStaffStatEntity();
staffStatDelete.setYear(y); staffStatDelete.setYear(y);
staffStatDelete.setMonth(m); staffStatDelete.setMonth(m);
staffStatDelete.setDay(d); staffStatDelete.setDay(d);
if(query.getStaffId()!=null){
staffStatDelete.setStaffId(query.getStaffId());
}
attendanceStaffStatService.remove(staffStatDelete,null); attendanceStaffStatService.remove(staffStatDelete,null);
//汇总当前日期假期余额 //汇总当前日期假期余额
List<VacationBalanceSummaryVo> vacationBalanceSummaryVoList = attendanceSummaryDao.getVacationBalanceSummary(query); List<VacationBalanceSummaryVo> vacationBalanceSummaryVoList = attendanceSummaryDao.getVacationBalanceSummary(query);
......
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
<if test="dayOfWeek != null and dayOfWeek == 6"> AND f.friday = 1</if> <if test="dayOfWeek != null and dayOfWeek == 6"> AND f.friday = 1</if>
<if test="dayOfWeek != null and dayOfWeek == 7"> AND f.saturday = 1</if> <if test="dayOfWeek != null and dayOfWeek == 7"> AND f.saturday = 1</if>
<if test="dayOfWeek != null and dayOfWeek == 1"> AND f.sunday = 1</if> <if test="dayOfWeek != null and dayOfWeek == 1"> AND f.sunday = 1</if>
<if test="staffId != null and staffId!=''"> AND s.id = #{staffId}</if>
</select> </select>
<!-- 汇总当前日期请假情况 --> <!-- 汇总当前日期请假情况 -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment