diff --git a/src/com/engine/common/util/CommonUtil.java b/src/com/engine/common/util/CommonUtil.java index 8f80dd7..0f31845 100644 --- a/src/com/engine/common/util/CommonUtil.java +++ b/src/com/engine/common/util/CommonUtil.java @@ -437,7 +437,7 @@ public class CommonUtil { String sql1 = "select * from uf_jcl_kq_jqed"; List> data1 = DbTools.getSqlToList(sql1); for (Map map : data1) { - jqIdList.add(Util.null2String(map.get("id"))); + jqIdList.add(Util.null2String(map.get("jb"))); } //来自加班类型的考勤项目中关联的假期类型 String sql2 = "select * from uf_jcl_kq_kqxm where xmlx = 4 and jbzdzjqye = 1"; @@ -488,4 +488,59 @@ public class CommonUtil { } } + /** + * 获取人员id和姓名的映射 + * @return + */ + public static Map empIdToNameInfo() { + Map resultMap = new HashMap<>(); + String sql = "select id,lastname from hrmresource"; + List> list = DbTools.getSqlToList(sql); + for (Map map : list) { + resultMap.put(map.get("id").toString(), Util.null2String(map.get("lastname"))); + } + return resultMap; + } + + /** + * 获取分部id和名称的映射 + * @return + */ + public static Map subCompanyIdToNameInfo() { + Map resultMap = new HashMap<>(); + String sql = "select id,subcompanyname from hrmsubcompany"; + List> list = DbTools.getSqlToList(sql); + for (Map map : list) { + resultMap.put(map.get("id").toString(), Util.null2String(map.get("subcompanyname"))); + } + return resultMap; + } + + /** + * 获取部门id和名称的映射 + * @return + */ + public static Map depIdToNameInfo() { + Map resultMap = new HashMap<>(); + String sql = "select id,departmentname from hrmdepartment"; + List> list = DbTools.getSqlToList(sql); + for (Map map : list) { + resultMap.put(map.get("id").toString(), Util.null2String(map.get("departmentname"))); + } + return resultMap; + } + + /** + * 获取考勤项目id和名称的映射 + * @return + */ + public static Map kqxmIdToNameInfo() { + Map resultMap = new HashMap<>(); + String sql = "select id,mc from uf_jcl_kq_kqxm"; + List> list = DbTools.getSqlToList(sql); + for (Map map : list) { + resultMap.put(map.get("id").toString(), Util.null2String(map.get("mc"))); + } + return resultMap; + } }