修改导入判断离职时间不能小于入职时间

happy-job-module-hpjob/src/main/java/com/jeeplus/modules/wsstaff/service/WsStaffService.java

@@ -145,6 +145,13 @@ public class WsStaffService extends CrudService<WsStaffMapper, WsStaff> {
 		calendar1.add(Calendar.DATE, offset1 - 7);
 		calendar2.add(Calendar.DATE, offset2 - 7);
 		try {
+			//离职时间不能小于入职时间
+			if(StringUtils.isNotBlank(outgoingDate)){
+				if(format.parse(onaboardingDate).getTime()>format.parse(outgoingDate).getTime()){
+					bo=false;
+					return bo;
+				}
+			}
 			if(wsStaff!=null && wsStaff.getId()!=null){
 				//判断入职时间
 				if(wsStaff.getOnaboardingDate().getTime()>calendar1.getTime().getTime() && wsStaff.getOnaboardingDate().getTime()<calendar2.getTime().getTime()){
@@ -240,6 +247,15 @@ public class WsStaffService extends CrudService<WsStaffMapper, WsStaff> {
 			String[][] result = ei.getData(0);
 			int rowLength = result.length;
 			for (int i = 2; i < rowLength; i++) {
+				//如果参数都为空，则不算为一行
+				if(StringUtils.isBlank(result[i][0].trim()) && StringUtils.isBlank(result[i][1].trim())
+						&& StringUtils.isBlank(result[i][2].trim()) && StringUtils.isBlank(result[i][3].trim())
+						&& StringUtils.isBlank(result[i][4].trim()) && StringUtils.isBlank(result[i][5].trim())
+						&& StringUtils.isBlank(result[i][6].trim()) && StringUtils.isBlank(result[i][7].trim())
+						&& StringUtils.isBlank(result[i][8].trim()) && StringUtils.isBlank(result[i][9].trim())){
+					continue;
+				}
+
 				//前五个参数+第八个参数必填
 				if (result[i][0].trim()==""||result[i][0].trim()==null || result[i][1].trim()==""||result[i][1].trim()==null || result[i][2].trim()==""||result[i][2].trim()==null || result[i][3].trim()==""||result[i][3].trim()==null|| result[i][4].trim()==""||result[i][4].trim()==null || result[i][7].trim()==""||result[i][7].trim()==null) {
 					failureNum++;