Commit 9b182af9 by 阳浪

我的积分

parent ab80b9b8
...@@ -120,7 +120,8 @@ ...@@ -120,7 +120,8 @@
,tb.org_id AS orgId ,tb.org_id AS orgId
,tb.site_id AS siteId ,tb.site_id AS siteId
,tb.biz_type ,tb.biz_type
,tb.page_mode ,tb.page_mode,
tb.create_time
from research tb from research tb
left join tr_research_answer answer on answer.research_id = tb.id and answer.account_id = #{accountId} left join tr_research_answer answer on answer.research_id = tb.id and answer.account_id = #{accountId}
where where
...@@ -137,7 +138,7 @@ ...@@ -137,7 +138,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 tb.create_time desc,t.submitTime desc order by t.create_time desc,t.submitTime desc
</if> </if>
<if test="state == 2"> <if test="state == 2">
select select
...@@ -156,7 +157,8 @@ ...@@ -156,7 +157,8 @@
,tb.org_id AS orgId ,tb.org_id AS orgId
,tb.site_id AS siteId ,tb.site_id AS siteId
,tb.biz_type ,tb.biz_type
,tb.page_mode ,tb.page_mode,
tb.create_time
from research tb from research tb
left join tr_research_answer answer on answer.research_id = tb.id and answer.account_id = #{accountId} left join tr_research_answer answer on answer.research_id = tb.id and answer.account_id = #{accountId}
where where
...@@ -203,7 +205,8 @@ ...@@ -203,7 +205,8 @@
,tb.site_id AS siteId ,tb.site_id AS siteId
,tb.image ,tb.image
,tb.biz_type ,tb.biz_type
,tb.page_mode ,tb.page_mode,
tb.create_time
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)
...@@ -222,7 +225,7 @@ ...@@ -222,7 +225,7 @@
</if> </if>
group by tb.id group by tb.id
)t )t
order by tb.create_time desc,t.endTime desc,id order by t.create_time desc,t.endTime desc,id
</if> </if>
</select> </select>
...@@ -367,7 +370,8 @@ ...@@ -367,7 +370,8 @@
,tb.deleted AS deleted ,tb.deleted AS deleted
,tb.company_id AS companyId ,tb.company_id AS companyId
,tb.org_id AS orgId ,tb.org_id AS orgId
,tb.site_id AS siteId ,tb.site_id AS siteId,
tb.create_time
from research tb from research tb
left join tr_research_answer answer on answer.research_id = tb.id and answer.account_id = #{accountId} left join tr_research_answer answer on answer.research_id = tb.id and answer.account_id = #{accountId}
where where
...@@ -385,7 +389,7 @@ ...@@ -385,7 +389,7 @@
group by tb.id group by tb.id
)t )t
order by tb.create_time desc order by t.create_time desc
-- order by t.submitTime desc -- order by t.submitTime desc
</if> </if>
<if test="state == 2"> <if test="state == 2">
...@@ -403,7 +407,8 @@ ...@@ -403,7 +407,8 @@
,tb.deleted AS deleted ,tb.deleted AS deleted
,tb.company_id AS companyId ,tb.company_id AS companyId
,tb.org_id AS orgId ,tb.org_id AS orgId
,tb.site_id AS siteId ,tb.site_id AS siteId,
tb.create_time
from research tb from research tb
left join tr_research_answer answer on answer.research_id = tb.id and answer.account_id = #{accountId} left join tr_research_answer answer on answer.research_id = tb.id and answer.account_id = #{accountId}
where where
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment