模板写入顺序

src/main/java/com/chuanghai/attendance/controller/MonthlySummaryController.java

@@ -20,6 +20,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 月度汇总
@@ -119,6 +120,7 @@ public class MonthlySummaryController {
     public CommonResult<List<DownLoadExcel>> downLoad() {
         List<MonthlyDto> MonthlyDtoList = monthlySummaryService.analyse();
         List<MonthlySummary> monthlySummaryList = monthlySummaryService.queryAll();
+        monthlySummaryList = monthlySummaryList.stream().filter(x -> x.getWorkName().equals("王爱琴")).collect(Collectors.toList());
         List<DayDetails> dayDetailsList = dayDetailsService.list();
         List<DownLoadExcel> downLoadExcelList = new ArrayList<>();
 

src/main/java/com/chuanghai/attendance/service/impl/MonthlySummaryServiceImpl.java

@@ -139,14 +139,14 @@ public class MonthlySummaryServiceImpl extends ServiceImpl<MonthlySummaryDao, Mo
                     monthlySummary.setLackOfWorkCardTimes(strings[15]);
                     monthlySummary.setLackOfMissingWorkCardTimes(strings[16]);
                     monthlySummary.setAbsenteeismDay(strings[17]);
-                    monthlySummary.setEvectionDay(strings[18]);
-                    monthlySummary.setGoOutDay(strings[19]);
-                    monthlySummary.setPrivateAffairLeaveDay(strings[20]);
-                    monthlySummary.setMaternityLeaveDay(strings[21]);
-                    monthlySummary.setMarriageLeaveDay(strings[22]);
-                    monthlySummary.setEscortFalse(strings[23]);
-                    monthlySummary.setSickLeaveDay(strings[24]);
-                    monthlySummary.setBereavementLeave(strings[25]);
+                    monthlySummary.setEvectionDay(strings[18]);//出差
+                    monthlySummary.setGoOutDay(strings[19]);//外出
+                    monthlySummary.setPrivateAffairLeaveDay(strings[20]);//事假
+                    monthlySummary.setMaternityLeaveDay(strings[21]);//产假
+                    monthlySummary.setMarriageLeaveDay(strings[22]);//婚假
+                    monthlySummary.setEscortFalse(strings[23]);//陪护假
+                    monthlySummary.setSickLeaveDay(strings[24]);//病假
+                    monthlySummary.setBereavementLeave(strings[25]);//丧假
                     //封装钉钉考勤月度汇总
                     monthlySummaryList.add(monthlySummary);
 
@@ -275,6 +275,7 @@ 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();

src/main/resources/application.yml

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

target/classes/application.yml

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