Bladeren bron

1、修改月度汇总导出模板

Bingo 3 jaren geleden
bovenliggende
commit
3a2c359257

+ 4 - 4
src/main/java/com/chuanghai/attendance/entity/MonthlySummary.java

@@ -95,10 +95,10 @@ public class MonthlySummary implements Serializable {
      * 旷工天数
      */
     private String absenteeismDay;
-//    /**
-//     * 出差(天)
-//     */
-//    private String evectionDay;
+    /**
+     * 出差(天)
+     */
+    private String evectionDay;
     /**
      * 外出(天)
      */

+ 71 - 70
src/main/java/com/chuanghai/attendance/service/impl/MonthlySummaryServiceImpl.java

@@ -67,7 +67,7 @@ public class MonthlySummaryServiceImpl extends ServiceImpl<MonthlySummaryDao, Mo
         Boolean mBoolean = removeMonthlySummary();
         Boolean statu = Boolean.FALSE;
         if (aBoolean && mBoolean) {
-            List<String[]> list = ExcelImportXLSXUtil.readerExcel(file.getInputStream(), "月度汇总", 55);
+            List<String[]> list = ExcelImportXLSXUtil.readerExcel(file.getInputStream(), "月度汇总", 59);
             int count = 0;
             for (String[] strings : list) {
                 count++;
@@ -77,37 +77,38 @@ public class MonthlySummaryServiceImpl extends ServiceImpl<MonthlySummaryDao, Mo
                     if (count == 3) {
                         dayDetails.setUserId("title");
                         dayDetails.setWorkName("title");
-                        dayDetails.setOneOfMonth(strings[24]);
-                        dayDetails.setTwoOfMonth(strings[25]);
-                        dayDetails.setThreeOfMonth(strings[26]);
-                        dayDetails.setFourOfMonth(strings[27]);
-                        dayDetails.setFiveOfMonth(strings[28]);
-                        dayDetails.setSixOfMonth(strings[29]);
-                        dayDetails.setSevenOfMonth(strings[30]);
-                        dayDetails.setEightOfMonth(strings[31]);
-                        dayDetails.setNineOfMonth(strings[32]);
-                        dayDetails.setTenOfMonth(strings[33]);
-                        dayDetails.setElevenOfMonth(strings[34]);
-                        dayDetails.setTwelveOfMonth(strings[35]);
-                        dayDetails.setThirteenOfMonth(strings[36]);
-                        dayDetails.setFourteenOfMonth(strings[37]);
-                        dayDetails.setFifteenOfMonth(strings[38]);
-                        dayDetails.setSixteenOfMonth(strings[39]);
-                        dayDetails.setSeventeenOfMonth(strings[40]);
-                        dayDetails.setEighteenOfMonth(strings[41]);
-                        dayDetails.setNineteenOfMonth(strings[42]);
-                        dayDetails.setTwentyOfMonth(strings[43]);
-                        dayDetails.setTwentyOneOfMonth(strings[44]);
-                        dayDetails.setTwentyTwoOfMonth(strings[45]);
-                        dayDetails.setTwentyThreeOfMonth(strings[46]);
-                        dayDetails.setTwentyFourOfMonth(strings[47]);
-                        dayDetails.setTwentyFiveOfMonth(strings[48]);
-                        dayDetails.setTwentySixOfMonth(strings[49]);
-                        dayDetails.setTwentySevenOfMonth(strings[50]);
-                        dayDetails.setTwentyEightOfMonth(strings[51]);
-                        dayDetails.setTwentyNineOfMonth(strings[52]);
-                        dayDetails.setThirtyOfMonth(strings[53]);
-                        dayDetails.setThirtyOneOfMonth(strings[54]);
+
+                        dayDetails.setOneOfMonth(strings[25]);
+                        dayDetails.setTwoOfMonth(strings[26]);
+                        dayDetails.setThreeOfMonth(strings[27]);
+                        dayDetails.setFourOfMonth(strings[28]);
+                        dayDetails.setFiveOfMonth(strings[29]);
+                        dayDetails.setSixOfMonth(strings[30]);
+                        dayDetails.setSevenOfMonth(strings[31]);
+                        dayDetails.setEightOfMonth(strings[32]);
+                        dayDetails.setNineOfMonth(strings[33]);
+                        dayDetails.setTenOfMonth(strings[34]);
+                        dayDetails.setElevenOfMonth(strings[35]);
+                        dayDetails.setTwelveOfMonth(strings[36]);
+                        dayDetails.setThirteenOfMonth(strings[37]);
+                        dayDetails.setFourteenOfMonth(strings[38]);
+                        dayDetails.setFifteenOfMonth(strings[39]);
+                        dayDetails.setSixteenOfMonth(strings[40]);
+                        dayDetails.setSeventeenOfMonth(strings[41]);
+                        dayDetails.setEighteenOfMonth(strings[42]);
+                        dayDetails.setNineteenOfMonth(strings[43]);
+                        dayDetails.setTwentyOfMonth(strings[44]);
+                        dayDetails.setTwentyOneOfMonth(strings[45]);
+                        dayDetails.setTwentyTwoOfMonth(strings[46]);
+                        dayDetails.setTwentyThreeOfMonth(strings[47]);
+                        dayDetails.setTwentyFourOfMonth(strings[48]);
+                        dayDetails.setTwentyFiveOfMonth(strings[49]);
+                        dayDetails.setTwentySixOfMonth(strings[50]);
+                        dayDetails.setTwentySevenOfMonth(strings[51]);
+                        dayDetails.setTwentyEightOfMonth(strings[52]);
+                        dayDetails.setTwentyNineOfMonth(strings[53]);
+                        dayDetails.setThirtyOfMonth(strings[54]);
+                        dayDetails.setThirtyOneOfMonth(strings[55]);
                     } else {
                         continue;
                     }
@@ -131,50 +132,50 @@ 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[18]);
-                    monthlySummary.setBereavementLeave(strings[19]);
-                    monthlySummary.setPrivateAffairLeaveDay(strings[20]);
-                    monthlySummary.setMaternityLeaveDay(strings[21]);
-                    monthlySummary.setSickLeaveDay(strings[22]);
-                    monthlySummary.setEscortFalse(strings[23]);
+                    monthlySummary.setEvectionDay(strings[18]);
+                    monthlySummary.setGoOutDay(strings[19]);
+                    monthlySummary.setBereavementLeave(strings[20]);
+                    monthlySummary.setPrivateAffairLeaveDay(strings[21]);
+                    monthlySummary.setMaternityLeaveDay(strings[22]);
+                    monthlySummary.setSickLeaveDay(strings[23]);
+                    monthlySummary.setEscortFalse(strings[24]);
                     //封装钉钉考勤月度汇总
                     monthlySummaryList.add(monthlySummary);
 
                     //   DayDetails dayDetails = new DayDetails();
                     dayDetails.setUserId(strings[4]);
                     dayDetails.setWorkName(strings[0]);
-                    dayDetails.setOneOfMonth(strings[24]);
-                    dayDetails.setTwoOfMonth(strings[25]);
-                    dayDetails.setThreeOfMonth(strings[26]);
-                    dayDetails.setFourOfMonth(strings[27]);
-                    dayDetails.setFiveOfMonth(strings[28]);
-                    dayDetails.setSixOfMonth(strings[29]);
-                    dayDetails.setSevenOfMonth(strings[30]);
-                    dayDetails.setEightOfMonth(strings[31]);
-                    dayDetails.setNineOfMonth(strings[32]);
-                    dayDetails.setTenOfMonth(strings[33]);
-                    dayDetails.setElevenOfMonth(strings[34]);
-                    dayDetails.setTwelveOfMonth(strings[35]);
-                    dayDetails.setThirteenOfMonth(strings[36]);
-                    dayDetails.setFourteenOfMonth(strings[37]);
-                    dayDetails.setFifteenOfMonth(strings[38]);
-                    dayDetails.setSixteenOfMonth(strings[39]);
-                    dayDetails.setSeventeenOfMonth(strings[40]);
-                    dayDetails.setEighteenOfMonth(strings[41]);
-                    dayDetails.setNineteenOfMonth(strings[42]);
-                    dayDetails.setTwentyOfMonth(strings[43]);
-                    dayDetails.setTwentyOneOfMonth(strings[44]);
-                    dayDetails.setTwentyTwoOfMonth(strings[45]);
-                    dayDetails.setTwentyThreeOfMonth(strings[46]);
-                    dayDetails.setTwentyFourOfMonth(strings[47]);
-                    dayDetails.setTwentyFiveOfMonth(strings[48]);
-                    dayDetails.setTwentySixOfMonth(strings[49]);
-                    dayDetails.setTwentySevenOfMonth(strings[50]);
-                    dayDetails.setTwentyEightOfMonth(strings[51]);
-                    dayDetails.setTwentyNineOfMonth(strings[52]);
-                    dayDetails.setThirtyOfMonth(strings[53]);
-                    dayDetails.setThirtyOneOfMonth(strings[54]);
+                    dayDetails.setOneOfMonth(strings[25]);
+                    dayDetails.setTwoOfMonth(strings[26]);
+                    dayDetails.setThreeOfMonth(strings[27]);
+                    dayDetails.setFourOfMonth(strings[28]);
+                    dayDetails.setFiveOfMonth(strings[29]);
+                    dayDetails.setSixOfMonth(strings[30]);
+                    dayDetails.setSevenOfMonth(strings[31]);
+                    dayDetails.setEightOfMonth(strings[32]);
+                    dayDetails.setNineOfMonth(strings[33]);
+                    dayDetails.setTenOfMonth(strings[34]);
+                    dayDetails.setElevenOfMonth(strings[35]);
+                    dayDetails.setTwelveOfMonth(strings[36]);
+                    dayDetails.setThirteenOfMonth(strings[37]);
+                    dayDetails.setFourteenOfMonth(strings[38]);
+                    dayDetails.setFifteenOfMonth(strings[39]);
+                    dayDetails.setSixteenOfMonth(strings[40]);
+                    dayDetails.setSeventeenOfMonth(strings[41]);
+                    dayDetails.setEighteenOfMonth(strings[42]);
+                    dayDetails.setNineteenOfMonth(strings[43]);
+                    dayDetails.setTwentyOfMonth(strings[44]);
+                    dayDetails.setTwentyOneOfMonth(strings[45]);
+                    dayDetails.setTwentyTwoOfMonth(strings[46]);
+                    dayDetails.setTwentyThreeOfMonth(strings[47]);
+                    dayDetails.setTwentyFourOfMonth(strings[48]);
+                    dayDetails.setTwentyFiveOfMonth(strings[49]);
+                    dayDetails.setTwentySixOfMonth(strings[50]);
+                    dayDetails.setTwentySevenOfMonth(strings[51]);
+                    dayDetails.setTwentyEightOfMonth(strings[52]);
+                    dayDetails.setTwentyNineOfMonth(strings[53]);
+                    dayDetails.setThirtyOfMonth(strings[54]);
+                    dayDetails.setThirtyOneOfMonth(strings[55]);
                 }
 
                 //封装本月度每日的工作详情

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

@@ -12,10 +12,10 @@ spring:
   datasource:
     username: root
     driver-class-name: com.mysql.cj.jdbc.Driver
-#    password: root
-#    url: jdbc:mysql://127.0.0.1:3306/attendance?characterEncoding=utf-8&useSSL=FALSE&useAffectedRows=TRUE&allowMultiQueries=true&serverTimezone=GMT%2B8
-    password: Chuanghai_2022.
-    url: jdbc:mysql://172.16.20.66:3306/attendance?characterEncoding=utf-8&useSSL=FALSE&useAffectedRows=TRUE&allowMultiQueries=true&serverTimezone=GMT%2B8
+    password: root
+    url: jdbc:mysql://127.0.0.1:3306/attendance?characterEncoding=utf-8&useSSL=FALSE&useAffectedRows=TRUE&allowMultiQueries=true&serverTimezone=GMT%2B8
+#    password: Chuanghai_2022.
+#    url: jdbc:mysql://172.16.20.66:3306/attendance?characterEncoding=utf-8&useSSL=FALSE&useAffectedRows=TRUE&allowMultiQueries=true&serverTimezone=GMT%2B8
 
   #配置文件传输的大小
   servlet:

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