修复移动打卡类型问题

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

@@ -111,31 +111,24 @@ public class ActionImportFileUpload {
 		// 将文件到应用服务器形成本地文件
 		String importFilePath = "./servers/applicationServer/work/x_attendance_assemble_control/temp/";
 		String importFileName = "import_" + ( new Date() ).getTime() + "_" + fileName;
-		FileOutputStream output = null;
+		OutputStream output = null;
 		try {
-			System.out.println("aaaaaaaaaaaaaaaaaaaa---0");
 			File dir = new File( importFilePath );
-			System.out.println("aaaaaaaaaaaaaaaaaaaa---1");
 			if ( !dir.exists() ) {
 				dir.mkdir();
 			}
-			System.out.println("aaaaaaaaaaaaaaaaaaaa---2");
 			File file = new File(importFilePath + importFileName);
-			System.out.println("aaaaaaaaaaaaaaaaaaaa---3");
 			if (file.exists()) {
 				file.delete();
 			}
 			file.createNewFile();
-			if(file.exists()){
-				System.out.println("aaaaaaaaaaaaaaaaaaaa---4");
-			}
+		
 			
 			try {
 				output = new FileOutputStream(importFilePath + importFileName);
-				System.out.println("aaaaaaaaaaaaaaaaaaaa---5");
+				//output = new FileOutputStream(file);
 				output.write( content );
 				output.flush();
-				System.out.println("aaaaaaaaaaaaaaaaaaaa---6");
 			} catch (Exception e) {
 				logger.warn( "将文件写入到本地文件时发生异常.ID:" + id + ", FileName:" + fileName );
 				logger.error( e );

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时间戳")