Jelajahi Sumber

考勤导入文件本地存储问题修复

luojing 5 tahun lalu
induk
melakukan
edfe7e0044

+ 11 - 1
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attachment/ActionImportFileUpload.java

@@ -111,21 +111,31 @@ public class ActionImportFileUpload {
 		// 将文件到应用服务器形成本地文件
 		String importFilePath = "./servers/applicationServer/work/x_attendance_assemble_control/temp/";
 		String importFileName = "import_" + ( new Date() ).getTime() + "_" + fileName;
-		OutputStream output = null;
+		FileOutputStream 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.write( content );
 				output.flush();
+				System.out.println("aaaaaaaaaaaaaaaaaaaa---6");
 			} catch (Exception e) {
 				logger.warn( "将文件写入到本地文件时发生异常.ID:" + id + ", FileName:" + fileName );
 				logger.error( e );

+ 1 - 1
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);