瀏覽代碼

时间组

夏文涛 2 年之前
父節點
當前提交
996603d393
共有 2 個文件被更改,包括 60 次插入30 次删除
  1. 57 30
      .idea/workspace.xml
  2. 3 0
      src/main/java/com/template/model/pojo/SmartUser.java

+ 57 - 30
.idea/workspace.xml

@@ -5,8 +5,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="cb7b6a84-9179-4588-9374-31a70f785e65" name="Default Changelist" comment="">
-      <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/mybatis_plus-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartUser.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="SHOW_DIALOG" value="false" />
@@ -81,11 +80,34 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartApplyController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="312">
-              <caret line="90" column="13" lean-forward="true" selection-start-line="90" selection-start-column="13" selection-end-line="90" selection-end-column="13" />
+            <state relative-caret-position="197">
+              <caret line="85" column="24" lean-forward="true" selection-start-line="85" selection-start-column="24" selection-end-line="85" selection-end-column="24" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="189">
+              <caret line="826" column="17" selection-start-line="826" selection-start-column="17" selection-end-line="826" selection-end-column="17" />
+              <folding>
+                <element signature="method#importZipUsers#0;class#SmartUserController#0" />
+                <element signature="method#readXlsx#0;class#SmartUserController#0" />
+                <element signature="method#readXls#0;class#SmartUserController#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartUser.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="276">
+              <caret line="39" column="34" selection-start-line="39" selection-start-column="34" selection-end-line="39" selection-end-column="34" />
             </state>
           </provider>
         </entry>
@@ -164,7 +186,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/request/insertDutiesRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartDutiesServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartMenuServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartUser.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartDutiesController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartDutiesControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/seewo/TeacherServiceBatchSetClassMastersParam.java" />
@@ -204,6 +225,7 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartApply.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/QrcodeImageVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartQrcodeController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartUser.java" />
       </list>
     </option>
   </component>
@@ -234,8 +256,9 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-7" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
     <option name="width" value="974" />
     <option name="height" value="1039" />
   </component>
@@ -555,10 +578,10 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="412306000" />
+    <option name="totallyTimeSpent" value="412395000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-7" y="0" width="974" height="1039" extended-state="0" />
+    <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
     <editor active="true" />
     <layout>
       <window_info id="JRebel" order="0" side_tool="true" />
@@ -569,10 +592,10 @@
       <window_info id="Designer" order="5" />
       <window_info id="Web" order="6" side_tool="true" />
       <window_info id="Structure" order="7" side_tool="true" weight="0.25" />
-      <window_info content_ui="combo" id="Project" order="8" visible="true" weight="0.23632385" />
+      <window_info content_ui="combo" id="Project" order="8" visible="true" weight="0.11513859" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.31381217" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.31381217" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.5160221" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -581,7 +604,7 @@
       <window_info anchor="bottom" id="Terminal" order="8" />
       <window_info anchor="bottom" id="Docker" order="9" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
-      <window_info anchor="bottom" id="Messages" order="11" weight="0.4157549" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.41137856" />
       <window_info anchor="bottom" id="Java Enterprise" order="12" />
       <window_info anchor="bottom" id="Database Changes" order="13" />
       <window_info anchor="bottom" id="Version Control" order="14" />
@@ -727,9 +750,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartGradeMapper.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartScoreMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="437">
@@ -961,18 +981,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="85">
-          <caret line="1288" column="25" selection-start-line="1288" selection-start-column="25" selection-end-line="1288" selection-end-column="25" />
-          <folding>
-            <element signature="method#importZipUsers#0;class#SmartUserController#0" />
-            <element signature="method#readXlsx#0;class#SmartUserController#0" />
-            <element signature="method#readXls#0;class#SmartUserController#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="217">
@@ -1087,8 +1095,27 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartApplyController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="312">
-          <caret line="90" column="13" lean-forward="true" selection-start-line="90" selection-start-column="13" selection-end-line="90" selection-end-column="13" />
+        <state relative-caret-position="197">
+          <caret line="85" column="24" lean-forward="true" selection-start-line="85" selection-start-column="24" selection-end-line="85" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="189">
+          <caret line="826" column="17" selection-start-line="826" selection-start-column="17" selection-end-line="826" selection-end-column="17" />
+          <folding>
+            <element signature="method#importZipUsers#0;class#SmartUserController#0" />
+            <element signature="method#readXlsx#0;class#SmartUserController#0" />
+            <element signature="method#readXls#0;class#SmartUserController#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartUser.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="276">
+          <caret line="39" column="34" selection-start-line="39" selection-start-column="34" selection-end-line="39" selection-end-column="34" />
         </state>
       </provider>
     </entry>

+ 3 - 0
src/main/java/com/template/model/pojo/SmartUser.java

@@ -37,6 +37,9 @@ public class SmartUser implements Serializable {
     @ApiModelProperty(value = "编号(学号)")
     private String cardNo;
 
+    @ApiModelProperty(value = "时间组")
+    private Integer timeGroupId;
+
     @ApiModelProperty(value = "姓名")
     private String name;