活动导出

cloud-research-service/src/main/java/com/yizhi/research/application/mapper/ResearchMapper.xml

@@ -137,7 +137,7 @@
             and <![CDATA[ tb.end_time > #{now} ]]> and answer.id is not null and answer.finish = 1
             and <![CDATA[ tb.end_time > #{now} ]]> and answer.id is not null and answer.finish = 1
             group by tb.id
             group by tb.id
             )t
             )t
-            order by t.submitTime desc
+            order by tb.create_time desc,t.submitTime desc
         </if>
         </if>
         <if test="state == 2">
         <if test="state == 2">
             select
             select
@@ -173,7 +173,7 @@
             and <![CDATA[ tb.end_time > #{now} ]]>and <![CDATA[ tb.start_time < #{now} ]]> and ( answer.id is null or
             and <![CDATA[ tb.end_time > #{now} ]]>and <![CDATA[ tb.start_time < #{now} ]]> and ( answer.id is null or
             answer.finish = 0)
             answer.finish = 0)
             group by tb.id
             group by tb.id
-            order by tb.end_time
+            order by tb.create_time desc,tb.end_time
         </if>
         </if>
         
         
         <if test="state == null">
         <if test="state == null">
@@ -222,7 +222,7 @@
             </if>
             </if>
             group by tb.id
             group by tb.id
             )t
             )t
-            order by t.endTime desc,id
+            order by tb.create_time desc,t.endTime desc,id
         </if>
         </if>
     </select>
     </select>
 
 
@@ -384,7 +384,9 @@
             and <![CDATA[ tb.end_time > #{now} ]]> and answer.id is not null and answer.finish = 1
             and <![CDATA[ tb.end_time > #{now} ]]> and answer.id is not null and answer.finish = 1
             group by tb.id
             group by tb.id
             )t
             )t
-            order by t.submitTime desc
+
+            order by tb.create_time desc
+            -- order by t.submitTime desc
         </if>
         </if>
         <if test="state == 2">
         <if test="state == 2">
             select
             select
@@ -418,7 +420,8 @@
             and <![CDATA[ tb.end_time > #{now} ]]>and <![CDATA[ tb.start_time < #{now} ]]> and ( answer.id is null or
             and <![CDATA[ tb.end_time > #{now} ]]>and <![CDATA[ tb.start_time < #{now} ]]> and ( answer.id is null or
             answer.finish = 0)
             answer.finish = 0)
             group by tb.id
             group by tb.id
-            order by tb.end_time
+            order by tb.create_time desc
+           -- order by tb.end_time
         </if>
         </if>
         
         
         <if test="state == null">
         <if test="state == null">
@@ -439,6 +442,7 @@
             	and tb.biz_type=#{bizType}
             	and tb.biz_type=#{bizType}
             </if>
             </if>
             group by tb.id
             group by tb.id
+            order by tb.create_time desc
         </if>
         </if>
         )ttt
         )ttt
     </select>
     </select>