Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance

src/com/engine/attendance/workflow/service/impl/AttendanceSummaryServiceImpl.java

@@ -70,13 +70,13 @@ public class AttendanceSummaryServiceImpl extends Service implements AttendanceS
                         addList.addAll(cqAddList);
                     }
                     //补打卡表
-                    List<Map<String, String>> bdkAddList = getBdkAddList(mainId, startDate, endDate);
+                    List<Map<String, String>> bdkAddList = getBdkAddList(mainId, subCompanyListStr, startDate, endDate);
                     bs.writeLog("bdkAddList_size : " +  bdkAddList.size());
                     if (bdkAddList.size() > 0) {
                         addList.addAll(bdkAddList);
                     }
                     //出勤津贴表
-                    List<Map<String, String>> cqjtAddList = getCqjtAddList(mainId, startDate, endDate);
+                    List<Map<String, String>> cqjtAddList = getCqjtAddList(mainId, subCompanyListStr, startDate, endDate);
                     bs.writeLog("cqjtAddList_size : " +  cqjtAddList.size());
                     if (cqjtAddList.size() > 0) {
                         addList.addAll(cqjtAddList);
@@ -703,8 +703,8 @@ public class AttendanceSummaryServiceImpl extends Service implements AttendanceS
     }
 
     //汇总补打卡表
-    public List<Map<String, String>> getBdkAddList(String mainId, String startDate, String endDate) {
-        String bdkSql = "select a.*, b.fbid, b.bm from uf_jcl_kq_bdkjl a left join uf_jcl_kq_cqjg b on a.bdkry = b.ygid and a.dkrq = b.rq  where a.dkrq >= '" + startDate +"'" + " and a.dkrq <= '" + endDate +"'";
+    public List<Map<String, String>> getBdkAddList(String mainId, String subCompanyListStr, String startDate, String endDate) {
+        String bdkSql = "select a.*, b.fbid, b.bm from uf_jcl_kq_bdkjl a left join uf_jcl_kq_cqjg b on a.bdkry = b.ygid and a.dkrq = b.rq where b.fbid in (" + subCompanyListStr + ") and a.dkrq >= '" + startDate +"'" + " and a.dkrq <= '" + endDate +"'";
         List<Map<String,Object>> bdkDates = DbTools.getSqlToList(bdkSql);
         //先根据分部、部门、人员、项目分组
         Map<String, List<Map<String,Object>>> toDealBdkDataWithGroup = new HashMap<>();
@@ -749,8 +749,8 @@ public class AttendanceSummaryServiceImpl extends Service implements AttendanceS
     }
 
     //汇总出勤津贴表
-    public List<Map<String, String>> getCqjtAddList(String mainId, String startDate, String endDate) {
-        String cqjtSql = "select a.*, b.fbid, b.bm from uf_jcl_kq_cqjt a left join uf_jcl_kq_cqjg b on a.yg = b.ygid and a.rq = b.rq  where a.rq >= '" + startDate +"'" + " and a.rq <= '" + endDate+"'";
+    public List<Map<String, String>> getCqjtAddList(String mainId, String subCompanyListStr, String startDate, String endDate) {
+        String cqjtSql = "select a.*, b.fbid, b.bm from uf_jcl_kq_cqjt a left join uf_jcl_kq_cqjg b on a.yg = b.ygid and a.rq = b.rq  where b.fbid in (" + subCompanyListStr + ") and  a.rq >= '" + startDate +"'" + " and a.rq <= '" + endDate+"'";
         List<Map<String,Object>> cqjtDates = DbTools.getSqlToList(cqjtSql);
         //先根据分部、部门、人员、项目分组
         Map<String, List<Map<String,Object>>> toDealCqjtDataWithGroup = new HashMap<>();

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