From 016daca4a4ee4a7a2f76154dacf85f74f04ce512 Mon Sep 17 00:00:00 2001 From: Administrator <704728292@qq.com> Date: Tue, 7 May 2024 23:00:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=81=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kq/cmd/report/ExportDailyExcelCmd.java | 56 +++++++++++---- .../engine/kq/cmd/report/ExportExcelCmd.java | 56 +++++++++++---- .../kq/cmd/report/GetKQDailyReportCmd.java | 64 ++++++++++++----- .../engine/kq/cmd/report/GetKQReportCmd.java | 70 ++++++++++++++----- 4 files changed, 187 insertions(+), 59 deletions(-) diff --git a/src/com/engine/kq/cmd/report/ExportDailyExcelCmd.java b/src/com/engine/kq/cmd/report/ExportDailyExcelCmd.java index 802d516..e1a075c 100644 --- a/src/com/engine/kq/cmd/report/ExportDailyExcelCmd.java +++ b/src/com/engine/kq/cmd/report/ExportDailyExcelCmd.java @@ -351,23 +351,53 @@ public class ExportDailyExcelCmd extends AbstractCommonCommand4){ - fieldValue = split[0]+"/"+split[1]+"/"+split[2]+"/"+split[3]+"/"+split[4]; + if(split.length>=1){ + fieldValue = split[0]; + }else { + fieldValue = ""; + } + }else if(fieldName.equals("secondaryDepartment")){ + //根据id查询多级部门信息 + //String multiLevelDepartmentStr = getMultiLevelDepartmentById(id); + String departmentid = Util.null2String(rs.getString("departmentid")); + fieldValue = departmentComInfo.getDepartmentRealPath(departmentid, "/", "0"); + String[] split = fieldValue.split("/"); + if(split.length>=2){ + fieldValue = split[1]; + }else { + fieldValue = ""; + } + }else if(fieldName.equals("thirdLevelDepartment")){ + //根据id查询多级部门信息 + //String multiLevelDepartmentStr = getMultiLevelDepartmentById(id); + String departmentid = Util.null2String(rs.getString("departmentid")); + fieldValue = departmentComInfo.getDepartmentRealPath(departmentid, "/", "0"); + String[] split = fieldValue.split("/"); + if(split.length>=3){ + fieldValue = split[2]; + }else { + fieldValue = ""; + } + }else if(fieldName.equals("fourthLevelDepartment")){ + //根据id查询多级部门信息 + //String multiLevelDepartmentStr = getMultiLevelDepartmentById(id); + String departmentid = Util.null2String(rs.getString("departmentid")); + fieldValue = departmentComInfo.getDepartmentRealPath(departmentid, "/", "0"); + String[] split = fieldValue.split("/"); + if(split.length>=4){ + fieldValue = split[3]; + }else { + fieldValue = ""; } }else if(fieldName.equals("overtimeType")){ //根据id查询加班类型 String overtimeType = getOvertimeTypeById(id); - if("0".equals(overtimeType)){ - overtimeType = "有加班费"; - }else{ - overtimeType = "无加班费"; - } fieldValue = overtimeType; }else if(fieldName.equals("companystartdate")){ //根据id查询入职日期 @@ -766,14 +796,14 @@ public class ExportDailyExcelCmd extends AbstractCommonCommand getEmployAndResignDateById(String id){ diff --git a/src/com/engine/kq/cmd/report/ExportExcelCmd.java b/src/com/engine/kq/cmd/report/ExportExcelCmd.java index 713488d..68e3bb8 100644 --- a/src/com/engine/kq/cmd/report/ExportExcelCmd.java +++ b/src/com/engine/kq/cmd/report/ExportExcelCmd.java @@ -377,23 +377,53 @@ public class ExportExcelCmd extends AbstractCommonCommand> { departmentComInfo.getDepartmentname(tmpDepartmentId); // fieldValue = departmentComInfo.getDepartmentname(tmpDepartmentId); - } else if(fieldName.equals("multiLevelDepartment")){ + } else if(fieldName.equals("firstLevelDepartment")){ //根据id查询多级部门信息 //String multiLevelDepartmentStr = getMultiLevelDepartmentById(id); String departmentid = Util.null2String(rs.getString("departmentid")); - fieldValue = "总部/"+departmentComInfo.getDepartmentRealPath(departmentid, "/", "0"); + fieldValue = departmentComInfo.getDepartmentRealPath(departmentid, "/", "0"); String[] split = fieldValue.split("/"); - if(split.length>4){ - fieldValue = split[0]+"/"+split[1]+"/"+split[2]+"/"+split[3]+"/"+split[4]; + if(split.length>=1){ + fieldValue = split[0]; + }else { + fieldValue = ""; + } + }else if(fieldName.equals("secondaryDepartment")){ + //根据id查询多级部门信息 + //String multiLevelDepartmentStr = getMultiLevelDepartmentById(id); + String departmentid = Util.null2String(rs.getString("departmentid")); + fieldValue = departmentComInfo.getDepartmentRealPath(departmentid, "/", "0"); + String[] split = fieldValue.split("/"); + if(split.length>=2){ + fieldValue = split[1]; + }else { + fieldValue = ""; + } + }else if(fieldName.equals("thirdLevelDepartment")){ + //根据id查询多级部门信息 + //String multiLevelDepartmentStr = getMultiLevelDepartmentById(id); + String departmentid = Util.null2String(rs.getString("departmentid")); + fieldValue = departmentComInfo.getDepartmentRealPath(departmentid, "/", "0"); + String[] split = fieldValue.split("/"); + if(split.length>=3){ + fieldValue = split[2]; + }else { + fieldValue = ""; + } + }else if(fieldName.equals("fourthLevelDepartment")){ + //根据id查询多级部门信息 + //String multiLevelDepartmentStr = getMultiLevelDepartmentById(id); + String departmentid = Util.null2String(rs.getString("departmentid")); + fieldValue = departmentComInfo.getDepartmentRealPath(departmentid, "/", "0"); + String[] split = fieldValue.split("/"); + if(split.length>=4){ + fieldValue = split[3]; + }else { + fieldValue = ""; } }else if(fieldName.equals("overtimeType")){ //根据id查询加班类型 String overtimeType = getOvertimeTypeById(id); - if("0".equals(overtimeType)){ - overtimeType = "有加班费"; - }else{ - overtimeType = "无加班费"; - } fieldValue = overtimeType; }else if(fieldName.equals("companystartdate")){ //根据id查询入职日期 @@ -737,14 +767,14 @@ public class ExportExcelCmd extends AbstractCommonCommand> { /*获取人员加班类型*/ private String getOvertimeTypeById(String id){ RecordSet rs = new RecordSet(); - String field35 = ""; - String sql = "select field35 from cus_fielddata where" + + String field28 = ""; + String sql = "select field28 from cus_fielddata where" + " id = ? and scope='HrmCustomFieldByInfoType' and scopeid= 3"; rs.executeQuery(sql,id); if(rs.next()){ - field35 = Util.null2String(rs.getString("field35")); + field28 = Util.null2String(rs.getString("field28")); } - return field35; + return field28; } /*获取人员入离职时间*/ private Map getEmployAndResignDateById(String id){ diff --git a/src/com/engine/kq/cmd/report/GetKQDailyReportCmd.java b/src/com/engine/kq/cmd/report/GetKQDailyReportCmd.java index 571e011..b49c4b8 100644 --- a/src/com/engine/kq/cmd/report/GetKQDailyReportCmd.java +++ b/src/com/engine/kq/cmd/report/GetKQDailyReportCmd.java @@ -349,28 +349,58 @@ public class GetKQDailyReportCmd extends AbstractCommonCommand4){ - fieldValue = split[0]+"/"+split[1]+"/"+split[2]+"/"+split[3]+"/"+split[4]; + if(split.length>=1){ + fieldValue = split[0]; + }else { + fieldValue = ""; + } + data.put(fieldName, fieldValue); + }else if(fieldName.equals("secondaryDepartment")){ + //根据id查询多级部门信息 + //String multiLevelDepartmentStr = getMultiLevelDepartmentById(id); + String departmentid = Util.null2String(rs.getString("departmentid")); + fieldValue = departmentComInfo.getDepartmentRealPath(departmentid, "/", "0"); + String[] split = fieldValue.split("/"); + if(split.length>=2){ + fieldValue = split[1]; + }else { + fieldValue = ""; + } + data.put(fieldName, fieldValue); + }else if(fieldName.equals("thirdLevelDepartment")){ + //根据id查询多级部门信息 + //String multiLevelDepartmentStr = getMultiLevelDepartmentById(id); + String departmentid = Util.null2String(rs.getString("departmentid")); + fieldValue = departmentComInfo.getDepartmentRealPath(departmentid, "/", "0"); + String[] split = fieldValue.split("/"); + if(split.length>=3){ + fieldValue = split[2]; + }else { + fieldValue = ""; + } + data.put(fieldName, fieldValue); + }else if(fieldName.equals("fourthLevelDepartment")){ + //根据id查询多级部门信息 + //String multiLevelDepartmentStr = getMultiLevelDepartmentById(id); + String departmentid = Util.null2String(rs.getString("departmentid")); + fieldValue = departmentComInfo.getDepartmentRealPath(departmentid, "/", "0"); + String[] split = fieldValue.split("/"); + if(split.length>=4){ + fieldValue = split[3]; + }else { + fieldValue = ""; } data.put(fieldName, fieldValue); }else if(fieldName.equals("overtimeType")){ - - //根据id查询加班类型 + //根据id查询加班类别 String overtimeType = getOvertimeTypeById(id); - - if("0".equals(overtimeType)){ - overtimeType = "有加班费"; - }else{ - overtimeType = "无加班费"; - } fieldValue = overtimeType; - data.put(fieldName,fieldValue); }else if(fieldName.equals("companystartdate")){ //根据id查询入职日期 @@ -656,14 +686,14 @@ public class GetKQDailyReportCmd extends AbstractCommonCommand> { departmentComInfo.getDepartmentname(tmpDepartmentId); // fieldValue = departmentComInfo.getDepartmentname(tmpDepartmentId); - }else if(fieldName.equals("multiLevelDepartment")){ + }else if(fieldName.equals("firstLevelDepartment")){ //根据id查询多级部门信息 //String multiLevelDepartmentStr = getMultiLevelDepartmentById(id); String departmentid = Util.null2String(rs.getString("departmentid")); - data.put("multiLevelDepartmentId",departmentid); - fieldValue = "总部/"+departmentComInfo.getDepartmentRealPath(departmentid, "/", "0"); + data.put("firstLevelDepartment",departmentid); + fieldValue = departmentComInfo.getDepartmentRealPath(departmentid, "/", "0"); String[] split = fieldValue.split("/"); - if(split.length>4){ - fieldValue = split[0]+"/"+split[1]+"/"+split[2]+"/"+split[3]+"/"+split[4]; + if(split.length>=1){ + fieldValue = split[0]; + }else { + fieldValue = ""; + } + }else if(fieldName.equals("secondaryDepartment")){ + //根据id查询多级部门信息 + //String multiLevelDepartmentStr = getMultiLevelDepartmentById(id); + String departmentid = Util.null2String(rs.getString("departmentid")); + data.put("secondaryDepartment",departmentid); + fieldValue = departmentComInfo.getDepartmentRealPath(departmentid, "/", "0"); + String[] split = fieldValue.split("/"); + if(split.length>=2){ + fieldValue = split[1]; + }else { + fieldValue = ""; + } + }else if(fieldName.equals("thirdLevelDepartment")){ + //根据id查询多级部门信息 + //String multiLevelDepartmentStr = getMultiLevelDepartmentById(id); + String departmentid = Util.null2String(rs.getString("departmentid")); + data.put("thirdLevelDepartment",departmentid); + fieldValue = departmentComInfo.getDepartmentRealPath(departmentid, "/", "0"); + String[] split = fieldValue.split("/"); + if(split.length>=3){ + fieldValue = split[2]; + }else { + fieldValue = ""; + } + }else if(fieldName.equals("fourthLevelDepartment")){ + //根据id查询多级部门信息 + //String multiLevelDepartmentStr = getMultiLevelDepartmentById(id); + String departmentid = Util.null2String(rs.getString("departmentid")); + data.put("fourthLevelDepartment",departmentid); + fieldValue = departmentComInfo.getDepartmentRealPath(departmentid, "/", "0"); + String[] split = fieldValue.split("/"); + if(split.length>=4){ + fieldValue = split[3]; + }else { + fieldValue = ""; } }else if(fieldName.equals("overtimeType")){ - //根据id查询加班类型 + //根据id查询加班类别 String overtimeType = getOvertimeTypeById(id); - if("0".equals(overtimeType)){ - overtimeType = "有加班费"; - }else{ - overtimeType = "无加班费"; - } +// if("0".equals(overtimeType)){ +// overtimeType = "有加班费"; +// }else{ +// overtimeType = "无加班费"; +// } data.put("overtimeType",overtimeType); fieldValue = overtimeType; }else if(fieldName.equals("companystartdate")){ @@ -917,17 +955,17 @@ public class GetKQReportCmd extends AbstractCommonCommand> { return str; } - /*获取人员加班类型*/ + /*获取人员加班类别*/ private String getOvertimeTypeById(String id){ RecordSet rs = new RecordSet(); - String field35 = ""; - String sql = "select field35 from cus_fielddata where" + + String field28 = ""; + String sql = "select field28 from cus_fielddata where" + " id = ? and scope='HrmCustomFieldByInfoType' and scopeid= 3"; rs.executeQuery(sql,id); if(rs.next()){ - field35 = Util.null2String(rs.getString("field35")); + field28 = Util.null2String(rs.getString("field28")); } - return field35; + return field28; } /*获取人员入离职时间*/