生物安全排序

zhyc-module/src/main/resources/mapper/biosafety/ImmunityMapper.xml

@@ -44,7 +44,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="params.beginDatetime != null and params.beginDatetime != '' and params.endDatetime != null and params.endDatetime != ''"> and datetime between #{params.beginDatetime} and #{params.endDatetime}</if>
             <if test="technical != null  and technical != ''"> and technical = #{technical}</if>
         </where>
-        ORDER BY datetime  DESC
+        <!-- 基准排序：日期永远第一序，降序 -->
+        ORDER BY datetime DESC
+        <!-- 第二序：仅当用户点击月龄/胎次时追加 -->
+        <choose>
+            <when test="orderByColumn == 'monthAge'">, month_age ${isAsc}</when>
+            <when test="orderByColumn == 'parity'">, parity ${isAsc}</when>
+        </choose>
     </select>
     
     <select id="selectImmunityById" parameterType="Long" resultMap="ImmunityResult">