提交代码

.idea/workspace.xml

@@ -2,8 +2,9 @@
 <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/api/SmartAuthorGroupControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartAuthorGroupControllerAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartAuthorGroupController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartAuthorGroupController.java" afterDir="false" />
+      <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>
     <ignored path="$PROJECT_DIR$/classes/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -19,11 +20,41 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
+      <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>
+          </provider>
+        </entry>
+      </file>
       <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" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="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>
+      </file>
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartAuthorGroupController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="497">
-              <caret line="617" column="47" lean-forward="true" selection-start-line="617" selection-start-column="47" selection-end-line="617" selection-end-column="47" />
+            <state relative-caret-position="129">
+              <caret line="617" column="47" selection-start-line="617" selection-start-column="47" selection-end-line="617" selection-end-column="47" />
             </state>
           </provider>
         </entry>
@@ -32,7 +63,7 @@
         <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">
-              <caret line="65" column="112" lean-forward="true" selection-start-line="65" selection-start-column="97" selection-end-line="65" selection-end-column="112" />
+              <caret line="65" column="112" selection-start-line="65" selection-start-column="97" selection-end-line="65" selection-end-column="112" />
             </state>
           </provider>
         </entry>
@@ -41,11 +72,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>百胜新增</find>
-      <find>student_startdate</find>
-      <find>百胜</find>
-      <find>cardNo</find>
-      <find>default</find>
       <find>&lt; 9</find>
       <find>user.setGrade</find>
       <find>false</find>
@@ -71,6 +97,11 @@
       <find>删除</find>
       <find>希沃</find>
       <find>queryUserAuthor</find>
+      <find>deleteSmartUserById</find>
+      <find>导出</find>
+      <find>queryTimeGroupByName</find>
+      <find>导入</find>
+      <find>queryTimeGroups</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -82,7 +113,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartDepartmentController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/AutoCode.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/mapper/SmartTemplateRuleMapper.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/mapper/SmartTimeGroupMapper.java" />
@@ -97,9 +127,10 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartTimeGroupServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartTimeGroupService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartAuthorGroupControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartAuthorGroupController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartDepartmentController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" />
       </list>
     </option>
   </component>
@@ -325,15 +356,15 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1712903307839</updated>
-      <workItem from="1712903309092" duration="29634000" />
+      <workItem from="1712903309092" duration="32760000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="29634000" />
+    <option name="totallyTimeSpent" value="32760000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
+    <frame x="-7" y="0" width="974" height="1039" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info id="JRebel" side_tool="true" />
@@ -343,7 +374,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" weight="0.30703625" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1761488" />
       <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" />
@@ -357,12 +388,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" weight="0.45524862" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8402626" />
+      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.45524862" />
+      <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.3251599" />
+      <window_info anchor="right" id="Maven" weight="0.3249453" />
       <window_info anchor="right" id="Palette" />
       <window_info anchor="right" id="Capture Analysis" />
       <window_info anchor="right" id="Database" />
@@ -413,22 +444,40 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>1036</line>
+          <line>1051</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>947</line>
+          <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>689</line>
+          <line>696</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>
+          <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>
+          <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>
+          <properties />
+          <option name="timeStamp" value="32" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
@@ -709,13 +758,6 @@
         </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="295">
-          <caret line="374" selection-start-line="374" selection-end-line="374" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://C:/Program Files/Java/jdk1.8.0_181/src.zip!/java/lang/String.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="295">
@@ -730,13 +772,6 @@
         </state>
       </provider>
     </entry>
-    <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="562">
-          <caret line="63" column="55" selection-start-line="63" selection-start-column="11" selection-end-line="63" selection-end-column="55" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.3.1/spring-core-5.3.1-sources.jar!/org/springframework/cglib/proxy/MethodProxy.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="177">
@@ -765,16 +800,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="2104" column="24" lean-forward="true" selection-start-line="2104" selection-start-column="24" selection-end-line="2104" selection-end-column="24" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </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">
@@ -785,14 +810,38 @@
     <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">
-          <caret line="65" column="112" lean-forward="true" selection-start-line="65" selection-start-column="97" selection-end-line="65" selection-end-column="112" />
+          <caret line="65" column="112" selection-start-line="65" selection-start-column="97" selection-end-line="65" selection-end-column="112" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartAuthorGroupController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="497">
-          <caret line="617" column="47" lean-forward="true" selection-start-line="617" selection-start-column="47" selection-end-line="617" selection-end-column="47" />
+        <state relative-caret-position="129">
+          <caret line="617" column="47" selection-start-line="617" selection-start-column="47" selection-end-line="617" selection-end-column="47" />
+        </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="778">
+          <caret line="113" selection-start-line="113" selection-end-line="113" />
+        </state>
+      </provider>
+    </entry>
+    <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="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/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" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

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

