|
|
@@ -2,14 +2,12 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="981dbcd1-a700-4015-8567-2ccff8e76f0a" name="Default Changelist" comment="">
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/request/setUserTimeGroupRequest.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/ClassUserDetailVo.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/ClassUserVo.java" afterDir="false" />
|
|
|
<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$/src/main/java/com/template/model/vo/TimeGroupVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/TimeGroupVo.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.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/" />
|
|
|
<ignored path="$PROJECT_DIR$/target/" />
|
|
|
@@ -27,17 +25,17 @@
|
|
|
<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="1075">
|
|
|
- <caret line="204" column="68" lean-forward="true" selection-start-line="204" selection-start-column="68" selection-end-line="204" selection-end-column="68" />
|
|
|
+ <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>
|
|
|
</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/SmartUserController.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="127">
|
|
|
- <caret line="4211" column="13" lean-forward="true" selection-start-line="4211" selection-start-column="13" selection-end-line="4211" selection-end-column="13" />
|
|
|
+ <caret line="4208" column="75" selection-start-line="4208" selection-start-column="75" selection-end-line="4208" selection-end-column="75" />
|
|
|
<folding>
|
|
|
<element signature="imports" expanded="true" />
|
|
|
<element signature="e#3847#4719#0" />
|
|
|
@@ -48,6 +46,42 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
+ <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>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/WechatScanLoginControllerAPI.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="207">
|
|
|
+ <caret line="99" column="30" selection-start-line="99" selection-start-column="30" selection-end-line="99" selection-end-column="30" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
+ <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" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/phoneBook/GradeBook.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="253">
|
|
|
+ <caret line="16" column="21" selection-start-line="16" selection-start-column="21" selection-end-line="16" selection-end-column="21" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
@@ -85,9 +119,6 @@
|
|
|
</component>
|
|
|
<component name="FindInProjectRecents">
|
|
|
<findStrings>
|
|
|
- <find>auth</find>
|
|
|
- <find>querySmartUserPages</find>
|
|
|
- <find>page</find>
|
|
|
<find>childDepartmentIds</find>
|
|
|
<find>open</find>
|
|
|
<find>foreach</find>
|
|
|
@@ -112,9 +143,12 @@
|
|
|
<find>分页</find>
|
|
|
<find>queryPageSmartUser</find>
|
|
|
<find>QueryParentDepartments</find>
|
|
|
- <find>queryClassUser</find>
|
|
|
<find>importExcelUpdateUsers</find>
|
|
|
+ <find>queryPhoneBook</find>
|
|
|
+ <find>Objects</find>
|
|
|
<find>导出</find>
|
|
|
+ <find>user</find>
|
|
|
+ <find>queryClassUser</find>
|
|
|
</findStrings>
|
|
|
<replaceStrings>
|
|
|
<replace />
|
|
|
@@ -162,9 +196,10 @@
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/ClassUserDetailVo.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/ClassUserVo.java" />
|
|
|
+ <option value="$PROJECT_DIR$/src/main/java/com/template/model/request/setUserTimeGroupRequest.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" />
|
|
|
- <option value="$PROJECT_DIR$/src/main/java/com/template/model/request/setUserTimeGroupRequest.java" />
|
|
|
+ <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
|
@@ -198,7 +233,7 @@
|
|
|
</component>
|
|
|
<component name="ProjectFrameBounds">
|
|
|
<option name="x" value="-7" />
|
|
|
- <option name="width" value="974" />
|
|
|
+ <option name="width" value="958" />
|
|
|
<option name="height" value="1039" />
|
|
|
</component>
|
|
|
<component name="ProjectView">
|
|
|
@@ -256,6 +291,15 @@
|
|
|
<item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="java" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="template" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="controller" type="462c0819:PsiDirectoryNode" />
|
|
|
+ </path>
|
|
|
+ <path>
|
|
|
+ <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="backend_code" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="java" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="template" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="model" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
@@ -365,18 +409,18 @@
|
|
|
<workItem from="1712903309092" duration="92665000" />
|
|
|
<workItem from="1713507889834" duration="7494000" />
|
|
|
<workItem from="1713599046631" duration="2336000" />
|
|
|
- <workItem from="1713744476558" duration="13612000" />
|
|
|
+ <workItem from="1713744476558" duration="14913000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="116107000" />
|
|
|
+ <option name="totallyTimeSpent" value="117408000" />
|
|
|
</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 content_ui="combo" id="Project" order="0" weight="0.20948827" />
|
|
|
+ <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.10181237" />
|
|
|
<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" />
|
|
|
@@ -387,8 +431,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.4452954" />
|
|
|
- <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.45966852" />
|
|
|
+ <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="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" />
|
|
|
@@ -469,6 +513,24 @@
|
|
|
<properties />
|
|
|
<option name="timeStamp" value="117" />
|
|
|
</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>
|
|
|
+ <properties />
|
|
|
+ <option name="timeStamp" value="119" />
|
|
|
+ </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>
|
|
|
+ <properties />
|
|
|
+ <option name="timeStamp" value="120" />
|
|
|
+ </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>
|
|
|
+ <properties />
|
|
|
+ <option name="timeStamp" value="123" />
|
|
|
+ </line-breakpoint>
|
|
|
</breakpoints>
|
|
|
</breakpoint-manager>
|
|
|
</component>
|
|
|
@@ -477,66 +539,6 @@
|
|
|
<option name="FILTER_TARGETS" value="false" />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/UserVo.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="152">
|
|
|
- <caret line="113" column="19" selection-start-line="113" selection-start-column="19" selection-end-line="113" selection-end-column="19" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/seewoBatchStudentVo.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="414">
|
|
|
- <caret line="18" column="71" selection-start-line="18" selection-start-column="12" selection-end-line="18" selection-end-column="71" />
|
|
|
- <folding>
|
|
|
- <element signature="imports" expanded="true" />
|
|
|
- </folding>
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/seewo/StudentServiceBatchSaveClassStudentsResult.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="310">
|
|
|
- <caret line="87" column="34" selection-start-line="87" selection-start-column="23" selection-end-line="87" selection-end-column="34" />
|
|
|
- <folding>
|
|
|
- <element signature="e#568#569#0" expanded="true" />
|
|
|
- <element signature="e#608#609#0" expanded="true" />
|
|
|
- <element signature="e#1360#1361#0" expanded="true" />
|
|
|
- <element signature="e#1400#1401#0" expanded="true" />
|
|
|
- <element signature="e#3021#3022#0" expanded="true" />
|
|
|
- <element signature="e#3063#3064#0" expanded="true" />
|
|
|
- </folding>
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/seewo/ParentServiceRemoveStudentParentConditionRequest.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="295">
|
|
|
- <caret line="15" column="11" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="11" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/useridsRequest.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="184">
|
|
|
- <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="269">
|
|
|
- <caret line="164" column="32" selection-start-line="164" selection-start-column="16" selection-end-line="164" selection-end-column="32" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/seewo/PhotoServiceSavePhotosResult.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-809">
|
|
|
- <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="222">
|
|
|
@@ -843,17 +845,59 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/WechatScanLoginControllerAPI.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="207">
|
|
|
+ <caret line="99" column="30" selection-start-line="99" selection-start-column="30" selection-end-line="99" selection-end-column="30" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/phoneBook/BookUser.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="184">
|
|
|
+ <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/phoneBook/ClassBook.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="253">
|
|
|
+ <caret line="17" column="20" lean-forward="true" selection-start-line="17" selection-start-column="20" selection-end-line="17" selection-end-column="20" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/phoneBook/GradeBook.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="253">
|
|
|
+ <caret line="16" column="21" selection-start-line="16" selection-start-column="21" selection-end-line="16" selection-end-column="21" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="jar://C:/Program Files/Java/jdk1.8.0_181/src.zip!/java/util/Objects.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="295">
|
|
|
+ <caret line="37" column="19" selection-start-line="37" selection-start-column="19" selection-end-line="37" selection-end-column="19" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
<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="1075">
|
|
|
- <caret line="204" column="68" lean-forward="true" selection-start-line="204" selection-start-column="68" selection-end-line="204" selection-end-column="68" />
|
|
|
+ <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>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <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" />
|
|
|
</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="127">
|
|
|
- <caret line="4211" column="13" lean-forward="true" selection-start-line="4211" selection-start-column="13" selection-end-line="4211" selection-end-column="13" />
|
|
|
+ <caret line="4208" column="75" selection-start-line="4208" selection-start-column="75" selection-end-line="4208" selection-end-column="75" />
|
|
|
<folding>
|
|
|
<element signature="imports" expanded="true" />
|
|
|
<element signature="e#3847#4719#0" />
|
|
|
@@ -863,6 +907,13 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</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>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
</component>
|
|
|
<component name="masterDetails">
|
|
|
<states>
|