Browse Source

添加错误信息提示

夏文涛 3 years atrás
parent
commit
91daf786c6

+ 0 - 1
src/main/java/com/chuanghai/attendance/service/impl/MonthlySummaryServiceImpl.java

@@ -277,7 +277,6 @@ public class MonthlySummaryServiceImpl extends ServiceImpl<MonthlySummaryDao, Mo
         List<String> workNums = monthlySummaryList.stream().map(MonthlySummary::getWorkNum).collect(Collectors.toList());
         List<OriginalData> allOriginalDataList = originalDataService.queryByUserId(userIds, workNums);
         List<WorkerIdentity> allWorkIdentityList = workerIdentityService.queryByuserIds(userIds, workNums);
-        monthlySummaryList = monthlySummaryList.stream().filter(x -> x.getWorkName().equals("王爱琴")).collect(Collectors.toList());
         for (MonthlySummary monthlySummary : monthlySummaryList) {
 
             MonthlyDto monthlyDto = new MonthlyDto();

+ 3 - 0
src/main/java/com/chuanghai/attendance/utils/excel/FileTools.java

@@ -195,6 +195,9 @@ public class FileTools {
 				return CommonResult.fail("-1","本系统只支持xlsx格式文件");
 			}
 		}
+		else{
+			return CommonResult.fail("-1","缺少需要导入的文件");
+		}
 		return CommonResult.ok();
 	}
 }

+ 1 - 1
src/main/resources/application.yml

@@ -6,7 +6,7 @@ server:
 # 数据源
 spring:
   profiles:
-    active: dev
+    active: prod
   application:
     name: attendance
   main:

File diff suppressed because it is too large
+ 121 - 121
src/main/resources/static/doc/index.html


BIN
target/attendance-0.0.1-SNAPSHOT.jar.original


+ 1 - 1
target/classes/application.yml

@@ -6,7 +6,7 @@ server:
 # 数据源
 spring:
   profiles:
-    active: dev
+    active: prod
   application:
     name: attendance
   main:

File diff suppressed because it is too large
+ 121 - 121
target/classes/static/doc/index.html


File diff suppressed because it is too large
+ 4 - 4
target/surefire-reports/TEST-com.chuanghai.attendance.AttendanceApplicationTests.xml


+ 1 - 1
target/surefire-reports/com.chuanghai.attendance.AttendanceApplicationTests.txt

@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: com.chuanghai.attendance.AttendanceApplicationTests
 -------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.115 s - in com.chuanghai.attendance.AttendanceApplicationTests
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.02 s - in com.chuanghai.attendance.AttendanceApplicationTests