导入文档处理

.idea/workspace.xml

@@ -2,11 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="981dbcd1-a700-4015-8567-2ccff8e76f0a" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/classes/" />
@@ -25,7 +21,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="403">
+            <state relative-caret-position="131">
               <caret line="196" column="56" selection-start-line="196" selection-start-column="50" selection-end-line="196" selection-end-column="56" />
             </state>
           </provider>
@@ -49,8 +45,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-3293">
-              <caret line="678" column="51" selection-start-line="678" selection-start-column="51" selection-end-line="678" selection-end-column="51" />
+            <state relative-caret-position="127">
+              <caret line="709" column="40" lean-forward="true" selection-start-line="709" selection-start-column="40" selection-end-line="709" selection-end-column="40" />
             </state>
           </provider>
         </entry>
@@ -68,7 +64,7 @@
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/WechatScanLoginController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="200">
-              <caret line="644" column="9" lean-forward="true" selection-start-line="641" selection-start-column="8" selection-end-line="644" selection-end-column="9" />
+              <caret line="644" column="9" selection-start-line="641" selection-start-column="8" selection-end-line="644" selection-end-column="9" />
             </state>
           </provider>
         </entry>
@@ -119,7 +115,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>childDepartmentIds</find>
       <find>open</find>
       <find>foreach</find>
       <find>AttendanceRuleListEventByClazzResult</find>
@@ -146,8 +141,9 @@
       <find>importExcelUpdateUsers</find>
       <find>queryPhoneBook</find>
       <find>Objects</find>
-      <find>导出</find>
       <find>user</find>
+      <find>importSmartScoreExcel</find>
+      <find>导出</find>
       <find>queryClassUser</find>
     </findStrings>
     <replaceStrings>
@@ -409,18 +405,18 @@
       <workItem from="1712903309092" duration="92665000" />
       <workItem from="1713507889834" duration="7494000" />
       <workItem from="1713599046631" duration="2336000" />
-      <workItem from="1713744476558" duration="14913000" />
+      <workItem from="1713744476558" duration="17722000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="117408000" />
+    <option name="totallyTimeSpent" value="120217000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
+    <frame x="-7" y="0" width="958" height="1039" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.10181237" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21269488" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="JRebel" order="3" side_tool="true" />
@@ -431,8 +427,8 @@
       <window_info id="Web" order="8" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32932165" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.43982494" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.44420132" />
+      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.44309393" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.44310722" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -449,7 +445,7 @@
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.24945295" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Maven" order="3" weight="0.84463894" />
+      <window_info anchor="right" id="Maven" order="3" weight="0.96659243" />
       <window_info anchor="right" id="Palette" order="4" />
       <window_info anchor="right" id="Capture Analysis" order="5" />
       <window_info anchor="right" id="Database" order="6" />
@@ -515,21 +511,21 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java</url>
-          <line>595</line>
+          <line>707</line>
           <properties />
-          <option name="timeStamp" value="119" />
+          <option name="timeStamp" value="123" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java</url>
-          <line>642</line>
+          <line>676</line>
           <properties />
-          <option name="timeStamp" value="120" />
+          <option name="timeStamp" value="124" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java</url>
-          <line>707</line>
+          <line>844</line>
           <properties />
-          <option name="timeStamp" value="123" />
+          <option name="timeStamp" value="125" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -880,17 +876,17 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/WechatScanLoginController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="403">
-          <caret line="196" column="56" selection-start-line="196" selection-start-column="50" selection-end-line="196" selection-end-column="56" />
+        <state relative-caret-position="200">
+          <caret line="644" column="9" selection-start-line="641" selection-start-column="8" selection-end-line="644" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/WechatScanLoginController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="200">
-          <caret line="644" column="9" lean-forward="true" selection-start-line="641" selection-start-column="8" selection-end-line="644" selection-end-column="9" />
+        <state relative-caret-position="131">
+          <caret line="196" column="56" selection-start-line="196" selection-start-column="50" selection-end-line="196" selection-end-column="56" />
         </state>
       </provider>
     </entry>
@@ -909,8 +905,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-3293">
-          <caret line="678" column="51" selection-start-line="678" selection-start-column="51" selection-end-line="678" selection-end-column="51" />
+        <state relative-caret-position="127">
+          <caret line="709" column="40" lean-forward="true" selection-start-line="709" selection-start-column="40" selection-end-line="709" selection-end-column="40" />
         </state>
       </provider>
     </entry>

src/main/java/com/template/controller/SmartScoreController.java

@@ -673,7 +673,7 @@ public class SmartScoreController implements SmartScoreControllerAPI {
 
         try {
             HSSFRow titleRow = sheetAt.getRow(1);
-            //sheetAt.getLastRowNum()：从0开始统计数量 所以得+1
+            //sheetAt.getLastRowNum():xls从1开始统计数量 所以得+1
             for (int rowNum = 1; rowNum < sheetAt.getLastRowNum() + 1; rowNum++) {
 
                 HSSFRow row = sheetAt.getRow(rowNum);
@@ -706,6 +706,11 @@ public class SmartScoreController implements SmartScoreControllerAPI {
                 } else if (rowNum > 2) {
 
                     String name = dataFormatter.formatCellValue(row.getCell(0));//姓名
+
+                    if(name.equals("")){
+                        continue;
+                    }
+
                     String cardNo = dataFormatter.formatCellValue(row.getCell(1));//学号
 
                     Optional<SmartUser> user = users.stream().filter(e -> e.getCardNo().equals(cardNo)).findFirst();
@@ -870,6 +875,10 @@ public class SmartScoreController implements SmartScoreControllerAPI {
                 } else if (rowNum > 2) {
 
                     String name = dataFormatter.formatCellValue(row.getCell(0));//姓名
+
+                    if(name.equals("")){
+                        continue;
+                    }
                     String cardNo = dataFormatter.formatCellValue(row.getCell(1));//学号
 
                     Optional<SmartUser> user = users.stream().filter(e -> e.getCardNo().equals(cardNo)).findFirst();