提交内容

.idea/workspace.xml

@@ -2,7 +2,6 @@
 <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/controller/SmartDepartmentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartDepartmentController.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" />
     </list>
@@ -23,8 +22,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartDepartmentController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="778">
-              <caret line="113" selection-start-line="113" selection-end-line="113" />
+            <state relative-caret-position="1233">
+              <caret line="240" column="43" selection-start-line="240" selection-start-column="24" selection-end-line="240" selection-end-column="43" />
             </state>
           </provider>
         </entry>
@@ -32,8 +31,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="5125">
-              <caret line="736" column="87" selection-start-line="736" selection-start-column="87" selection-end-line="736" selection-end-column="87" />
+            <state relative-caret-position="132">
+              <caret line="976" column="5" selection-start-line="976" selection-start-column="5" selection-end-line="976" selection-end-column="5" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -72,8 +71,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>&lt; 9</find>
-      <find>user.setGrade</find>
       <find>false</find>
       <find>classData</find>
       <find>currentYear</find>
@@ -100,8 +97,10 @@
       <find>deleteSmartUserById</find>
       <find>导出</find>
       <find>queryTimeGroupByName</find>
-      <find>导入</find>
       <find>queryTimeGroups</find>
+      <find>导入</find>
+      <find>希沃新增</find>
+      <find>queryDepartmentTree</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -162,7 +161,7 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds">
+  <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="-7" />
     <option name="width" value="974" />
     <option name="height" value="1039" />
@@ -356,15 +355,15 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1712903307839</updated>
-      <workItem from="1712903309092" duration="32760000" />
+      <workItem from="1712903309092" duration="34761000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="32760000" />
+    <option name="totallyTimeSpent" value="34761000" />
   </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" side_tool="true" />
@@ -374,7 +373,7 @@
       <window_info id="Favorites" side_tool="true" />
       <window_info id="Designer" />
       <window_info id="Web" side_tool="true" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1761488" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.0858209" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="bottom" id="Spring" weight="0.32932165" />
       <window_info anchor="bottom" id="Event Log" side_tool="true" />
@@ -388,12 +387,12 @@
       <window_info anchor="bottom" id="JRebel Console" 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" visible="true" weight="0.45524862" />
+      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.45076588" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.8293217" />
       <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" />
-      <window_info anchor="right" id="Maven" weight="0.3249453" />
+      <window_info anchor="right" id="Maven" weight="0.66630197" />
       <window_info anchor="right" id="Palette" />
       <window_info anchor="right" id="Capture Analysis" />
       <window_info anchor="right" id="Database" />
@@ -444,37 +443,31 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>1051</line>
+          <line>1044</line>
           <properties />
           <option name="timeStamp" value="14" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>962</line>
-          <properties />
-          <option name="timeStamp" value="27" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>696</line>
+          <line>693</line>
           <properties />
           <option name="timeStamp" value="28" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>2763</line>
+          <line>2756</line>
           <properties />
           <option name="timeStamp" value="29" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>2855</line>
+          <line>2848</line>
           <properties />
           <option name="timeStamp" value="31" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>675</line>
+          <line>669</line>
           <properties />
           <option name="timeStamp" value="32" />
         </line-breakpoint>
@@ -800,13 +793,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/seewo/StudentServiceBatchSaveClassStudentsParam.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="171">
-          <caret line="197" column="11" lean-forward="true" selection-start-line="197" selection-start-column="11" selection-end-line="197" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartAuthorGroupControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="440">
@@ -821,24 +807,31 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartDepartmentController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartTimeGroupServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="778">
-          <caret line="113" selection-start-line="113" selection-end-line="113" />
+        <state relative-caret-position="269">
+          <caret line="43" column="47" selection-start-line="43" selection-start-column="32" selection-end-line="43" selection-end-column="47" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartTimeGroupServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/seewo/StudentServiceBatchSaveClassStudentsParam.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="269">
-          <caret line="43" column="47" selection-start-line="43" selection-start-column="32" selection-end-line="43" selection-end-column="47" />
+        <state relative-caret-position="-36">
+          <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/controller/SmartDepartmentController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1233">
+          <caret line="240" column="43" selection-start-line="240" selection-start-column="24" selection-end-line="240" selection-end-column="43" />
         </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="5125">
-          <caret line="736" column="87" selection-start-line="736" selection-start-column="87" selection-end-line="736" selection-end-column="87" />
+        <state relative-caret-position="132">
+          <caret line="976" column="5" selection-start-line="976" selection-start-column="5" selection-end-line="976" selection-end-column="5" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>

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

@@ -568,9 +568,6 @@ public class SmartUserController implements SmartUserControllerAPI {
 
                         //手机号重复判断
                         String phone = dataFormatter.formatCellValue(row.getCell(10));
-                        if (ObjectUtils.isEmpty(phone)) {
-                            return CommonResult.fail(name + "家属的手机号不能为空");
-                        }
                         if (!ObjectUtils.isEmpty(phone)) {
                             phones.add(phone);
                         }
@@ -578,10 +575,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                             return CommonResult.fail("导入的Excel中，联系电话：" + phone + "存在重复数据");
                         }
 
-                        String family = dataFormatter.formatCellValue(row.getCell(11));//家属
-                        if (ObjectUtils.isEmpty(family)) {
-                            return CommonResult.fail(name + "的家属不能为空");
-                        }
+
 
                         //性别是否为空判断
                         String sex = dataFormatter.formatCellValue(row.getCell(4));
