Просмотр исходного кода

导出人事修改

Signed-off-by: anderx <312518615@qq.com>
anderx лет назад: 5
Родитель
Сommit
656b7d1fbe

+ 2 - 2
src/main/java/com/goafanti/common/task/ReleaseUserTask.java

@@ -70,7 +70,7 @@ public class ReleaseUserTask {
 				
 			}
 		List<LockingReleaseBo> newList=new ArrayList<LockingReleaseBo>();
-			  if (lockUserList.size()>0) {
+			  if (lockUserList!=null&&lockUserList.size()>0) {
 				  for(int i=0;i<lockUserList.size();i++){
 					  newList.add(lockUserList.get(i));
 					  if(pointsDataLimit == newList.size()||i == lockUserList.size()-1){
@@ -80,7 +80,7 @@ public class ReleaseUserTask {
 					  }  
 				  }
 			}
-			  if (lockBusinessList.size()>0) {
+			  if (lockBusinessList!=null&&lockBusinessList.size()>0) {
 				  for(int i=0;i<lockBusinessList.size();i++){
 					  newList.add(lockBusinessList.get(i));
 					  if(pointsDataLimit == newList.size()||i == lockBusinessList.size()-1){

+ 23 - 26
src/main/java/com/goafanti/personnel/service/impl/PersonnelServiceImpl.java

@@ -270,9 +270,10 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
 		try {
 			List<OutPersonnelListBo>list=(List<OutPersonnelListBo>) selectList(in).getList();
 			
-    		String[] comment = {"序号","姓名","员工状态","系统","员工编号","门禁号","所属公司","职位","级别","星级","入职时间","转正时间","年龄","性别"
-    				,"婚否","子女","政治面貌","学历","毕业学校","所学专业","职称/证书","晋升明细","最近晋升时间","合同","联系电话","办公室电话","出生日期",
-    				"出生月份","身份证号码","身份证发证地","户籍所在地","现住址","紧急联系人","紧急联系人电话"};
+    		String[] comment = {"员工编号","门禁编号","姓名","员工状态","所属系统","所属公司","职位名称","等级名称","星级","入职时间","转正时间","出生日期","性别"
+    				,"婚否","子女","政治面貌","学历","毕业学校","所学专业","职称/证书","晋升明细","最近晋升时间","合同","联系电话","办公室电话",
+    				"身份证号码","身份证发证地","户籍所在地","现住址","紧急联系人","紧急联系人电话","离职时间","工作年限","年龄","出生月份","参保时间","停保时间",
+    				"入公积金时间","停公积金时间"};
     		String fileName ="人事档案表" + new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()) + ".xls";
     		//type 0 变更
     		XSSFWorkbook wb =ExportExcelUtil.exportTemplateInfoS(comment,"人事档案表");
@@ -286,28 +287,22 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
     				//当前列的只
     				String o = "";
     				switch (comment[i]) {
-//    				{"序号","姓名","员工状态","系统","员工编号","门禁号","所属公司","职位",
-//    				"级别","星级","入职时间","转正时间","年龄","性别","婚否","子女",
-    				case "序号": o = String.valueOf(sheet.getLastRowNum()-2); break;
+//    				"员工编号","门禁编号","姓名","员工状态","所属系统","所属公司","职位名称","等级名称","星级","入职时间","转正时间","出生日期","性别"
+    				case "员工编号": o = ob.getEmployeeId()==null?"":ob.getEmployeeId().toString(); break;
+    				case "门禁编号": o = ob.getDoorId().toString(); break;
     				case "姓名": o = ob.getName(); break;
     				case "员工状态": o = ob.getStatusName(); break;
-    				case "系统": o = ob.getSystemName(); break;
-    				case "员工编号": o = ob.getId().toString(); break;
-    				case "门禁号": o = ob.getDoorId().toString(); break;
+    				case "所属系统": o = ob.getSystemName(); break;
     				case "所属公司": o = ob.getDepName(); break;
-    				case "职位": o = ob.getJobsName(); break;
-    				case "级别": o = ob.getLvlName(); break;
-    				case "星级": o = ob.getStarName(); break;
+    				case "职位名称": o = ob.getJobsName(); break;
+    				case "等级名称": o = ob.getStarName(); break;
+    				case "星级": o = ob.getLvlName(); break;
     				case "入职时间": o = ob.getEntryTimes(); break;
-    				case "转正时间": o = ob.getPromotionTimes(); break;
-    				case "年龄": o = ob.getAge()==null?"":ob.getAge().toString(); break;
+    				case "转正时间": o = ob.getPromotionTimes()==null?"":ob.getPromotionTimes(); break;
+    				case "出生日期": o = ob.getBirthdays(); break;
     				case "性别": o = ob.getSex()==0?"男":"女"; break;
     				case "婚否": o = ob.getMarriageName(); break;
     				case "子女": o = ob.getSon().toString()+"/"+ob.getGirl().toString(); break;
-//    				"","","","","职称/证书","晋升明细",
-//    				"最近晋升时间","合同","联系电话","办公室电话","出生日期",
-//    				"出生月份","身份证号码","身份证发证地","户籍所在地","现住址",
-//    				"紧急联系人","紧急联系人电话"};
     				case "政治面貌": o = ob.getPoliticalOutlookName(); break;
     				case "学历": o = ob.getEducationName(); break;
     				case "毕业学校": o = ob.getSchool(); break;
@@ -316,24 +311,25 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
     				case "晋升明细": o = ob.getPromotionRemarks(); break;
     				case "最近晋升时间": o = ob.getPromotionTimes(); break;
     				case "合同": if (ob.getContractStart()!=null&&ob.getContractEnd()!=null) {
-    									o = ob.getContractStart()+" ~ "+ob.getContractEnd();
-    								}
-    				 				break;
+    					o = ob.getContractStart()+" ~ "+ob.getContractEnd();
+    				}
+    				break;
     				case "联系电话": o = ob.getMobile(); break;
     				case "办公室电话": o = ob.getFixedTel(); break;
-    				case "出生日期": o = ob.getBirthdays(); break;
-    				case "出生月份": o = ob.getMonth()==null?"":ob.getMonth().toString(); break;
     				case "身份证号码": o = ob.getIdCard(); break;
     				case "身份证发证地": o = ob.getCertificationAuthority(); break;
     				case "户籍所在地": o = ob.getResidenceName(); break;
     				case "现住址": o = ob.getNowName(); break;
     				case "紧急联系人": o = ob.getEmergencyContact(); break;
     				case "紧急联系人电话": o = ob.getEmergencyMobile(); break;
-    				case "入社保时间": o = ob.getInsuranceStartTimes(); break;
-    				case "停社保时间": o = ob.getInsuranceEndTimes(); break;
+    				case "离职时间": o = ob.getQuitTime(); break;
+    				case "工作年限": o = ob.getWorkingYear()==null?"":ob.getWorkingYear().toString(); break;
+    				case "年龄": o = ob.getAge()==null?"":ob.getAge().toString(); break;
+    				case "出生月份": o = ob.getMonth()==null?"":ob.getMonth().toString(); break;
+    				case "参保时间": o = ob.getInsuranceStartTimes(); break;
+    				case "停保时间": o = ob.getInsuranceEndTimes(); break;
     				case "入公积金时间": o = ob.getFundStartTimes(); break;
     				case "停公积金时间": o = ob.getFundEndTimes(); break;
-    				case "离职时间": o = ob.getQuitTime(); break;
     				default: o = ""; break;
     				}
     				XSSFCell c = r.createCell(i);
@@ -348,6 +344,7 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
 			 out.flush();
 			 out.close();
 		} catch (Exception e) {
+			logger.error(e.getLocalizedMessage());
 			throw new BusinessException(new Error("表格生成错误。"));
 		}finally {
 			out.flush();