修改导出考勤明细添加身份证号一列

happy-job-module-hpjob/src/main/java/com/jeeplus/modules/wspunch/mapper/xml/WsPunchClockMapper.xml

@@ -16,7 +16,8 @@
 		a.duration AS "duration",
 		wsc.company_name AS "companyName",
         hpm.real_name AS "userName",
-        hpm.phone AS "phone"
+        hpm.phone AS "phone",
+        hpm.id_card_number as "idcardNumber"
 	</sql>
 	
 	<sql id="wsPunchClockJoins">

happy-job-module-hpjob/src/main/java/com/jeeplus/modules/wspunch/web/WsPunchClockController.java

@@ -273,18 +273,21 @@ public class WsPunchClockController extends BaseController {
 		cell.setCellValue("员工手机号");
 		cell.setCellStyle(style);
 		cell = row.createCell(3);
-		cell.setCellValue("所在企业");
+		cell.setCellValue("员工身份证");
 		cell.setCellStyle(style);
 		cell = row.createCell(4);
-		cell.setCellValue("上班卡时间");
+		cell.setCellValue("所在企业");
 		cell.setCellStyle(style);
 		cell = row.createCell(5);
-		cell.setCellValue("下班卡时间");
+		cell.setCellValue("上班卡时间");
 		cell.setCellStyle(style);
 		cell = row.createCell(6);
-		cell.setCellValue("打卡工时");
+		cell.setCellValue("下班卡时间");
 		cell.setCellStyle(style);
 		cell = row.createCell(7);
+		cell.setCellValue("打卡工时");
+		cell.setCellStyle(style);
+		cell = row.createCell(8);
 		cell.setCellValue("状态");
 		cell.setCellStyle(style);
 		for (int i = 0; i <list.size() ; i++) {
@@ -294,16 +297,17 @@ public class WsPunchClockController extends BaseController {
 			row.createCell(0).setCellValue(sdf.format(list.get(i).getDayTime()));
 			row.createCell(1).setCellValue(list.get(i).getUserName());
 			row.createCell(2).setCellValue(list.get(i).getPhone());
-			row.createCell(3).setCellValue(list.get(i).getCompanyName());
-			row.createCell(4).setCellValue(sdf1.format(list.get(i).getStartPunchClock()));
+			row.createCell(3).setCellValue(list.get(i).getIdcardNumber());
+			row.createCell(4).setCellValue(list.get(i).getCompanyName());
+			row.createCell(5).setCellValue(sdf1.format(list.get(i).getStartPunchClock()));
 			if(list.get(i).getEndPunchClock()!=null){
-				row.createCell(5).setCellValue(sdf1.format(list.get(i).getEndPunchClock()));
+				row.createCell(6).setCellValue(sdf1.format(list.get(i).getEndPunchClock()));
 			}
 			if(list.get(i).getDuration()!=null){
-				row.createCell(6).setCellValue(list.get(i).getDuration());
+				row.createCell(7).setCellValue(list.get(i).getDuration());
 			}
 			if(list.get(i).getGrantStatus()!=null){
-				row.createCell(7).setCellValue(DictUtils.getDictLabel(String.valueOf(list.get(i).getGrantStatus()), "grantStatus", ""));
+				row.createCell(8).setCellValue(DictUtils.getDictLabel(String.valueOf(list.get(i).getGrantStatus()), "grantStatus", ""));
 			}
 		}
 		return wb;