Pārlūkot izejas kodu

排序使用代码排序

chen 5 gadi atpakaļ
vecāks
revīzija
c1700878d6

+ 2 - 1
ssj-mybatis-service-impl/src/main/java/com/ssj/utils/SortByChineseUtil.java

@@ -1,4 +1,5 @@
 package com.ssj.utils;
+import com.ssj.bean.sys.sort.domain.Sort;
 import net.sourceforge.pinyin4j.PinyinHelper;
 
 import java.text.Collator;
@@ -76,7 +77,7 @@ public class SortByChineseUtil {
         if(map.get(key) == null){
             return key;
         }else{
-            return  key + key;
+            return SortByChineseUtil.setMapKey(map, key + key.substring(0, 1));
         }
 
     }

+ 9 - 0
ssj-mybatis-service-impl/src/main/resources/mybatis/mapper/KmtExerciseMapper.xml

@@ -559,6 +559,7 @@
                 </otherwise>
             </choose>
         </if>
+        order by eb.book_name
     </select>
 
     <!--查询未分配加工人练习册-->
@@ -589,6 +590,7 @@
                 </otherwise>
             </choose>
         </if>
+        order by eb.book_name
     </select>
 
     <!--查询未分配审核练习册-->
@@ -615,6 +617,7 @@
                 </otherwise>
             </choose>
         </if>
+        order by eb.book_name
     </select>
 
     <!--查询未审核解析的练习册-->
@@ -632,6 +635,7 @@
                 </otherwise>
             </choose>
         </if>
+        order by eb.book_name
     </select>
 
     <select id="findUnCorrectAnswerBooks" resultType="com.ssj.service.kmt.dto.ExerciseBookDto">
@@ -648,6 +652,7 @@
                 </otherwise>
             </choose>
         </if>
+        order by eb.book_name
     </select>
 
     <select id="findCorrectedAnswerBooks" resultType="com.ssj.service.kmt.dto.ExerciseBookDto">
@@ -664,6 +669,7 @@
                 </otherwise>
             </choose>
         </if>
+        order by eb.book_name
     </select>
 
     <!--查询未校对的练习册-->
@@ -691,6 +697,7 @@
                 </otherwise>
             </choose>
         </if>
+        order by eb.book_name
     </select>
 
     <!--查询待加工审核的练习册单元 -->
@@ -2053,6 +2060,7 @@
                 </if>
             </otherwise>
         </choose>
+        order by eb.book_name
     </select>
 
     <select id="findEditExerciseQuestions" resultType="com.ssj.service.kmt.dto.exercise.ExerciseQuestionEditDto">
@@ -2078,5 +2086,6 @@
         <if test="bookName != null and bookName != ''">
             and eb.book_name like concat('%',#{bookName},'%')
         </if>
+        order by eb.book_name
     </select>
 </mapper>