From 58df1145d8c00243d4b52c725eab6c52b8cec058 Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Wed, 8 May 2024 17:08:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=EF=BC=8C=E8=AF=B7=E5=81=87?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=8A=82=E7=82=B9action=E7=B1=BB=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=B8=AD=E6=9C=89=E5=85=B3=E6=A0=A1=E9=AA=8C=E5=81=87?=
 =?UTF-8?q?=E6=9C=9F=E9=A2=9D=E5=BA=A6=E7=9A=84=E5=81=87=E6=9C=9F=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E7=AD=9B=E9=80=89=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/common/util/CommonUtil.java | 57 +++++++++++++++++++++-
 1 file changed, 56 insertions(+), 1 deletion(-)

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<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;
+    }
 }