Browse Source

校友组织时间

夏文涛 1 year ago
parent
commit
409e76413a

+ 22 - 29
.idea/workspace.xml

@@ -2,14 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="a4ba97bd-69fc-4549-8407-13eeec316f0f" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/AlumniClubController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/AlumniClubController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/AlumniClubService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/AlumniClubService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/AlumniClubServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/AlumniClubServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/alumni.jar" beforeDir="false" afterPath="$PROJECT_DIR$/target/alumni.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/alumni.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/alumni.jar.original" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/AlumniClubController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/controller/AlumniClubController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/AlumniClubService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/services/AlumniClubService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/impl/AlumniClubServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/services/impl/AlumniClubServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/template/AlumniClubMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/template/AlumniClubMapper.xml" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -37,11 +30,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <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/AlumniClubController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="140">
-              <caret line="77" column="42" selection-start-line="77" selection-start-column="42" selection-end-line="77" selection-end-column="42" />
+            <state relative-caret-position="71">
+              <caret line="83" column="58" selection-start-line="83" selection-start-column="58" selection-end-line="83" selection-end-column="58" />
             </state>
           </provider>
         </entry>
@@ -73,11 +66,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/resources/mapper/template/AlumniClubMapper.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="200">
-              <caret line="23" column="30" selection-start-line="23" selection-start-column="16" selection-end-line="23" selection-end-column="30" />
+            <state relative-caret-position="292">
+              <caret line="45" column="36" selection-start-line="45" selection-start-column="36" selection-end-line="45" selection-end-column="36" />
             </state>
           </provider>
         </entry>
@@ -121,8 +114,8 @@
       <find>schedule</find>
       <find>updateAccountData</find>
       <find>queryClubPages</find>
-      <find>queryClubPage</find>
       <find>queryPageList</find>
+      <find>queryClubPage</find>
     </findStrings>
     <replaceStrings>
       <replace>FIND_IN_SET($</replace>
@@ -158,7 +151,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/request/updateClubRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/request/insertClubRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/AlumniClub.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/template/AlumniClubMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/AlumniClubApplyController.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/template/AlumniEndorseMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java" />
@@ -187,6 +179,7 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/AlumniClubService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/AlumniClubServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/AlumniClubController.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/template/AlumniClubMapper.xml" />
       </list>
     </option>
   </component>
@@ -491,12 +484,12 @@
       <workItem from="1736754601843" duration="731000" />
       <workItem from="1736755888424" duration="8028000" />
       <workItem from="1736841755601" duration="4418000" />
-      <workItem from="1736900483921" duration="21275000" />
+      <workItem from="1736900483921" duration="22171000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="185193000" />
+    <option name="totallyTimeSpent" value="186089000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -511,7 +504,7 @@
     <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" visible="true" weight="0.17377399" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.35667396" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="JRebel" order="2" side_tool="true" />
       <window_info id="Image Layers" order="3" />
@@ -540,7 +533,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.7428884" />
+      <window_info anchor="right" id="Maven" order="3" weight="0.7833698" />
       <window_info anchor="right" id="Palette" order="4" />
       <window_info anchor="right" id="JRebel Setup Guide" order="5" side_tool="true" weight="0.32932165" />
       <window_info anchor="right" id="Capture Analysis" order="6" />
@@ -906,13 +899,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/AlumniClubMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="200">
-          <caret line="23" column="30" selection-start-line="23" selection-start-column="16" selection-end-line="23" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/AlumniClub.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="502">
@@ -936,8 +922,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/AlumniClubController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="140">
-          <caret line="77" column="42" selection-start-line="77" selection-start-column="42" selection-end-line="77" selection-end-column="42" />
+        <state relative-caret-position="71">
+          <caret line="83" column="58" selection-start-line="83" selection-start-column="58" selection-end-line="83" selection-end-column="58" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/AlumniClubMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="292">
+          <caret line="45" column="36" selection-start-line="45" selection-start-column="36" selection-end-line="45" selection-end-column="36" />
         </state>
       </provider>
     </entry>

+ 1 - 0
src/main/resources/mapper/template/AlumniClubMapper.xml

@@ -43,6 +43,7 @@
         <if test="categoryId != null and categoryId != 0">
             and ac.category_id = #{categoryId}
         </if>
+        order by ac.create_time desc
     </select>
 
     <resultMap type="com.template.model.vo.ClubExcelVo" id="ClubDataMap">

BIN
target/alumni.jar


BIN
target/alumni.jar.original


+ 1 - 0
target/classes/mapper/template/AlumniClubMapper.xml

@@ -43,6 +43,7 @@
         <if test="categoryId != null and categoryId != 0">
             and ac.category_id = #{categoryId}
         </if>
+        order by ac.create_time desc
     </select>
 
     <resultMap type="com.template.model.vo.ClubExcelVo" id="ClubDataMap">