Merge branch 'fix/Attendance.appeal.create' into 'develop'

[考勤管理]修复了在某些情况下发起考勤结果申诉出现错误的问题

See merge request o2oa/o2oa!958

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceappealinfo/ActionAppealCreate.java

@@ -142,7 +142,7 @@ public class ActionAppealCreate extends BaseAction {
 		
 		//查询申诉复核人
 		if (check) {
-			if( StringUtils.isNotEmpty( appeal_checker_type ) && !"无".equals( appeal_auditor_type  ) ) {
+			if( StringUtils.isNotEmpty( appeal_checker_type ) && !"无".equals( appeal_checker_type  ) ) {
 				try {
 					appealCheckPersonName = attendanceAppealInfoServiceAdv.getAppealCheckPerson( personName, attendanceAppealInfo.getUnitName(), wrapIn.getIdentity() );
 					attendanceAppealAuditInfo.setProcessPerson2( appealCheckPersonName );

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/service/AttendanceAppealInfoServiceAdv.java

@@ -142,15 +142,15 @@ public class AttendanceAppealInfoServiceAdv {
 	 * @throws Exception
 	 */
 	private String getAppealProcessPerson( String personName, String auditorType, String auditorTypeValue, String personUnitName, String identity ) throws Exception {
-		if( personName == null || personName.isEmpty() ) {
+		if( StringUtils.isEmpty(personName) ) {
 			logger.info( "personName is null!" );
 			return null;
 		}
-		if( auditorType == null || auditorType.isEmpty() ) {
+		if( StringUtils.isEmpty(auditorType)) {
 			logger.info( "auditorType is null!" );
 			return null;
 		}
-		if( auditorTypeValue == null || auditorTypeValue.isEmpty() ) {
+		if( StringUtils.isEmpty(auditorTypeValue)  ) {
 			logger.info( "auditorTypeValue is null!" );
 			return null;
 		}
@@ -177,11 +177,11 @@ public class AttendanceAppealInfoServiceAdv {
 	 * @throws Exception
 	 */
 	private String getPersonWithUnitDuty( String personName, String dutyName, String personUnitName, String identity ) throws Exception {
-		if( StringUtils.isNotEmpty( personName ) ) {
+		if( StringUtils.isEmpty( personName ) ) {
 			logger.info( "personName is null!" );
 			return null;
 		}
-		if( StringUtils.isNotEmpty( dutyName ) ) {
+		if( StringUtils.isEmpty( dutyName ) ) {
 			logger.info( "dutyName is null!" );
 			return null;
 		}

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceDetail.java

@@ -908,6 +908,86 @@ public class AttendanceDetail extends SliceJpaObject {
 
 	public void setMiddayRestEndTime(String middayRestEndTime) { this.middayRestEndTime = middayRestEndTime; }
 
+	public Boolean getHoliday() {
+		return isHoliday;
+	}
+
+	public void setHoliday(Boolean holiday) {
+		isHoliday = holiday;
+	}
+
+	public Boolean getWorkday() {
+		return isWorkday;
+	}
+
+	public void setWorkday(Boolean workday) {
+		isWorkday = workday;
+	}
+
+	public Boolean getGetSelfHolidays() {
+		return isGetSelfHolidays;
+	}
+
+	public void setGetSelfHolidays(Boolean getSelfHolidays) {
+		isGetSelfHolidays = getSelfHolidays;
+	}
+
+	public Boolean getAbsent() {
+		return isAbsent;
+	}
+
+	public void setAbsent(Boolean absent) {
+		isAbsent = absent;
+	}
+
+	public Boolean getAbnormalDuty() {
+		return isAbnormalDuty;
+	}
+
+	public void setAbnormalDuty(Boolean abnormalDuty) {
+		isAbnormalDuty = abnormalDuty;
+	}
+
+	public Boolean getLackOfTime() {
+		return isLackOfTime;
+	}
+
+	public void setLackOfTime(Boolean lackOfTime) {
+		isLackOfTime = lackOfTime;
+	}
+
+	public Boolean getWorkOvertime() {
+		return isWorkOvertime;
+	}
+
+	public void setWorkOvertime(Boolean workOvertime) {
+		isWorkOvertime = workOvertime;
+	}
+
+	public Boolean getLeaveEarlier() {
+		return isLeaveEarlier;
+	}
+
+	public void setLeaveEarlier(Boolean leaveEarlier) {
+		isLeaveEarlier = leaveEarlier;
+	}
+
+	public Boolean getLate() {
+		return isLate;
+	}
+
+	public void setLate(Boolean late) {
+		isLate = late;
+	}
+
+	public Boolean getWeekend() {
+		return isWeekend;
+	}
+
+	public void setWeekend(Boolean weekend) {
+		isWeekend = weekend;
+	}
+
 	/**
 	 * 清除对该条数据信息的分析结果
 	 */