成绩管理修改

.idea/workspace.xml

@@ -2,9 +2,12 @@
 <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/SmartSemesterControllerAPI.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartSubjectControllerAPI.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$/src/main/java/com/template/controller/SmartSemesterController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartSemesterController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartScore.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartScore.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/request/insertScoreRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/request/insertScoreRequest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/request/updateScoreRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/request/updateScoreRequest.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/" />
@@ -23,16 +26,34 @@
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartSubjectController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="-910">
-              <caret line="34" column="11" lean-forward="true" selection-start-line="34" selection-start-column="11" selection-end-line="34" selection-end-column="11" />
+              <caret line="34" column="11" selection-start-line="34" selection-start-column="11" selection-end-line="34" selection-end-column="11" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="105">
-              <caret line="103" column="5" lean-forward="true" selection-start-line="103" selection-start-column="5" selection-end-line="103" selection-end-column="5" />
+            <state relative-caret-position="187">
+              <caret line="488" column="33" selection-start-line="488" selection-start-column="33" selection-end-line="488" selection-end-column="33" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartScore.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="118">
+              <caret line="37" column="31" selection-start-line="37" selection-start-column="31" selection-end-line="37" selection-end-column="31" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/updateScoreRequest.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="333">
+              <caret line="32" column="19" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="19" />
             </state>
           </provider>
         </entry>
@@ -40,8 +61,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartSubjectControllerAPI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="115">
-              <caret line="12" column="18" lean-forward="true" selection-start-line="12" selection-start-column="18" selection-end-line="12" selection-end-column="18" />
+            <state relative-caret-position="310">
+              <caret line="32" column="48" selection-start-line="32" selection-start-column="26" selection-end-line="32" selection-end-column="48" />
             </state>
           </provider>
         </entry>
@@ -49,17 +70,20 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartSemesterControllerAPI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="276">
-              <caret line="19" column="45" lean-forward="true" selection-start-line="19" selection-start-column="45" selection-end-line="19" selection-end-column="45" />
+            <state relative-caret-position="483">
+              <caret line="28" column="48" selection-start-line="28" selection-start-column="26" selection-end-line="28" selection-end-column="48" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/LoginControllerAPI.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartSemesterController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="437">
-              <caret line="30" column="22" selection-start-line="30" selection-start-column="17" selection-end-line="30" selection-end-column="22" />
+            <state relative-caret-position="325">
+              <caret line="99" column="47" selection-start-line="99" selection-start-column="24" selection-end-line="99" selection-end-column="47" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -85,7 +109,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartSemester.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="223">
+            <state relative-caret-position="-130">
               <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
             </state>
           </provider>
@@ -127,20 +151,20 @@
       <find>importExce</find>
       <find>应用</find>
       <find>Apply</find>
-      <find>楼栋</find>
       <find>querySmartSemesters</find>
       <find>Build</find>
-      <find>querySubjects</find>
       <find>queryExamTypes</find>
+      <find>querySubjects</find>
+      <find>楼栋</find>
     </findStrings>
     <replaceStrings>
       <replace />
       <replace>public CommonResult</replace>
       <replace>学科</replace>
-      <replace>学期</replace>
       <replace>Subject</replace>
       <replace>Semester</replace>
       <replace>科目</replace>
+      <replace>学期</replace>
     </replaceStrings>
   </component>
   <component name="Git.Settings">
@@ -149,9 +173,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartNotificationController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartMeterDetailController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartMeterController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartMenuController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartIdentityController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartGradeController.java" />
@@ -195,11 +216,14 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartSubjectService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartSemesterService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartSemesterServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartSemesterController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartSemesterControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartSubjectControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartSubjectController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartSemesterController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/request/insertScoreRequest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/request/updateScoreRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartScore.java" />
       </list>
     </option>
   </component>
@@ -232,7 +256,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,6 +351,25 @@
               <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>
@@ -483,18 +526,18 @@
       <workItem from="1709604835831" duration="41000" />
       <workItem from="1709604890825" duration="250000" />
       <workItem from="1709606083794" duration="10623000" />
-      <workItem from="1709688259937" duration="29324000" />
+      <workItem from="1709688259937" duration="33945000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="180039000" />
+    <option name="totallyTimeSpent" value="184660000" />
   </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.4037199" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.39606127" />
       <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" />
