家长功能

.idea/workspace.xml

@@ -3,9 +3,6 @@
   <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/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/request/insertSmartUserRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/request/insertSmartUserRequest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/SmartFamilyIndexService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/SmartFamilyIndexService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartFamilyIndexServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartFamilyIndexServiceImpl.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" />
     </list>
     <ignored path="$PROJECT_DIR$/classes/" />
@@ -36,8 +33,8 @@
       <file pinned="false" current-in-tab="true">
         <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="15">
-              <caret line="3198" column="119" selection-start-line="3198" selection-start-column="119" selection-end-line="3198" selection-end-column="119" />
+            <state relative-caret-position="200">
+              <caret line="3932" lean-forward="true" selection-start-line="3932" selection-end-line="3932" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -85,7 +82,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>insertOrUpdateStudentParent</find>
       <find>百胜删除</find>
       <find>delete</find>
       <find>bindStudent</find>
@@ -104,7 +100,6 @@
       <find>queryUsersByClass</find>
       <find>isEm</find>
       <find>importExcelUsers</find>
-      <find>deleteOldStudentParentShip</find>
       <find>删除</find>
       <find>family</find>
       <find>queryClassUser</find>
@@ -115,6 +110,8 @@
       <find>updateSmartUserById</find>
       <find>insertSmartUser</find>
       <find>deleteSmartUserById</find>
+      <find>ParentServiceRemoveStudentParentConditionParam</find>
+      <find>deleteOldStudentParentShip</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -208,7 +205,7 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
+  <component name="ProjectFrameBounds">
     <option name="x" value="-7" />
     <option name="width" value="958" />
     <option name="height" value="1039" />
@@ -420,18 +417,18 @@
       <workItem from="1712903309092" duration="92665000" />
       <workItem from="1713507889834" duration="7494000" />
       <workItem from="1713599046631" duration="2336000" />
-      <workItem from="1713744476558" duration="50874000" />
+      <workItem from="1713744476558" duration="51491000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="153369000" />
+    <option name="totallyTimeSpent" value="153986000" />
   </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" weight="0.43541202" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.43541202" />
       <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" />
@@ -442,8 +439,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.44640884" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.7844639" />
+      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.45082873" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.78895026" />
       <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" />
@@ -460,7 +457,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.74610245" />
+      <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" />
@@ -574,9 +571,9 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>3222</line>
+          <line>3223</line>
           <properties />
-          <option name="timeStamp" value="172" />
+          <option name="timeStamp" value="173" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -942,8 +939,8 @@
     </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="15">
-          <caret line="3198" column="119" selection-start-line="3198" selection-start-column="119" selection-end-line="3198" selection-end-column="119" />
+        <state relative-caret-position="200">
+          <caret line="3932" lean-forward="true" selection-start-line="3932" selection-end-line="3932" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>

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

@@ -3160,7 +3160,7 @@ public class SmartUserController implements SmartUserControllerAPI {
         ParentServiceRemoveStudentParentConditionParam.ThirdRemoveStudentParentQuery deleteOldFamilyquery = ParentServiceRemoveStudentParentConditionParam.ThirdRemoveStudentParentQuery.builder()
                 .appId(seewoConfig.getAppId())
                 .schoolUid(seewoConfig.getSchoolId())
-                .studentCodes(java.util.Collections.singletonList(cardNo))
+                //.studentCodes(java.util.Collections.singletonList(cardNo))//传卡号会把该学生的家长都删掉
                 .parentPhones(phones)
                 .build();
         deleteOldFamilyRequestBody.setQuery(deleteOldFamilyquery);
@@ -3209,7 +3209,7 @@ public class SmartUserController implements SmartUserControllerAPI {
         ParentServiceRemoveStudentParentConditionParam.ThirdRemoveStudentParentQuery deleteOldFamilyquery = ParentServiceRemoveStudentParentConditionParam.ThirdRemoveStudentParentQuery.builder()
                 .appId(seewoConfig.getAppId())
                 .schoolUid(seewoConfig.getSchoolId())
-                .studentCodes(studentDatas.stream().map(SmartUser::getCardNo).collect(Collectors.toList()))
+                //.studentCodes(studentDatas.stream().map(SmartUser::getCardNo).collect(Collectors.toList()))//不能传卡号 传了卡号会把该学生的家长都删掉
                 .parentPhones(java.util.Collections.singletonList(phone))
                 .build();
         deleteOldFamilyRequestBody.setQuery(deleteOldFamilyquery);