Merge branch 'frature/attendance715' into 'develop'

修复移动打卡类型问题 Frature/attendance715

See merge request o2oa/o2oa!1195

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attachment/ActionImportFileUpload.java

@@ -122,8 +122,11 @@ public class ActionImportFileUpload {
 				file.delete();
 			}
 			file.createNewFile();
+		
+			
 			try {
 				output = new FileOutputStream(importFilePath + importFileName);
+				//output = new FileOutputStream(file);
 				output.write( content );
 				output.flush();
 			} catch (Exception e) {

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionListMyMobileRecordToday.java

@@ -127,7 +127,7 @@ public class ActionListMyMobileRecordToday extends BaseAction {
 							//2-三次打卡（上午上班，下午下班加中午一次共三次）
 							WoSignFeature scheduleInfo3 = new WoSignFeature();
 							scheduleInfo3.setSignSeq(3);
-							scheduleInfo3.setCheckinType( AttendanceDetailMobile.CHECKIN_TYPE_AFTERNOON_ONDUTY );
+							scheduleInfo3.setCheckinType( AttendanceDetailMobile.CHECKIN_TYPE_AFTERNOON );
 							scheduleInfo3.setSignTime(scheduleSetting.getMiddayRestEndTime());
 							scheduleInfo3.setSignDate( signDate );
 							scheduleInfos.add(scheduleInfo3);

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionReciveAttendanceMobile.java

@@ -165,7 +165,8 @@ public class ActionReciveAttendanceMobile extends BaseAction {
 				woSignFeature.setSignDate( signDate );
 			}
 
-			attendanceDetailMobile.setCheckin_type( woSignFeature.getCheckinType() );
+			//attendanceDetailMobile.setCheckin_type( woSignFeature.getCheckinType() );
+			attendanceDetailMobile.setCheckin_type(wrapIn.getCheckin_type());
 			if( StringUtils.isEmpty( wrapIn.getSignDescription() )){
 				attendanceDetailMobile.setSignDescription( woSignFeature.getCheckinType() );
 			}else{
@@ -209,7 +210,7 @@ public class ActionReciveAttendanceMobile extends BaseAction {
 //		@FieldDescribe( "打卡记录日期字符串：yyyy-mm-dd, 必须填写." )
 		private String recordDateString;
 
-//		@FieldDescribe("打卡类型。字符串，目前有：上午上班打卡，上午下班打卡，下午上班打卡，下午下班打卡，外出打卡，午间打卡")
+		@FieldDescribe("打卡类型。字符串，目前有：上午上班打卡，上午下班打卡，下午上班打卡，下午下班打卡，外出打卡，午间打卡")
 		private String checkin_type;
 
 		@FieldDescribe("打卡时间，可以为空，为空则取服务器当前时间。Unix时间戳")