Pārlūkot izejas kodu

考勤,新增出勤率(个人,部门,公司)统计导出

luojing 5 gadi atpakaļ
vecāks
revīzija
9ffaaecbed

+ 5 - 1
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attachment/ActionExportPersonStatistic.java

@@ -72,7 +72,11 @@ public class ActionExportPersonStatistic extends BaseAction {
 			
 			
 			// 将结果组织成EXCEL		
 			// 将结果组织成EXCEL		
 			if( check ) {
 			if( check ) {
-				fileName = "" + name + "的个人出勤率统计记录_"+year+"年"+month+"月.xls";
+				if(StringUtils.isNotEmpty(name) && StringUtils.contains(name,"@")){
+					fileName = "" + name.split("@")[0] + "的个人出勤率统计记录_"+year+"年"+month+"月.xls";
+				}else{
+					fileName = "" + name + "的个人出勤率统计记录_"+year+"年"+month+"月.xls";
+				}
 				sheetName = "个人出勤率统计记录";
 				sheetName = "个人出勤率统计记录";
 				wb = composeDetail( fileName, sheetName, statisticPersonForMonth_list );
 				wb = composeDetail( fileName, sheetName, statisticPersonForMonth_list );
 			}
 			}

+ 5 - 1
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attachment/ActionExportTopUnitStatistic.java

@@ -93,7 +93,11 @@ public class ActionExportTopUnitStatistic extends BaseAction {
 			
 			
 			// 将结果组织成EXCEL		
 			// 将结果组织成EXCEL		
 			if( check ) {
 			if( check ) {
-				fileName = "" + name + "的出勤率统计记录_"+year+"年"+month+"月.xls";
+				if(StringUtils.isNotEmpty(name) && StringUtils.contains(name,"@")){
+					fileName = "" + name.split("@")[0] + "的出勤率统计记录_"+year+"年"+month+"月.xls";
+				}else{
+					fileName = "" + name + "的出勤率统计记录_"+year+"年"+month+"月.xls";
+				}
 				sheetName = "公司出勤率统计记录";
 				sheetName = "公司出勤率统计记录";
 				wb = composeDetail( fileName, sheetName, statisticUnitForMonth_list );
 				wb = composeDetail( fileName, sheetName, statisticUnitForMonth_list );
 			}
 			}

+ 5 - 1
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attachment/ActionExportUnitSubNestedStatistic.java

@@ -98,7 +98,11 @@ public class ActionExportUnitSubNestedStatistic extends BaseAction {
 			
 			
 			// 将结果组织成EXCEL		
 			// 将结果组织成EXCEL		
 			if( check ) {
 			if( check ) {
-				fileName = "" + name + "的部门出勤率统计记录_"+year+"年"+month+"月.xls";
+				if(StringUtils.isNotEmpty(name) && StringUtils.contains(name,"@")){
+					fileName = "" + name.split("@")[0] + "的部门出勤率统计记录_"+year+"年"+month+"月.xls";
+				}else{
+					fileName = "" + name + "的部门出勤率统计记录_"+year+"年"+month+"月.xls";
+				}
 				sheetName = "部门出勤率统计记录";
 				sheetName = "部门出勤率统计记录";
 				wb = composeDetail( fileName, sheetName, statisticPersonForMonth_list );
 				wb = composeDetail( fileName, sheetName, statisticPersonForMonth_list );
 			}
 			}