@@ -89,7 +89,7 @@ public class SmartDepartmentController implements SmartDepartmentControllerAPI {
         sd.setParentId(smartDepartment.getParentId());
         sd.setName(smartDepartment.getName());
 
-        //region 百胜添加教师数据
+        //region 百胜添加部门数据
         String appId = controlConfig.getAppId();
         String schoolno = controlConfig.getSchoolCode();
         String timestamp = TimeExchange.DateNowTimeStamo();
@@ -159,7 +159,7 @@ public class SmartDepartmentController implements SmartDepartmentControllerAPI {
         sd.setParentId(udr.getParentId());
         sd.setName(udr.getName());
 
-        //region 百胜添加教师数据
+        //region 百胜添加部门数据
         String appId = controlConfig.getAppId();
         String schoolno = controlConfig.getSchoolCode();
         String timestamp = TimeExchange.DateNowTimeStamo();

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

@@ -470,6 +470,7 @@ public class SmartUserController implements SmartUserControllerAPI {
         List<SmartDepartment> departments = smartDepartmentService.list(null);
         List<SmartGrade> grades = smartGradeService.list(null); //年级
         List<SmartClass> classs = smartClassService.list(null);//班级
+        List<SmartTimeGroup> timeGroups = smartTimeGroupService.queryTimeGroups();//时间组
         //读取第一张sheet
         XSSFSheet sheetAt = sheets.getSheetAt(0);
 
@@ -665,8 +666,14 @@ public class SmartUserController implements SmartUserControllerAPI {
                         user.setOfStudent("");
                         user.setGraduate("");
                         user.setDuties(null);
-                        String timeGroup = dataFormatter.formatCellValue(row.getCell(7));
-                        user.setTimeGroupId(eGroupTime(timeGroup));
+                        String timeGroup = dataFormatter.formatCellValue(row.getCell(8));
+                        Optional<SmartTimeGroup> groupData = timeGroups.stream().filter(e -> e.getName().equals(timeGroup)).findFirst();
+                        if (groupData != null && groupData.isPresent()) {
+                            user.setTimeGroupId(groupData.get().getId());
+                        } else {
+                            user.setTimeGroupId(0);
+                        }
+
                         user.setIsCancel(eLogOff.Unlogout.getValue());
 
                         result.add(user);
@@ -727,6 +734,7 @@ public class SmartUserController implements SmartUserControllerAPI {
         List<SmartDepartment> departments = smartDepartmentService.list(null);
         List<SmartGrade> grades = smartGradeService.list(null); //年级
         List<SmartClass> classs = smartClassService.list(null);//班级
+        List<SmartTimeGroup> timeGroups = smartTimeGroupService.queryTimeGroups();//时间组
 
         //读取第一张sheet
         HSSFSheet sheetAt = sheets.getSheetAt(0);
@@ -923,8 +931,15 @@ public class SmartUserController implements SmartUserControllerAPI {
                         user.setOfStudent("");
                         user.setGraduate("");
                         user.setDuties(null);
+
                         String timeGroup = dataFormatter.formatCellValue(row.getCell(8));
-                        user.setTimeGroupId(eGroupTime(timeGroup));
+                        Optional<SmartTimeGroup> groupData = timeGroups.stream().filter(e -> e.getName().equals(timeGroup)).findFirst();
+                        if (groupData != null && groupData.isPresent()) {
+                            user.setTimeGroupId(groupData.get().getId());
+                        } else {
+                            user.setTimeGroupId(0);
+                        }
+
                         user.setIsCancel(eLogOff.Unlogout.getValue());
 
                         result.add(user);
@@ -2881,7 +2896,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                 CommonResult deleteBsStudent = bsDeleteStudent(user);
                 if (!deleteBsStudent.isSuccess()) {
                     String reason = (deleteUser.getReason() == null ? "" : deleteUser.getReason()) + "百胜删除学生失败；" + deleteBsStudent.getMessage() + "；";
-                    ;
+
                     deleteUser.setReason(reason);
                     //return CommonResult.fail(deleteBsStudent.getMessage());
                 }