月报问题，发布邮件末班修改，任务切换迭代

src/main/resources/mapper/ZtKanbancolumnMapper.xml

@@ -15,7 +15,7 @@
             <result column="deleted" property="deleted" />
     </resultMap>
     <select id="listByLaneIds" resultType="com.sa.zentao.dao.ZtKanbancolumnDTO">
-        SELECT c.*,b.lane,b.kanban,b.cards, b.type cardType from zt_kanbancolumn c,zt_kanbancell b
+        SELECT c.*,b.lane,b.kanban,b.cards, b.type cardType ,b.id cellId from zt_kanbancolumn c,zt_kanbancell b
         WHERE c.id = b.column
         and b.lane in
 

src/main/resources/mapper/ZtStoryUserMapper.xml

@@ -220,7 +220,21 @@
 
             </if>
 
-            order by s.id desc
+            <choose>
+                    <when test="qo.orderName != '' and qo.orderName != null  ">
+                            <choose>
+                                    <when test="qo.orderSort != '' and qo.orderSort != null  ">
+                                            order  by s.${qo.orderName}  ${qo.orderSort}
+                                    </when>
+                                    <otherwise>
+                                            order by s.id desc
+                                    </otherwise>
+                            </choose>
+                    </when>
+                    <otherwise>
+                            order by s.id desc
+                    </otherwise>
+            </choose>
     </select>
 
 </mapper>