导出考勤添加身份证

happy-job-module-hpjob/src/main/java/com/jeeplus/modules/wscompany/web/WsCompanyController.java

@@ -219,7 +219,7 @@ public class WsCompanyController extends BaseController {
 		cell = row.createCell(0);
 		cell.setCellValue(wsCompany.getCompanyName()+"员工考勤汇总表"+sdf.format(wsCompany.getStartTime())+"~"+sdf.format(wsCompany.getEndTime()));
 		cell.setCellStyle(style);
-		CellRangeAddress region = new CellRangeAddress(0, 0, 0, 4);
+		CellRangeAddress region = new CellRangeAddress(0, 0, 0, 5);
 		sheet.addMergedRegion(region);
 		row = sheet.createRow(1);
 		//创建标题
@@ -230,9 +230,12 @@ public class WsCompanyController extends BaseController {
 		cell.setCellValue("员工手机号");
 		cell.setCellStyle(style);
 		cell = row.createCell(2);
-		cell.setCellValue("有效打卡天数（天）");
+		cell.setCellValue("员工身份证");
 		cell.setCellStyle(style);
 		cell = row.createCell(3);
+		cell.setCellValue("有效打卡天数（天）");
+		cell.setCellStyle(style);
+		cell = row.createCell(4);
 		cell.setCellValue("总工时（小时）");
 		cell.setCellStyle(style);
         int sumDay=0;
@@ -245,18 +248,19 @@ public class WsCompanyController extends BaseController {
 			//将内容按顺序赋给对应的列对象
 			row.createCell(0).setCellValue(list.get(i).getUserName());
 			row.createCell(1).setCellValue(list.get(i).getMobile());
-			row.createCell(2).setCellValue(list.get(i).getSumClockDay());
-			row.createCell(3).setCellValue(list.get(i).getSumClockTime());
+			row.createCell(2).setCellValue(list.get(i).getIdcardNumber());
+			row.createCell(3).setCellValue(list.get(i).getSumClockDay());
+			row.createCell(4).setCellValue(list.get(i).getSumClockTime());
 
 		}
 		//创建内容
 		row = sheet.createRow(2+list.size());
 		//将内容按顺序赋给对应的列对象
 		row.createCell(0).setCellValue("汇总");
-		row.createCell(2).setCellValue(sumDay);
-		row.createCell(3).setCellValue(sumTime);
-		//合并工作经验4个为一个单元格
-		 region = new CellRangeAddress(list.size()+2, list.size()+2, 0, 1);
+		row.createCell(3).setCellValue(sumDay);
+		row.createCell(4).setCellValue(sumTime);
+		//合并单元格
+		 region = new CellRangeAddress(list.size()+3, list.size()+3, 0, 1);
 		sheet.addMergedRegion(region);
 		return wb;
 	}

happy-job-module-hpjob/src/main/java/com/jeeplus/modules/wsstaff/mapper/xml/WsStaffMapper.xml

@@ -247,6 +247,7 @@
 		a.id AS "id",
 		a.phone AS "mobile",
 		a.real_name as "userName",
+		a.id_card_number as "idcardNumber",
 		count(wpc.duration) as "sumClockDay",
 		sum(wpc.duration) as "sumClockTime"
 		FROM hp_member a