From ed2c46636f30590502699486003af6a0b25e795a Mon Sep 17 00:00:00 2001
From: tamguo <tamguo@Lenovo>
Date: Sun, 2 Sep 2018 15:47:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/tamguo/web/tiku/QuestionContrller.java   | 7 ++++++-
 .../src/main/resources/templates/mobile/questionList.html  | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/tamguo-tms/src/main/java/com/tamguo/web/tiku/QuestionContrller.java b/tamguo-tms/src/main/java/com/tamguo/web/tiku/QuestionContrller.java
index 5c3a72f..9d9dead 100644
--- a/tamguo-tms/src/main/java/com/tamguo/web/tiku/QuestionContrller.java
+++ b/tamguo-tms/src/main/java/com/tamguo/web/tiku/QuestionContrller.java
@@ -20,6 +20,7 @@ import com.tamguo.modules.tiku.model.ChapterEntity;
 import com.tamguo.modules.tiku.model.CourseEntity;
 import com.tamguo.modules.tiku.model.QuestionEntity;
 import com.tamguo.modules.tiku.model.SubjectEntity;
+import com.tamguo.modules.tiku.model.enums.QuestionTypeEnum;
 import com.tamguo.modules.tiku.service.IChapterService;
 import com.tamguo.modules.tiku.service.ICourseService;
 import com.tamguo.modules.tiku.service.IQuestionAnswerService;
@@ -60,6 +61,10 @@ public class QuestionContrller {
 		page.setCurrent(current);
 		page.setSize(size);
 		Page<QuestionEntity> questionList = iQuestionService.selectPage(page , Condition.create().eq("chapter_id", chapterId).orderDesc(Arrays.asList("id")));
+		for(int i=0 ;i<questionList.getRecords().size() ; i++) {
+			QuestionEntity question = questionList.getRecords().get(i);
+			question.setQuestionType(QuestionTypeEnum.getQuestionType(question.getQuestionType()).getDesc());
+		}
 		model.addObject("subject", subject);
 		model.addObject("course", course);
 		model.addObject("chapter", chapter);
@@ -90,7 +95,7 @@ public class QuestionContrller {
 		logger.info("request url :{}" , request.getRequestURI());
 		model.setViewName("question");
 		QuestionEntity question = iQuestionService.selectById(uid);
-		question.setQuestionType(question.getQuestionType());
+		question.setQuestionType(QuestionTypeEnum.getQuestionType(question.getQuestionType()).getDesc());
 		model.addObject("question", question);
 		model.addObject("course", iCourseService.selectById(question.getCourseId()));
 		model.addObject("answerList", iQuestionAnswerService.selectList(Condition.create().eq("question_id", uid).orderDesc(Arrays.asList("create_date"))));
diff --git a/tamguo-tms/src/main/resources/templates/mobile/questionList.html b/tamguo-tms/src/main/resources/templates/mobile/questionList.html
index 3c2584c..7cb1391 100644
--- a/tamguo-tms/src/main/resources/templates/mobile/questionList.html
+++ b/tamguo-tms/src/main/resources/templates/mobile/questionList.html
@@ -379,7 +379,6 @@ body.filter_show {
 								</div>
 							</a>
 						</div>
-						<div class="banner dynamic_group has_bg"></div>
 					</div>
 
 					<!--房源列表-->
@@ -412,6 +411,12 @@ body.filter_show {
 							<li class="pictext" th:each="q,qStat:${questionList.records}">
 								<a th:href="${domainName + 'question/' + q.id + '.html'}" th:utext="${q.content}">
 								</a>
+								<div class="card-name-wrapper" style="padding: 1.5625rem 1.25rem;display: -webkit-flex;display: flex;-webkit-justify-content: space-between;justify-content: space-between;-webkit-align-items: flex-end;align-items: flex-end;padding-bottom: 1rem;">
+	            					<div class="resblock-tags-line">
+		                                <span class="tag" th:text="${q.questionType}">住宅</span><span class="tag" th:text="${q.score }" th:if="${q.score != null}">分数</span><span class="tag" th:text="${q.year}" th:if="${q.year != null}">年份</span>
+		                            </div>
+	                        		<a th:href="${domainName + 'question/' + q.id + '.html'}" class="more post_ulog" style="float:right;">查看解析</a>
+                    			</div>
 							</li>
 
 							<li class="loading_box m_lj_loadingDom">