@@ -679,21 +673,24 @@ public class SmartUserController implements SmartUserControllerAPI {
                         result.add(user);
 
                         //region 家属
-                        SmartUser familyOne = new SmartUser();
-                        familyOne.setName(family);
-                        familyOne.setDepartmentId(1);
-                        familyOne.setPhone(phone);
-                        familyOne.setIdentityId(eIdentityStatu.Parent.getValue());
-                        familyOne.setSexId(eSexStatu.Man.getValue());
-                        familyOne.setIsCancel(eLogOff.Unlogout.getValue());
-                        familyOne.setAffiliate(user.getCardNo());
-                        String familyShip = dataFormatter.formatCellValue(row.getCell(12));//家属与本人关系
-                        familyOne.setShip(familyShip == null ? "" : familyShip);
-                        result.add(familyOne);
+                        String family = dataFormatter.formatCellValue(row.getCell(11));//家属
+                        if (!ObjectUtils.isEmpty(family)) {
+                            SmartUser familyOne = new SmartUser();
+                            familyOne.setName(family);
+                            familyOne.setDepartmentId(1);
+                            familyOne.setPhone(phone);
+                            familyOne.setIdentityId(eIdentityStatu.Parent.getValue());
+                            familyOne.setSexId(eSexStatu.Man.getValue());
+                            familyOne.setIsCancel(eLogOff.Unlogout.getValue());
+                            familyOne.setAffiliate(user.getCardNo());
+                            String familyShip = dataFormatter.formatCellValue(row.getCell(12));//家属与本人关系
+                            familyOne.setShip(familyShip == null ? "" : familyShip);
+                            result.add(familyOne);
+                        }
 
-                        SmartUser familyTwo = new SmartUser();
                         String familyNameTwo = dataFormatter.formatCellValue(row.getCell(14));//家属2
                         if (!ObjectUtils.isEmpty(familyNameTwo)) {
+                            SmartUser familyTwo = new SmartUser();
                             familyTwo.setName(familyNameTwo);
                             familyTwo.setDepartmentId(1);
                             String phoneTwo = dataFormatter.formatCellValue(row.getCell(13));//联系电话2
@@ -833,9 +830,6 @@ public class SmartUserController implements SmartUserControllerAPI {
 
                         //手机号重复判断
                         String phone = dataFormatter.formatCellValue(row.getCell(10));
-                        if (ObjectUtils.isEmpty(phone)) {
-                            return CommonResult.fail(name + "家属的手机号不能为空");
-                        }
                         if (!ObjectUtils.isEmpty(phone)) {
                             phones.add(phone);
                         }
@@ -843,10 +837,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                             return CommonResult.fail("导入的Excel中，联系电话：" + phone + "存在重复数据");
                         }
 
-                        String family = dataFormatter.formatCellValue(row.getCell(11));//家属
-                        if (ObjectUtils.isEmpty(family)) {
-                            return CommonResult.fail(name + "的家属不能为空");
-                        }
+
 
                         //性别是否为空判断
                         String sex = dataFormatter.formatCellValue(row.getCell(4));
@@ -931,7 +922,6 @@ public class SmartUserController implements SmartUserControllerAPI {
                         user.setOfStudent("");
                         user.setGraduate("");
                         user.setDuties(null);
-
                         String timeGroup = dataFormatter.formatCellValue(row.getCell(8));
                         Optional<SmartTimeGroup> groupData = timeGroups.stream().filter(e -> e.getName().equals(timeGroup)).findFirst();
                         if (groupData != null && groupData.isPresent()) {
@@ -945,21 +935,24 @@ public class SmartUserController implements SmartUserControllerAPI {
                         result.add(user);
 
                         //region 家属
-                        SmartUser familyOne = new SmartUser();
-                        familyOne.setName(family);
-                        familyOne.setDepartmentId(1);
-                        familyOne.setPhone(phone);
-                        familyOne.setIdentityId(eIdentityStatu.Parent.getValue());
-                        familyOne.setAffiliate(user.getCardNo());
-                        familyOne.setSexId(eSexStatu.Man.getValue());
-                        familyOne.setIsCancel(eLogOff.Unlogout.getValue());
-                        String familyShip = dataFormatter.formatCellValue(row.getCell(12));//家属与本人关系
-                        familyOne.setShip(familyShip == null ? "" : familyShip);
-                        result.add(familyOne);
+                        String family = dataFormatter.formatCellValue(row.getCell(11));//家属
+                        if (!ObjectUtils.isEmpty(family)) {
+                            SmartUser familyOne = new SmartUser();
+                            familyOne.setName(family);
+                            familyOne.setDepartmentId(1);
+                            familyOne.setPhone(phone);
+                            familyOne.setIdentityId(eIdentityStatu.Parent.getValue());
+                            familyOne.setSexId(eSexStatu.Man.getValue());
+                            familyOne.setIsCancel(eLogOff.Unlogout.getValue());
+                            familyOne.setAffiliate(user.getCardNo());
+                            String familyShip = dataFormatter.formatCellValue(row.getCell(12));//家属与本人关系
+                            familyOne.setShip(familyShip == null ? "" : familyShip);
+                            result.add(familyOne);
+                        }
 
-                        SmartUser familyTwo = new SmartUser();
                         String familyNameTwo = dataFormatter.formatCellValue(row.getCell(14));//家属2
                         if (!ObjectUtils.isEmpty(familyNameTwo)) {
+                            SmartUser familyTwo = new SmartUser();
                             familyTwo.setName(familyNameTwo);
                             familyTwo.setDepartmentId(1);
                             String phoneTwo = dataFormatter.formatCellValue(row.getCell(13));//联系电话2