考勤，请假流程节点action类逻辑中有关校验假期额度的假期类型筛选优化

src/com/engine/common/util/CommonUtil.java

@@ -437,7 +437,7 @@ public class CommonUtil {
         String sql1 = "select * from uf_jcl_kq_jqed";
         List<Map<String,Object>> data1 = DbTools.getSqlToList(sql1);
         for (Map<String, Object> 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<String, String> empIdToNameInfo() {
+        Map<String, String> resultMap = new HashMap<>();
+        String sql = "select id,lastname from hrmresource";
+        List<Map<String,Object>> list = DbTools.getSqlToList(sql);
+        for (Map<String, Object> map : list) {
+            resultMap.put(map.get("id").toString(), Util.null2String(map.get("lastname")));
+        }
+        return resultMap;
+    }
+
+    /**
+     * 获取分部id和名称的映射
+     * @return
+     */
+    public static Map<String, String> subCompanyIdToNameInfo() {
+        Map<String, String> resultMap = new HashMap<>();
+        String sql = "select id,subcompanyname from hrmsubcompany";
+        List<Map<String,Object>> list = DbTools.getSqlToList(sql);
+        for (Map<String, Object> map : list) {
+            resultMap.put(map.get("id").toString(), Util.null2String(map.get("subcompanyname")));
+        }
+        return resultMap;
+    }
+
+    /**
+     * 获取部门id和名称的映射
+     * @return
+     */
+    public static Map<String, String> depIdToNameInfo() {
+        Map<String, String> resultMap = new HashMap<>();
+        String sql = "select id,departmentname from hrmdepartment";
+        List<Map<String,Object>> list = DbTools.getSqlToList(sql);
+        for (Map<String, Object> map : list) {
+            resultMap.put(map.get("id").toString(), Util.null2String(map.get("departmentname")));
+        }
+        return resultMap;
+    }
+
+    /**
+     * 获取考勤项目id和名称的映射
+     * @return
+     */
+    public static Map<String, String> kqxmIdToNameInfo() {
+        Map<String, String> resultMap = new HashMap<>();
+        String sql = "select id,mc from uf_jcl_kq_kqxm";
+        List<Map<String,Object>> list = DbTools.getSqlToList(sql);
+        for (Map<String, Object> map : list) {
+            resultMap.put(map.get("id").toString(), Util.null2String(map.get("mc")));
+        }
+        return resultMap;
+    }
 }