过期任务查看问卷修复

cloud-research-api/src/main/java/com/yizhi/research/application/vo/domain/ResearchVo.java

@@ -207,7 +207,7 @@ public class ResearchVo {
     
     
     private List<TrResearchAnswerVo> trResearchAnswerVos;
     private List<TrResearchAnswerVo> trResearchAnswerVos;
 
 
-    @ApiModelProperty(value = "搜索列表显示状态：0未开始，1已完成，2进行中，3已过期，4未参加调研")
+    @ApiModelProperty(value = "搜索列表显示状态：0未开始，1已完成，2进行中，3已过期，4未参加调研, 5已过期未调研")
     
     
     private Integer finishState;
     private Integer finishState;
 
 

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

@@ -617,16 +617,14 @@
 	</select>
 	</select>
 	
 	
 	<select id="selectResearchDetails" resultType="com.yizhi.research.application.vo.domain.ResearchVo">
 	<select id="selectResearchDetails" resultType="com.yizhi.research.application.vo.domain.ResearchVo">
+        <![CDATA[
             select distinct answer.submit_time as submitTime,
             select distinct answer.submit_time as submitTime,
-            CASE WHEN <![CDATA[ tb.start_time > NOW() ]]> THEN 0 ELSE 
-            	CASE WHEN <![CDATA[ tb.start_time >= NOW() ]]> AND answerf.finish IS NULL THEN 4 ELSE 
-            		CASE WHEN answerf.finish=1 THEN 1 ELSE 
-            			CASE WHEN <![CDATA[ tb.end_time < NOW() ]]> THEN 3 ELSE 
-            			2 
-            			END 
-            		END 
-            	END 
-            END AS finishState
+            case when tb.start_time > NOW() then 0
+                 when answerf.finish=1 then 1
+                 when tb.end_time < NOW()  and answerf.finish IS NULL THEN 5
+                 when tb.start_time <= NOW() and tb.end_time >= NOW() and answerf.finish IS NULL THEN 4
+                 when tb.end_time < NOW() then 3
+            else 2 end finishState
             ,tb.id AS id
             ,tb.id AS id
             ,answer.submit_time as finishTime
             ,answer.submit_time as finishTime
             ,tb.research_no AS researchNo
             ,tb.research_no AS researchNo
@@ -643,5 +641,6 @@
             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=0
             left join tr_research_answer answerf on answer.research_id = tb.id and answerf.account_id = #{accountId} and answerf.finish=0
             where tb.id=#{id} and tb.deleted = 0 and tb.site_id = #{siteId}
             where tb.id=#{id} and tb.deleted = 0 and tb.site_id = #{siteId}
+        ]]>
     </select>
     </select>
 </mapper>
 </mapper>