考勤，出勤结果明细页面，打卡数据增加补打卡类型名称返回

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<Map<String,Object>> makeUpList = DbTools.getSqlToList(sql,DateUtil.beforeDay(startDate,1),DateUtil.AfterDay(endDate,1));
 
+            //考勤项目
+            sql = "select id,mc from uf_jcl_kq_kqxm";
+            List<Map<String,Object>> items = DbTools.getSqlToList(sql);
+            Map<String,String> itemMap = items.stream().collect(Collectors.toMap(e->Util.null2String(e.get("id")),e->Util.null2String(e.get("mc"))));
+
             if (makeUpList.size() > 0){
                 for (Map<String, Object> makeUpItem : makeUpList) {
                     makeUpItem.put("sjly", "2");
+                    makeUpItem.put("bdklxName", itemMap.get(Util.null2String(makeUpItem.get("bdklx"))));
                 }
                 dataList.addAll(makeUpList);
             }
             Map<String, List<Map<String,Object>>> collect = dataList.stream().collect(Collectors.groupingBy(e -> Util.null2String(e.get("userid"))));
 
-            //考勤项目
-            sql = "select id,mc from uf_jcl_kq_kqxm";
-            List<Map<String,Object>> items = DbTools.getSqlToList(sql);
-            Map<String,String> 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<Map<String,Object>> askforLeaveList = DbTools.getSqlToList(sql,startDate,endDate);