夏文涛 преди 2 години
родител
ревизия
16d98a2770

+ 162 - 232
.idea/workspace.xml

@@ -2,13 +2,15 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="6c5cf517-721b-44b7-afae-e7b1b913b988" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartExamtypeControllerAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/AutoCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/AutoCode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/SmartExamtypeControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartExamtypeControllerAPI.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/SmartScoreControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartScoreControllerAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartAttendanceController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartAttendanceController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/ScheduleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/ScheduleController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartExamtypeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartExamtypeController.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$/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$/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/controller/SmartWarningController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartWarningController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/SmartExamtypeService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/SmartExamtypeService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartExamtypeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartExamtypeServiceImpl.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/" />
@@ -25,19 +27,10 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartExamtypeControllerAPI.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="362">
-              <caret line="32" column="39" selection-start-line="32" selection-start-column="39" selection-end-line="32" selection-end-column="39" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartExamtype.java">
+        <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="-253">
-              <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+            <state relative-caret-position="169">
+              <caret line="165" column="7" selection-start-line="165" selection-start-column="7" selection-end-line="165" selection-end-column="7" />
             </state>
           </provider>
         </entry>
@@ -45,8 +38,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartExamtypeController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-102">
-              <caret line="97" column="13" selection-start-line="97" selection-start-column="13" selection-end-line="97" selection-end-column="13" />
+            <state relative-caret-position="401">
+              <caret line="88" column="77" selection-start-line="88" selection-start-column="77" selection-end-line="88" selection-end-column="77" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -57,8 +50,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartExamtypeService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="394">
-              <caret line="27" column="23" selection-start-line="27" selection-start-column="23" selection-end-line="27" selection-end-column="23" />
+            <state relative-caret-position="401">
+              <caret line="21" column="113" selection-start-line="21" selection-start-column="113" selection-end-line="21" selection-end-column="113" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -66,11 +59,11 @@
           </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/SmartExamtypeServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="279">
-              <caret line="63" column="48" selection-start-line="63" selection-start-column="31" selection-end-line="63" selection-end-column="48" />
+            <state relative-caret-position="170">
+              <caret line="29" column="13" lean-forward="true" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -79,46 +72,22 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <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="236">
-              <caret line="129" column="19" lean-forward="true" selection-start-line="129" selection-start-column="19" selection-end-line="129" selection-end-column="19" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartScoreControllerAPI.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="476">
-              <caret line="35" column="32" selection-start-line="35" selection-start-column="32" selection-end-line="35" selection-end-column="32" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartSubject.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="241">
-              <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartSemester.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartExamtypeControllerAPI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-188">
-              <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
+            <state relative-caret-position="447">
+              <caret line="29" column="112" selection-start-line="29" selection-start-column="112" selection-end-line="29" selection-end-column="129" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartGrade.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/ScheduleController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="295">
-              <caret line="63" column="30" selection-start-line="63" selection-start-column="4" selection-end-line="63" selection-end-column="30" />
+            <state relative-caret-position="343">
+              <caret line="66" column="7" selection-start-line="66" selection-start-column="7" selection-end-line="66" selection-end-column="7" />
+              <folding>
+                <element signature="method#autoDispatch#0;class#ScheduleController#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -134,17 +103,10 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>warningUserList</find>
-      <find>queryAffiliateUserById</find>
-      <find>getAffiliateList</find>
-      <find>&lt;update</find>
-      <find>updateMonthMeter</find>
-      <find>ur</find>
       <find>allowMultiQueries</find>
       <find>updateSmartSubjectById</find>
       <find>up</find>
       <find>deleted</find>
-      <find>分页</find>
       <find>queryAppletSubjects</find>
       <find>updateSmartGradeById</find>
       <find>queryPageSmartUsers</find>
@@ -164,6 +126,13 @@
       <find>.isPresent()</find>
       <find>楼栋</find>
       <find>queryExamTypes</find>
