diff --git a/src/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.java b/src/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.java index f209f93..a59f33f 100644 --- a/src/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.java +++ b/src/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.java @@ -209,9 +209,13 @@ public class AttendanceanalysisAction { String sql = "select id,userid,signdate,signtime from hrmschedulesign where isincom=1 and userid in ("+userIds+") and signdate >= ? and signdate <= ? order by signdate,signtime"; List> dataList = DbTools.getSqlToList(sql,DateUtil.beforeDay(startDate,1),DateUtil.AfterDay(endDate,1)); //补打卡记录 - sql = "select id,bdkry userid,dkrq signdate,dksj signtime from uf_jcl_kq_bdkjl where bdkry in ("+userIds+") and dkrq >= ? and dkrq <= ? order by dkrq,dksj"; + sql = "select id,bdkry userid,dkrq signdate,dksj signtime, lcid, bdklx from uf_jcl_kq_bdkjl where bdkry in ("+userIds+") and dkrq >= ? and dkrq <= ? order by dkrq,dksj"; List> makeUpList = DbTools.getSqlToList(sql,DateUtil.beforeDay(startDate,1),DateUtil.AfterDay(endDate,1)); + if (makeUpList.size() > 0){ + for (Map makeUpItem : makeUpList) { + makeUpItem.put("sjly", "2"); + } dataList.addAll(makeUpList); } Map>> collect = dataList.stream().collect(Collectors.groupingBy(e -> Util.null2String(e.get("userid"))));