Merge branch 'dev' into 'master'

问卷返回类型

See merge request !8

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

@@ -577,7 +577,12 @@
     <select id="getResearchTop" resultType="com.yizhi.research.application.vo.domain.ResearchVo">
     <select id="getResearchTop" resultType="com.yizhi.research.application.vo.domain.ResearchVo">
 		select tb.id,tb.name,tb.image AS logo_img,tb.create_by_name,tb.create_time
 		select tb.id,tb.name,tb.image AS logo_img,tb.create_by_name,tb.create_time
         from research tb
         from research tb
-        where tb.site_id = #{siteId} and tb.biz_type = #{bizType} and tb.state = 1 and tb.top_up = 1 and tb.deleted = 0
+        where tb.site_id = #{siteId} 
+        <if test="bizType != null ">
+            and tb.biz_type = #{bizType}
+        </if>)
+        and tb.state = 1 and tb.top_up = 1 and tb.deleted = 0
+        order by update_time DESC
 	</select>
 	</select>
 	
 	
 	<select id="selectResearchDetails" resultType="com.yizhi.research.application.vo.domain.ResearchVo">
 	<select id="selectResearchDetails" resultType="com.yizhi.research.application.vo.domain.ResearchVo">
@@ -602,6 +607,7 @@
             ,tb.image
             ,tb.image
             ,tb.page_mode
             ,tb.page_mode
             ,tb.vote_num
             ,tb.vote_num
+            ,tb.biz_type
             from research tb
             from research tb
             left join tr_research_answer answer on answer.research_id = tb.id and answer.account_id = #{accountId} and answer.finish=1
             left join tr_research_answer answer on answer.research_id = tb.id and answer.account_id = #{accountId} and answer.finish=1
             left join tr_research_answer answerf on answer.research_id = tb.id and answerf.account_id = #{accountId} and answerf.finish in(0,1)
             left join tr_research_answer answerf on answer.research_id = tb.id and answerf.account_id = #{accountId} and answerf.finish in(0,1)