夏文涛 2 лет назад
Родитель
Сommit
8c0cf182b7
2 измененных файлов с 53 добавлено и 44 удалено
  1. 51 44
      .idea/workspace.xml
  2. 2 0
      src/main/java/com/template/services/SmartUserService.java

+ 51 - 44
.idea/workspace.xml

@@ -5,9 +5,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="36922be1-416a-4a25-9739-9814e01883a6" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/common/utils/SendSms.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/SendSms.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/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/services/SmartUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <ignored path="$PROJECT_DIR$/classes/" />
@@ -22,11 +20,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <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="169">
-              <caret line="458" column="19" selection-start-line="458" selection-start-column="19" selection-end-line="458" selection-end-column="19" />
+            <state relative-caret-position="928">
+              <caret line="458" column="19" lean-forward="true" selection-start-line="458" selection-start-column="19" selection-end-line="458" selection-end-column="19" />
               <folding>
                 <element signature="method#logoffAccount#0;class#SmartUserController#0" />
                 <element signature="method#changeDepartment#0;class#SmartUserController#0" />
@@ -68,11 +66,15 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="562">
-              <caret line="219" column="50" selection-start-line="219" selection-start-column="27" selection-end-line="219" selection-end-column="50" />
+            <state relative-caret-position="355">
+              <caret line="239" column="72" selection-start-line="239" selection-start-column="11" selection-end-line="239" selection-end-column="72" />
+              <folding>
+                <element signature="e#6201#6202#0" expanded="true" />
+                <element signature="e#6260#6261#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -80,8 +82,8 @@
       <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">
-            <state relative-caret-position="709">
-              <caret line="73" column="43" selection-start-line="73" selection-start-column="20" selection-end-line="73" selection-end-column="43" />
+            <state relative-caret-position="426">
+              <caret line="86" column="66" selection-start-line="86" selection-start-column="66" selection-end-line="86" selection-end-column="66" />
             </state>
           </provider>
         </entry>
@@ -117,8 +119,8 @@
       <find>insert</find>
       <find>readXlsx</find>
       <find>code</find>
-      <find>studentParents</find>
       <find>templateId</find>
+      <find>studentParents</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -139,9 +141,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eTimeGroup.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartUser.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/common/utils/SendSms.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java" />
       </list>
     </option>
   </component>
@@ -175,10 +177,11 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-7" />
-    <option name="width" value="974" />
-    <option name="height" value="1039" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1936" />
+    <option name="height" value="1048" />
   </component>
   <component name="ProjectId" id="2bUCcpLSt0RtgnSW1oHNqhKVmxW" />
   <component name="ProjectView">
@@ -373,15 +376,15 @@
       <workItem from="1706250887209" duration="5674000" />
       <workItem from="1706260354151" duration="17000" />
       <workItem from="1706260659198" duration="1213000" />
-      <workItem from="1706508631918" duration="21386000" />
+      <workItem from="1706508631918" duration="21441000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="35800000" />
+    <option name="totallyTimeSpent" value="35855000" />
   </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.37199125" />
@@ -395,7 +398,7 @@
       <window_info id="Image Layers" order="8" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.3281768" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.3249453" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.3916849" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -681,13 +684,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="709">
-          <caret line="73" column="43" selection-start-line="73" selection-start-column="20" selection-end-line="73" selection-end-column="43" />
-        </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="295">
@@ -695,20 +691,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="562">
-          <caret line="219" column="50" selection-start-line="219" selection-start-column="27" selection-end-line="219" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmsCodeController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="322">
-          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$MAVEN_REPOSITORY$/com/tencentcloudapi/tencentcloud-sdk-java/3.1.742/tencentcloud-sdk-java-3.1.742.jar!/com/tencentcloudapi/sms/v20210111/SmsClient.class">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="295">
@@ -723,10 +705,17 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmsCodeController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="322">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </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="169">
-          <caret line="458" column="19" selection-start-line="458" selection-start-column="19" selection-end-line="458" selection-end-column="19" />
+        <state relative-caret-position="928">
+          <caret line="458" column="19" lean-forward="true" selection-start-line="458" selection-start-column="19" selection-end-line="458" selection-end-column="19" />
           <folding>
             <element signature="method#logoffAccount#0;class#SmartUserController#0" />
             <element signature="method#changeDepartment#0;class#SmartUserController#0" />
@@ -740,6 +729,24 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="426">
+          <caret line="86" column="66" selection-start-line="86" selection-start-column="66" selection-end-line="86" selection-end-column="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="355">
+          <caret line="239" column="72" selection-start-line="239" selection-start-column="11" selection-end-line="239" selection-end-column="72" />
+          <folding>
+            <element signature="e#6201#6202#0" expanded="true" />
+            <element signature="e#6260#6261#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

+ 2 - 0
src/main/java/com/template/services/SmartUserService.java

@@ -83,4 +83,6 @@ public interface SmartUserService extends IService<SmartUser> {
      * @return
      */
     List<SmartUser> getAffiliateList(Integer id);
+
+    List<SmartUser> querySmartUserByCardNos(List<String> cardNos);
 }