希沃学段

.idea/workspace.xml

@@ -5,7 +5,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="6c5cf517-721b-44b7-afae-e7b1b913b988" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartClassController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartClassController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/common/utils/ClassYear.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/ClassYear.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="SHOW_DIALOG" value="false" />
@@ -18,11 +18,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <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/SmartClassController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="433">
-              <caret line="381" column="103" lean-forward="true" selection-start-line="381" selection-start-column="103" selection-end-line="381" selection-end-column="103" />
+            <state relative-caret-position="269">
+              <caret line="381" column="49" selection-start-line="381" selection-start-column="27" selection-end-line="381" selection-end-column="53" />
               <folding>
                 <element signature="method#queryPageSmartClasss#0;class#SmartClassController#0" />
                 <element signature="method#querySmartClasss#0;class#SmartClassController#0" />
@@ -31,6 +31,18 @@
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/ClassYear.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="372">
+              <caret line="26" column="51" selection-start-line="26" selection-start-column="51" selection-end-line="26" selection-end-column="51" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -42,8 +54,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>repositories</find>
-      <find>Double</find>
       <find>su</find>
       <find>deviceNo</find>
       <find>startTime !=</find>
@@ -72,6 +82,8 @@
       <find>manageAuthors</find>
       <find>region 百胜</find>
       <find>useBs = 1</find>
+      <find>2022</find>
+      <find>ClassYear.getAdmissionYear</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -98,6 +110,7 @@
       <list>
         <option value="$PROJECT_DIR$/.idea/workspace.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartClassController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/common/utils/ClassYear.java" />
       </list>
     </option>
   </component>
@@ -407,13 +420,13 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="381780000" />
+    <option name="totallyTimeSpent" value="382276000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" weight="0.27025586" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13166311" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="JRebel" order="3" side_tool="true" />
@@ -442,7 +455,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.75054705" />
+      <window_info anchor="right" id="Maven" order="3" weight="0.9671773" />
       <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" />
@@ -782,16 +795,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/ClassYear.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="11" column="17" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/WechatScanLoginController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="9177">
@@ -875,8 +878,8 @@
     </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="433">
-          <caret line="381" column="103" lean-forward="true" selection-start-line="381" selection-start-column="103" selection-end-line="381" selection-end-column="103" />
+        <state relative-caret-position="269">
+          <caret line="381" column="49" selection-start-line="381" selection-start-column="27" selection-end-line="381" selection-end-column="53" />
           <folding>
             <element signature="method#queryPageSmartClasss#0;class#SmartClassController#0" />
             <element signature="method#querySmartClasss#0;class#SmartClassController#0" />
@@ -884,6 +887,16 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/ClassYear.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="372">
+          <caret line="26" column="51" selection-start-line="26" selection-start-column="51" selection-end-line="26" selection-end-column="51" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

src/main/java/com/template/common/utils/ClassYear.java

@@ -23,40 +23,28 @@ public class ClassYear {
         switch (stage) {
             //初一
             case 7:
-                admissionYear = currentYear + 1;
-                break;
-            //初二
-            case 8:
-                admissionYear = currentYear;
-                break;
-            //初三
-            case 9:
-                if (currentDate.getMonthValue() < 9) {
+                if(currentDate.getMonthValue() < 9){
                     admissionYear = currentYear - 1;
-                } else {
+                }else{
                     admissionYear = currentYear;
                 }
                 break;
-            //"高一"
-            case 10:
-                if (currentDate.getMonthValue() < 9) {
-                    admissionYear = currentYear + 2;
-                } else {
-                    admissionYear = currentYear + 1;
+            //初二
+            case 8:
+                if(currentDate.getMonthValue() < 9){
+                    admissionYear = currentYear - 2;
+                }else{
+                    admissionYear = currentYear;
                 }
                 break;
-            //"高二"
-            case 11:
+            //初三
+            case 9:
                 if (currentDate.getMonthValue() < 9) {
-                    admissionYear = currentYear + 1;
+                    admissionYear = currentYear - 3;
                 } else {
                     admissionYear = currentYear;
                 }
                 break;
-            //"高三"
-            case 12:
-                admissionYear = currentYear;
-                break;
             default:
                 break;
         }