chenwei
/
weaver-sskj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

老代码提交

Browse Source
dev
Administrator 1 year ago
parent a0acd57a31
commit 016daca4a4
4 changed files with 187 additions and 59 deletions
Show Stats Download Patch File Download Diff File

56
src/com/engine/kq/cmd/report/ExportDailyExcelCmd.java
Unescape Escape View File

@ -351,23 +351,53 @@ public class ExportDailyExcelCmd extends AbstractCommonCommand<Map<String, Objec
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查询入职日期
@ -766,14 +796,14 @@ public class ExportDailyExcelCmd extends AbstractCommonCommand<Map<String, Objec
/*获取人员加班类型*/
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<String,String> getEmployAndResignDateById(String id){

56
src/com/engine/kq/cmd/report/ExportExcelCmd.java
Unescape Escape View File

@ -377,23 +377,53 @@ public class ExportExcelCmd extends AbstractCommonCommand<Map<String, Object>> {
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<Map<String, Object>> {
/*获取人员加班类型*/
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<String,String> getEmployAndResignDateById(String id){

64
src/com/engine/kq/cmd/report/GetKQDailyReportCmd.java
Unescape Escape View File

@ -349,28 +349,58 @@ public class GetKQDailyReportCmd extends AbstractCommonCommand<Map<String, Objec
data.put(fieldName + "Id", fieldValueID);
data.put(fieldName, fieldValue);
}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 = "";
}
data.put(fieldName, fieldValue);
}else if(fieldName.equals("overtimeType")){
//根据id查询加班类型
String overtimeType = getOvertimeTypeById(id);
if("0".equals(overtimeType)){
overtimeType = "有加班费";
}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 {
overtimeType = "无加班费";
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查询加班类别
String overtimeType = getOvertimeTypeById(id);
fieldValue = overtimeType;
data.put(fieldName,fieldValue);
}else if(fieldName.equals("companystartdate")){
//根据id查询入职日期
@ -656,14 +686,14 @@ public class GetKQDailyReportCmd extends AbstractCommonCommand<Map<String, Objec
/*获取人员加班类型*/
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;
}
/*获取人员入离职时间*/

70
src/com/engine/kq/cmd/report/GetKQReportCmd.java
Unescape Escape View File

@ -417,24 +417,62 @@ public class GetKQReportCmd extends AbstractCommonCommand<Map<String, Object>> {
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("overtimeType")){
//根据id查询加班类型
String overtimeType = getOvertimeTypeById(id);
if("0".equals(overtimeType)){
overtimeType = "有加班费";
}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 {
overtimeType = "无加班费";
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查询加班类别
String overtimeType = getOvertimeTypeById(id);
// 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<Map<String, Object>> {
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;
}
/*获取人员入离职时间*/

Write Preview
Loading…
Cancel
Save