Merge branch 'fix/Attendance.morningOnDutyTime' into 'develop'

Merge for fix/Attendance.morningOnDutyTime[考勤管理]修复了移动打卡数据服务无法指定打卡时间的问题

See merge request o2oa/o2oa!719

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

@@ -63,7 +63,7 @@ class AttendanceDetailAnalyseCoreService {
 	}
 
 	static Date getAfternoonOndutyTimeFromDetail(AttendanceDetail detail, Boolean debugger) {
-		if( StringUtils.isNotEmpty( detail.getMorningOffdutyTime()) ){
+		if( StringUtils.isNotEmpty( detail.getMorningOffDutyTime()) ){
 			try {
 				logger.debug( debugger, "格式化[下午上班签到时间]afternoonOndutyTime=" +  detail.getRecordDateString() + " " + detail.getAfternoonOnDutyTime() );
 				return dateOperation.getDateFromString( detail.getRecordDateString() + " " + detail.getAfternoonOnDutyTime() );
@@ -79,13 +79,13 @@ class AttendanceDetailAnalyseCoreService {
 	}
 
 	static Date getMorningOffdutyTimeFromDetail(AttendanceDetail detail, Boolean debugger) {
-		if( StringUtils.isNotEmpty( detail.getMorningOffdutyTime()) ){
+		if( StringUtils.isNotEmpty( detail.getMorningOffDutyTime()) ){
 			try {
-				logger.debug( debugger, "格式化[上午下班签退时间]morningOffdutyTime=" +  detail.getRecordDateString() + " " + detail.getMorningOffdutyTime() );
-				return dateOperation.getDateFromString( detail.getRecordDateString() + " " + detail.getMorningOffdutyTime() );
+				logger.debug( debugger, "格式化[上午下班签退时间]morningOffdutyTime=" +  detail.getRecordDateString() + " " + detail.getMorningOffDutyTime() );
+				return dateOperation.getDateFromString( detail.getRecordDateString() + " " + detail.getMorningOffDutyTime() );
 			} catch (Exception e) {
-				detail.setDescription( detail.getDescription() + "; 系统进行时间转换时发生异常,morningOffdutyTime=" + detail.getRecordDateString() + " " + detail.getMorningOffdutyTime() );
-				logger.warn( "系统进行时间转换时发生异常,morningOffdutyTime=" + detail.getRecordDateString() + " " + detail.getMorningOffdutyTime() );
+				detail.setDescription( detail.getDescription() + "; 系统进行时间转换时发生异常,morningOffdutyTime=" + detail.getRecordDateString() + " " + detail.getMorningOffDutyTime() );
+				logger.warn( "系统进行时间转换时发生异常,morningOffdutyTime=" + detail.getRecordDateString() + " " + detail.getMorningOffDutyTime() );
 				logger.error(e);
 			}
 		}else{

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

@@ -59,9 +59,9 @@ class ComposeDetailWithMobileInSignProxy2 {
 		detail.setRecordDateString( mobileDetail.getRecordDateString() );
 		detail.setOnDutyTime( onDutyTime ); //最早的一次打卡作为当天的上班签到打卡
 		if( StringUtils.equals(morningOffdutyTime, onDutyTime )){
-			detail.setMorningOffdutyTime( null );
+			detail.setMorningOffDutyTime( null );
 		}else{
-			detail.setMorningOffdutyTime( morningOffdutyTime ); //午休打卡时间
+			detail.setMorningOffDutyTime( morningOffdutyTime ); //午休打卡时间
 		}
 		if( StringUtils.equals(offDutyTime, onDutyTime ) || StringUtils.equals(morningOffdutyTime, offDutyTime ) ){
 			detail.setOffDutyTime( null );

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

@@ -60,7 +60,7 @@ class ComposeDetailWithMobileInSignProxy3 {
 		}
 		detail.setRecordDateString( mobileDetail.getRecordDateString() );
 		detail.setOnDutyTime( onDutyTime ); //上午上班签到打卡
-		detail.setMorningOffdutyTime( morningOffdutyTime ); //上午下班打卡
+		detail.setMorningOffDutyTime( morningOffdutyTime ); //上午下班打卡
 		detail.setAfternoonOnDutyTime( afternoonOndutyTime ); //下午上班打卡
 		detail.setOffDutyTime( offDutyTime ); //下午下班签退打卡
 		detail.setRecordStatus( 0 );