+      <find>sheet</find>
+      <find>(HttpServletResponse</find>
+      <find>导出</find>
+      <find>定时</find>
+      <find>年级</find>
+      <find>smartUserExport</find>
+      <find>分页</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -177,6 +146,7 @@
       <replace>updateSmartGradeById</replace>
       <replace>考试类型</replace>
       <replace>Examtype</replace>
+      <replace>setCellValue</replace>
     </replaceStrings>
   </component>
   <component name="Git.Settings">
@@ -185,8 +155,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/RepairAdmin.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartAttendance.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartAuthorGroup.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartApply.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartAuthority.java" />
@@ -225,17 +193,19 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartAuthorGroupServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartAttendanceController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/AutoCode.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/mapper/SmartExamtypeMapper.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartExamtypeControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartExamtype.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartScoreControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartWarningController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/ScheduleController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartExamtypeControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartExamtypeController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartExamtypeServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartExamtypeService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartExamtypeServiceImpl.java" />
       </list>
     </option>
   </component>
@@ -268,7 +238,7 @@
   </component>
   <component name="ProjectFrameBounds">
     <option name="x" value="-7" />
-    <option name="width" value="958" />
+    <option name="width" value="974" />
     <option name="height" value="1039" />
   </component>
   <component name="ProjectView">
@@ -327,43 +297,6 @@
               <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="mapper" 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>
-              <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" />
-              <item name="pojo" 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="services" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -412,7 +345,7 @@
     <property name="RequestMappingsPanelWidth1" value="75" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../民宿/mhotel" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../报修系统/repair_backend" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="settings.editor.selected.configurable" value="MavenSettings" />
@@ -520,18 +453,18 @@
       <workItem from="1709604835831" duration="41000" />
       <workItem from="1709604890825" duration="250000" />
       <workItem from="1709606083794" duration="10623000" />
-      <workItem from="1709688259937" duration="71491000" />
+      <workItem from="1709688259937" duration="82522000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="222206000" />
+    <option name="totallyTimeSpent" value="233237000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-7" y="0" width="958" height="1039" extended-state="0" />
+    <frame x="-7" y="0" width="974" height="1039" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" weight="0.47327393" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.41137856" />
       <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" />
@@ -542,8 +475,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" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4989059" weight="0.309628" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.4989059" visible="true" weight="0.40552485" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4989059" visible="true" weight="0.23425414" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.4989059" weight="0.17724289" />
       <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" />
@@ -560,7 +493,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.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Maven" order="3" weight="0.2572383" />
+      <window_info active="true" anchor="right" id="Maven" order="3" visible="true" weight="0.25164112" />
       <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" />
@@ -603,25 +536,19 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java</url>
-          <line>356</line>
-          <properties />
-          <option name="timeStamp" value="34" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java</url>
-          <line>601</line>
+          <line>641</line>
           <properties />
           <option name="timeStamp" value="36" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java</url>
-          <line>564</line>
+          <line>604</line>
           <properties />
           <option name="timeStamp" value="37" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java</url>
-          <line>562</line>
+          <line>602</line>
           <properties />
           <option name="timeStamp" value="38" />
         </line-breakpoint>
@@ -633,7 +560,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>2984</line>
+          <line>2985</line>
           <properties />
           <option name="timeStamp" value="91" />
         </line-breakpoint>
@@ -669,13 +596,13 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>2637</line>
+          <line>2638</line>
           <properties />
           <option name="timeStamp" value="118" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>3004</line>
+          <line>3005</line>
           <properties />
           <option name="timeStamp" value="122" />
         </line-breakpoint>
@@ -686,72 +613,6 @@
     <SUITE FILE_PATH="coverage/mybatis_plus$MybatisPlusApplication.ic" NAME="MybatisPlusApplication Coverage Results" MODIFIED="1709618808702" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartSubjectServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="560">
-          <caret line="72" column="49" selection-start-line="72" selection-start-column="30" selection-end-line="72" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartClassController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-380">
-          <caret line="49" column="13" selection-start-line="49" selection-start-column="13" selection-end-line="49" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/updateSmartGradeRequest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="8">
-          <caret line="20" column="7" selection-start-line="20" selection-start-column="7" selection-end-line="20" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartGradeControllerAPI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="192">
-          <caret line="27" column="37" selection-start-line="27" selection-start-column="17" selection-end-line="27" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/deleteUserVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="371">
-          <caret line="20" column="25" selection-start-line="20" selection-start-column="19" selection-end-line="20" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartGradeController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="169">
-          <caret line="71" selection-start-line="71" selection-end-line="71" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </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="240">
-          <caret line="214" column="83" selection-start-line="214" selection-start-column="71" selection-end-line="214" selection-end-column="83" />
-        </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="385">
-          <caret line="92" column="26" selection-start-line="92" selection-start-column="14" selection-end-line="92" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eIdentityStatu.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="197">
-          <caret line="34" column="25" selection-start-line="34" selection-start-column="25" selection-end-line="34" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/UserDeleteVo.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-150">
@@ -800,20 +661,6 @@
         </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="69">
-          <caret line="60" column="32" selection-start-line="60" selection-start-column="17" selection-end-line="60" selection-end-column="32" />
-        </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="36">
-          <caret line="998" column="31" selection-start-line="998" selection-start-column="31" selection-end-line="998" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartAttendanceController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="269">
@@ -996,71 +843,154 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/SemesterVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="253">
+          <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/java/com/template/aop/DESResponseSecretAspect.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="169">
+          <caret line="79" selection-start-line="79" selection-end-line="79" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartScoreControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="476">
-          <caret line="35" column="32" selection-start-line="35" selection-start-column="32" selection-end-line="35" selection-end-column="32" />
+        <state relative-caret-position="338">
+          <caret line="80" column="44" selection-start-line="80" selection-start-column="25" selection-end-line="80" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/SemesterVo.java">
+    <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="253">
-          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
+        <state relative-caret-position="166">
+          <caret line="75" column="24" selection-start-line="75" selection-start-column="24" selection-end-line="75" selection-end-column="24" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartExamtypeControllerAPI.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartWarningControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="32" column="39" selection-start-line="32" selection-start-column="39" selection-end-line="32" selection-end-column="39" />
+        <state relative-caret-position="174">
+          <caret line="48" column="26" selection-start-line="48" selection-start-column="26" selection-end-line="48" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartExamtypeService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/core/JwtAuthenticationInterceptor.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="394">
-          <caret line="27" column="23" selection-start-line="27" selection-start-column="23" selection-end-line="27" selection-end-column="23" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="166">
+          <caret line="87" column="50" selection-start-line="87" selection-start-column="50" selection-end-line="87" selection-end-column="50" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartExamtypeServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/WxUtil.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="279">
-          <caret line="63" column="48" selection-start-line="63" selection-start-column="31" selection-end-line="63" selection-end-column="48" />
+        <state relative-caret-position="166">
+          <caret line="375" column="36" selection-start-line="375" selection-start-column="36" selection-end-line="375" selection-end-column="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/ExcelUtils2.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="166">
+          <caret line="664" column="34" selection-start-line="664" selection-start-column="34" selection-end-line="664" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartWarningController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="158" column="40" selection-start-line="158" selection-start-column="40" selection-end-line="158" selection-end-column="40" />
+        </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="125">
+          <caret line="2377" column="40" lean-forward="true" selection-start-line="2377" selection-start-column="40" selection-end-line="2377" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/ExcelUtils.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="238">
+          <caret line="49" column="23" selection-start-line="49" selection-start-column="23" selection-end-line="49" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi/4.1.0/poi-4.1.0.jar!/org/apache/poi/ss/usermodel/Workbook.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="238">
+          <caret line="81" column="13" selection-start-line="81" selection-start-column="4" selection-end-line="81" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/ScheduleController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="343">
+          <caret line="66" column="7" selection-start-line="66" selection-start-column="7" selection-end-line="66" selection-end-column="7" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="method#autoDispatch#0;class#ScheduleController#0" />
           </folding>
         </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="169">
+          <caret line="165" column="7" selection-start-line="165" selection-start-column="7" selection-end-line="165" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartExamtypeControllerAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="447">
+          <caret line="29" column="112" selection-start-line="29" selection-start-column="112" selection-end-line="29" selection-end-column="129" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartExamtypeController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-102">
-          <caret line="97" column="13" selection-start-line="97" selection-start-column="13" selection-end-line="97" selection-end-column="13" />
+        <state relative-caret-position="401">
+          <caret line="88" column="77" selection-start-line="88" selection-start-column="77" selection-end-line="88" selection-end-column="77" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartExamtypeService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="236">
-          <caret line="129" column="19" lean-forward="true" selection-start-line="129" selection-start-column="19" selection-end-line="129" selection-end-column="19" />
+        <state relative-caret-position="401">
+          <caret line="21" column="113" selection-start-line="21" selection-start-column="113" selection-end-line="21" selection-end-column="113" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartExamtype.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-253">
+        <state relative-caret-position="172">
           <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartExamtypeServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="170">
+          <caret line="29" column="13" lean-forward="true" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

+ 1 - 1
src/main/java/com/template/api/SmartExamtypeControllerAPI.java

@@ -27,7 +27,7 @@ public interface SmartExamtypeControllerAPI {
 
     @GetMapping(value = "/queryPageSmartExamtype")
     @ApiOperation(value = "考试类型分页数据", notes = "考试类型分页数据", httpMethod = "GET")
-    CommonResult queryPageSmartExamtypes(@RequestParam int currentPage, @RequestParam int pageCount, String name);
+    CommonResult queryPageSmartExamtypes(@RequestParam int currentPage, @RequestParam int pageCount, String name, Integer gradeId);
 
     @GetMapping(value = "/deleteSmartExamtypeById")
     @ApiOperation(value = "根据ID删除指定考试类型", notes = "根据ID删除指定考试类型", httpMethod = "GET")

+ 8 - 0
src/main/java/com/template/api/SmartScoreControllerAPI.java

@@ -74,6 +74,14 @@ public interface SmartScoreControllerAPI {
     @ApiOperation(value = "导出成绩数据", notes = "导出成绩数据", httpMethod = "GET")
     void smartUserExport(HttpServletResponse response, String name, String semester, String grade, String schoolClass, String subject, String examType, Double MinScore, Double MaxScore);
 
+
+    /**
+     * 测试导出成绩数据
+     */
+    @GetMapping(value = "testSmartUserExport")
+    @ApiOperation(value = "测试导出成绩数据", notes = "测试导出成绩数据", httpMethod = "GET")
+    void testSmartUserExport(HttpServletResponse response);
+
     /**
      * 导入成绩
      * 导入的时候如果存在重复的数据就提示

+ 3 - 0
src/main/java/com/template/controller/ScheduleController.java

@@ -189,4 +189,7 @@ public class ScheduleController {
             }
         }
     }
+
+
+
 }

+ 2 - 2
src/main/java/com/template/controller/SmartExamtypeController.java

@@ -85,8 +85,8 @@ public class SmartExamtypeController implements SmartExamtypeControllerAPI {
      */
     @Override
     @DESRespondSecret(validated = true)
-    public CommonResult queryPageSmartExamtypes(int currentPage, int pageCount, String name) {
-        PageUtils<SmartExamtype> result = smartExamtypeService.queryPageSmartExamtypes(currentPage, pageCount, name);
+    public CommonResult queryPageSmartExamtypes(int currentPage, int pageCount, String name, Integer gradeId) {
+        PageUtils<SmartExamtype> result = smartExamtypeService.queryPageSmartExamtypes(currentPage, pageCount, name, gradeId);
 
         List<SmartGrade> grades = smartGradeService.list(null);
         if(grades != null && grades.size() > 0){

+ 44 - 4
src/main/java/com/template/controller/SmartScoreController.java

@@ -17,10 +17,8 @@ import com.template.services.*;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.DataFormatter;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -310,6 +308,7 @@ public class SmartScoreController implements SmartScoreControllerAPI {
     }
 
     @Override
+    @DESRespondSecret(validated = false)
     public void smartUserExport(HttpServletResponse response, String name, String semester, String grade, String schoolClass, String subject, String examType, Double MinScore, Double MaxScore) {
 
         Integer subjectInt = subject == null ? null : eSubjectStatu.integerOf(subject);
@@ -352,6 +351,47 @@ public class SmartScoreController implements SmartScoreControllerAPI {
     }
 
     @Override
+    @DESRespondSecret(validated = false)
+    public void testSmartUserExport(HttpServletResponse response) {
+        //导出
+        Workbook workbook = new XSSFWorkbook();
+        CellStyle style = workbook.createCellStyle();//水平居中
+        style.setVerticalAlignment(VerticalAlignment.CENTER);//垂直居中
+        style.setAlignment(HorizontalAlignment.CENTER);
+        style.setBorderBottom(BorderStyle.THIN);//设置边框
+        style.setBorderLeft(BorderStyle.THIN);
+        style.setBorderRight(BorderStyle.THIN);
+        style.setBorderTop(BorderStyle.THIN);
+        Sheet sheet = workbook.createSheet("成绩管理");
+        Row headerRow = sheet.createRow(0);
+
+        headerRow.createCell(0).setCellValue("序号");
+        headerRow.getCell(0).setCellStyle(style);
+        headerRow.createCell(1).setCellValue("学期");
+        headerRow.getCell(1).setCellStyle(style);
+        headerRow.createCell(2).setCellValue("年级");
+        headerRow.getCell(2).setCellStyle(style);
+        headerRow.createCell(3).setCellValue("班级");
+        headerRow.getCell(3).setCellStyle(style);
+        headerRow.createCell(4).setCellValue("学科");
+        headerRow.getCell(4).setCellStyle(style);
+        headerRow.getCell(5).setCellStyle(style);
+        headerRow.createCell(6).setCellValue("姓名");
+        headerRow.getCell(6).setCellStyle(style);
+        headerRow.createCell(7).setCellValue("学号");
+        headerRow.getCell(7).setCellStyle(style);
+        headerRow.createCell(8).setCellStyle(style);//不设置合并的单元格则剩余单元格没有黑边框
+        headerRow.createCell(9).setCellStyle(style);//不设置合并的单元格则剩余单元格没有黑边框
+        headerRow.createCell(10).setCellValue("成绩");
+        headerRow.getCell(10).setCellStyle(style);
+
+        sheet.addMergedRegion(new CellRangeAddress(0, 0, 7, 9));//Row:行 Col:列   合并单元格
+
+        // 将工作簿写入文件
+        ExcelUtils.excelDownload(workbook, "成绩信息.xlsx", response);
+    }
+
+    @Override
     @DESRespondSecret(validated = true)
     public CommonResult importSmartScoreExcel(MultipartFile file) throws IOException {
         if (file.isEmpty() || file.getSize() == 0) {

+ 1 - 0
src/main/java/com/template/controller/SmartUserController.java

@@ -2375,6 +2375,7 @@ public class SmartUserController implements SmartUserControllerAPI {
     }
 
     @Override
+    @DESRespondSecret(validated = false)
     public void smartUserExport(HttpServletResponse response, Integer departmentId, String name) {
         //获取该部门下的所有子级部门ID
         List<Integer> childDepartmentIds = new ArrayList<>();

+ 1 - 0
src/main/java/com/template/controller/SmartWarningController.java

@@ -156,6 +156,7 @@ public class SmartWarningController implements SmartWarningControllerAPI {
     }
 
     @Override
+    @DESRespondSecret(validated = false)
     public void excelSmartWarning(HttpServletResponse response, String location, String state) {
         // 表头数据
 //        List<Object> head = Arrays.asList("姓名","事件","地点","时间","备注","状态","图片");

+ 1 - 1
src/main/java/com/template/services/SmartExamtypeService.java

@@ -19,7 +19,7 @@ public interface SmartExamtypeService extends IService<SmartExamtype> {
 
     int updateSmartExamtype(SmartExamtype rns);
 
-    PageUtils<SmartExamtype> queryPageSmartExamtypes(int currentPage, int pageCount, String name);
+    PageUtils<SmartExamtype> queryPageSmartExamtypes(int currentPage, int pageCount, String name, Integer gradeId);
 
     int deleteSmartExamtypeById(int id);
 

+ 3 - 2
src/main/java/com/template/services/impl/SmartExamtypeServiceImpl.java

@@ -40,10 +40,11 @@ public class SmartExamtypeServiceImpl extends ServiceImpl<SmartExamtypeMapper, S
     }
 
     @Override
-    public PageUtils<SmartExamtype> queryPageSmartExamtypes(int currentPage, int pageCount, String name) {
+    public PageUtils<SmartExamtype> queryPageSmartExamtypes(int currentPage, int pageCount, String name, Integer gradeId) {
         Page<SmartExamtype> page = new Page<>(currentPage, pageCount);
         QueryWrapper<SmartExamtype> queryWrapper = new QueryWrapper<>();
-        //queryWrapper.like(StringUtils.hasText(name), "name", name);
+        queryWrapper.like(StringUtils.hasText(name), "name", name);
+        queryWrapper.like(gradeId != null, "grade_id", gradeId);
         IPage<SmartExamtype> result = smartExamtypeMapper.selectPage(page,queryWrapper);
         return new PageUtils<>(result);
     }

BIN
target/mybatis_plus-0.0.1-SNAPSHOT.jar.original