老代码提交

src/com/engine/kq/cmd/report/ExportDailyExcelCmd.java

@@ -398,6 +398,15 @@ public class ExportDailyExcelCmd extends AbstractCommonCommand<Map<String, Objec
           }else if(fieldName.equals("overtimeType")){
             //根据id查询加班类型
             String overtimeType = getOvertimeTypeById(id);
+            if("6".equals(overtimeType)){
+              overtimeType = "调休";
+            }else if("5".equals(overtimeType)){
+              overtimeType = "隔月发放";
+            }else if("4".equals(overtimeType)){
+              overtimeType = "当月发放";
+            }else {
+              overtimeType = "无";
+            }
             fieldValue = overtimeType;
           }else if(fieldName.equals("companystartdate")){
             //根据id查询入职日期

src/com/engine/kq/cmd/report/ExportExcelCmd.java

@@ -424,6 +424,15 @@ public class ExportExcelCmd extends AbstractCommonCommand<Map<String, Object>> {
           }else if(fieldName.equals("overtimeType")){
             //根据id查询加班类型
             String overtimeType = getOvertimeTypeById(id);
+            if("6".equals(overtimeType)){
+              overtimeType = "调休";
+            }else if("5".equals(overtimeType)){
+              overtimeType = "隔月发放";
+            }else if("4".equals(overtimeType)){
+              overtimeType = "当月发放";
+            }else {
+              overtimeType = "无";
+            }
             fieldValue = overtimeType;
           }else if(fieldName.equals("companystartdate")){
             //根据id查询入职日期

src/com/engine/kq/cmd/report/GetKQDailyReportCmd.java

@@ -400,6 +400,15 @@ public class GetKQDailyReportCmd extends AbstractCommonCommand<Map<String, Objec
 					}else if(fieldName.equals("overtimeType")){
 						//根据id查询加班类别
 						String overtimeType = getOvertimeTypeById(id);
+						if("6".equals(overtimeType)){
+							overtimeType = "调休";
+						}else if("5".equals(overtimeType)){
+							overtimeType = "隔月发放";
+						}else if("4".equals(overtimeType)){
+							overtimeType = "当月发放";
+						}else {
+							overtimeType = "无";
+						}
 						fieldValue = overtimeType;
 						data.put(fieldName,fieldValue);
 					}else if(fieldName.equals("companystartdate")){

src/com/engine/kq/cmd/report/GetKQReportCmd.java

@@ -466,13 +466,18 @@ public class GetKQReportCmd extends AbstractCommonCommand<Map<String, Object>> {
 							fieldValue = "";
 						}
 					}else if(fieldName.equals("overtimeType")){
+						writeLog("overtimeType123"+fieldName);
 						//根据id查询加班类别
 						String overtimeType = getOvertimeTypeById(id);
-//						if("0".equals(overtimeType)){
-//							overtimeType = "有加班费";
-//						}else{
-//							overtimeType = "无加班费";
-//						}
+						if("6".equals(overtimeType)){
+							overtimeType = "调休";
+						}else if("5".equals(overtimeType)){
+							overtimeType = "隔月发放";
+						}else if("4".equals(overtimeType)){
+							overtimeType = "当月发放";
+						}else {
+							overtimeType = "无";
+						}
 						data.put("overtimeType",overtimeType);
 						fieldValue = overtimeType;
 					}else if(fieldName.equals("companystartdate")){