@@ -505,8 +548,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.32166302" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.4989059" weight="0.03314917" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4989059" visible="true" weight="0.3237569" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.4989059" weight="0.25273523" />
       <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" />
@@ -514,7 +557,7 @@
       <window_info anchor="bottom" id="Terminal" order="8" />
       <window_info anchor="bottom" id="Docker" order="9" />
       <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.5010941" side_tool="true" weight="0.3359116" />
-      <window_info anchor="bottom" id="Messages" order="11" weight="0.32928178" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.32603937" />
       <window_info anchor="bottom" id="Java Enterprise" order="12" />
       <window_info anchor="bottom" id="Database Changes" order="13" />
       <window_info anchor="bottom" id="Version Control" order="14" />
@@ -523,7 +566,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.6892779" />
+      <window_info anchor="right" id="Maven" order="3" weight="0.5853392" />
       <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" />
@@ -566,25 +609,25 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java</url>
-          <line>350</line>
+          <line>352</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>589</line>
+          <line>597</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>552</line>
+          <line>560</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>550</line>
+          <line>558</line>
           <properties />
           <option name="timeStamp" value="38" />
         </line-breakpoint>
@@ -631,27 +674,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/config/ControlConfig.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="161">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/config/MyBatisPlusConfig.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/config/MySecurity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="138">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/useridsRequest.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="184">
@@ -868,13 +890,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartSemesterController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-437">
-          <caret line="11" column="40" selection-start-line="11" selection-start-column="40" selection-end-line="11" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartSchoolController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1215">
@@ -896,13 +911,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartSubjectController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-910">
-          <caret line="34" column="11" lean-forward="true" selection-start-line="34" selection-start-column="11" selection-end-line="34" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
     <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="284">
@@ -910,20 +918,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartSemester.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="223">
-          <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/api/SmartSemesterControllerAPI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="19" column="45" lean-forward="true" selection-start-line="19" selection-start-column="45" selection-end-line="19" selection-end-column="45" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/LoginControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="437">
@@ -959,13 +953,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartSubjectControllerAPI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="115">
-          <caret line="12" column="18" lean-forward="true" selection-start-line="12" selection-start-column="18" selection-end-line="12" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eSubjectStatu.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="253">
@@ -980,10 +967,69 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartSemesterControllerAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="483">
+          <caret line="28" column="48" selection-start-line="28" selection-start-column="26" selection-end-line="28" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartSemester.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-130">
+          <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/controller/SmartSemesterController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="99" column="47" selection-start-line="99" selection-start-column="24" selection-end-line="99" selection-end-column="47" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartSubjectController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-910">
+          <caret line="34" column="11" selection-start-line="34" selection-start-column="11" selection-end-line="34" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartSubjectControllerAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="310">
+          <caret line="32" column="48" selection-start-line="32" selection-start-column="26" selection-end-line="32" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/insertScoreRequest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="287">
+          <caret line="19" column="19" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/updateScoreRequest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="333">
+          <caret line="32" column="19" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="19" />
+        </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="105">
-          <caret line="103" column="5" lean-forward="true" selection-start-line="103" selection-start-column="5" selection-end-line="103" selection-end-column="5" />
+        <state relative-caret-position="187">
+          <caret line="488" column="33" selection-start-line="488" selection-start-column="33" selection-end-line="488" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartScore.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="118">
+          <caret line="37" column="31" selection-start-line="37" selection-start-column="31" selection-end-line="37" selection-end-column="31" />
         </state>
       </provider>
     </entry>

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

