From 26db439bb050357e471505bd722f8d0d5d6790bb Mon Sep 17 00:00:00 2001 From: sy Date: Mon, 17 Jun 2024 09:51:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=EF=BC=8C=E5=87=BA=E5=8B=A4?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=98=8E=E7=BB=86=E9=A1=B5=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E6=89=93=E5=8D=A1=E6=95=B0=E6=8D=AE=E5=A2=9E=E5=8A=A0=E8=A1=A5?= =?UTF-8?q?=E6=89=93=E5=8D=A1=E7=B1=BB=E5=9E=8B=E5=90=8D=E7=A7=B0=E8=BF=94?= =?UTF-8?q?=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/AttendanceanalysisAction.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.java b/src/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.java index a59f33f..5688f46 100644 --- a/src/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.java +++ b/src/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.java @@ -212,20 +212,20 @@ public class AttendanceanalysisAction { 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)); + //考勤项目 + sql = "select id,mc from uf_jcl_kq_kqxm"; + List> items = DbTools.getSqlToList(sql); + Map itemMap = items.stream().collect(Collectors.toMap(e->Util.null2String(e.get("id")),e->Util.null2String(e.get("mc")))); + if (makeUpList.size() > 0){ for (Map makeUpItem : makeUpList) { makeUpItem.put("sjly", "2"); + makeUpItem.put("bdklxName", itemMap.get(Util.null2String(makeUpItem.get("bdklx")))); } dataList.addAll(makeUpList); } Map>> collect = dataList.stream().collect(Collectors.groupingBy(e -> Util.null2String(e.get("userid")))); - //考勤项目 - sql = "select id,mc from uf_jcl_kq_kqxm"; - List> items = DbTools.getSqlToList(sql); - Map itemMap = items.stream().collect(Collectors.toMap(e->Util.null2String(e.get("id")),e->Util.null2String(e.get("mc")))); - - //请假记录 sql = "select a.qjry,a.jqlx,a.cxjqj,b.ksrq,b.kssj,b.jsrq,b.jssj,b.qjsc,b.qtj,b.btj from uf_jcl_kq_qjjl a left join uf_jcl_kq_qjjl_dt1 b on a.id = b.mainid where a.qjry in ("+userIds+") and b.ksrq>=? and b.ksrq<=? and (b.cxqj=0 or b.cxqj is null) order by b.ksrq,b.kssj"; List> askforLeaveList = DbTools.getSqlToList(sql,startDate,endDate);