@@ -220,6 +220,7 @@ public class SmartScoreController implements SmartScoreControllerAPI {
 
         SmartScore ss = new SmartScore();
         ss.setSemester(isr.getSemester());
+        ss.setSemesterId(isr.getSemesterId());
         ss.setGrade(isr.getGrade());
         ss.setGradeId(isr.getGradeId());
         ss.setSchoolClass(isr.getSchoolClass());
@@ -260,6 +261,7 @@ public class SmartScoreController implements SmartScoreControllerAPI {
         }
 
         score.setSemester(usr.getSemester());
+        score.setSemesterId(usr.getSemesterId());
         score.setGradeId(usr.getGradeId());
         score.setGrade(usr.getGrade());
         score.setSchoolClassId(usr.getSchoolClassId());
@@ -466,6 +468,11 @@ public class SmartScoreController implements SmartScoreControllerAPI {
                     String cardNo = dataFormatter.formatCellValue(row.getCell(6));//学号
                     String score = dataFormatter.formatCellValue(row.getCell(7));//成绩
 
+                    SmartSemester semesterStr = smartSemesterService.querySemesterByName(semester);
+                    if(semesterStr == null){
+                        return CommonResult.fail(semester+"学期数据无效，导入失败！");
+                    }
+
                     //数据重复性判断 学期 + 学号 + 科目
                     String existData = semester + cardNo + subject;
                     scoreNames.add(existData);
@@ -480,6 +487,7 @@ public class SmartScoreController implements SmartScoreControllerAPI {
                     }
 
                     data.setSemester(semester);
+                    data.setSemesterId(semesterStr.getId());
                     data.setGrade(grade);
                     Optional<SmartGrade> nowGrade = grades.stream().filter(e -> e.getName().equals(grade)).findFirst();
                     if (!(nowGrade != null && nowGrade.isPresent())) {
@@ -597,6 +605,11 @@ public class SmartScoreController implements SmartScoreControllerAPI {
                     String cardNo = dataFormatter.formatCellValue(row.getCell(6));//学号
                     String score = dataFormatter.formatCellValue(row.getCell(7));//成绩
 
+                    SmartSemester semesterStr = smartSemesterService.querySemesterByName(semester);
+                    if(semesterStr == null){
+                        return CommonResult.fail(semester+"学期数据无效，导入失败！");
+                    }
+
                     //数据重复性判断 学期 + 学号 + 科目
                     String existData = semester + cardNo + subject;
                     scoreNames.add(existData);
@@ -611,6 +624,7 @@ public class SmartScoreController implements SmartScoreControllerAPI {
                     }
 
                     data.setSemester(semester);
+                    data.setSemesterId(semesterStr.getId());
                     data.setGrade(grade);
                     Optional<SmartGrade> nowGrade = grades.stream().filter(e -> e.getName().equals(grade)).findFirst();
                     if (!(nowGrade != null && nowGrade.isPresent())) {

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

@@ -40,9 +40,9 @@ public class SmartSemesterController implements SmartSemesterControllerAPI {
     private SmartSemesterService smartSemesterService;
 
     /**
-     * 新增楼栋
+     * 新增学期
      *
-     * @param smartApply    楼栋数据
+     * @param smartApply    学期数据
      * @param bindingResult
      * @return
      */
@@ -60,9 +60,9 @@ public class SmartSemesterController implements SmartSemesterControllerAPI {
     }
 
     /**
-     * 更新楼栋
+     * 更新学期
      *
-     * @param sa            楼栋数据
+     * @param sa            学期数据
      * @param bindingResult
      * @return
      */
@@ -79,7 +79,7 @@ public class SmartSemesterController implements SmartSemesterControllerAPI {
     }
 
     /**
-     * 楼栋分页数据查询
+     * 学期分页数据查询
      *
      * @param currentPage 当前页数
      * @param pageCount   一页数据条数

src/main/java/com/template/model/pojo/SmartScore.java

@@ -34,6 +34,9 @@ public class SmartScore implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+    @ApiModelProperty(value = "学期ID")
+    private Integer semesterId;
+
     @ApiModelProperty(value = "学期")
     private String semester;
 

src/main/java/com/template/model/request/insertScoreRequest.java

@@ -16,10 +16,16 @@ public class insertScoreRequest {
     /**
      * 学期
      */
-    @NotNull(message = "学期不能为空")
+    @NotBlank(message = "学期不能为空")
     private String semester;
 
     /**
+     * 学期
+     */
+    @NotNull(message = "学期Id不能为空")
+    private Integer semesterId;
+
+    /**
      * 年级ID
      */
     @NotNull(message = "年级ID不能为空")

src/main/java/com/template/model/request/updateScoreRequest.java

@@ -23,10 +23,16 @@ public class updateScoreRequest {
     /**
      * 学期
      */
-    @NotNull(message = "学期不能为空")
+    @NotBlank(message = "学期不能为空")
     private String semester;
 
     /**
+     * 学期ID
+     */
+    @NotBlank(message = "学期ID不能为空")
+    private Integer semesterId;
+
+    /**
      * 年级ID
      */
     @NotNull(message = "年级ID不能为空")