From 3753dca7ab80c555e874b7d14d4d5c8d6785e7a3 Mon Sep 17 00:00:00 2001 From: tamguo Date: Sat, 8 Sep 2018 16:44:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tiku/service/impl/PaperServiceImpl.java | 39 ++++++++++++++++++- .../resources/templates/mobile/paper.html | 4 +- .../resources/templates/mobile/question.html | 4 +- .../resources/templates/mobile/subject.html | 18 ++++----- 4 files changed, 50 insertions(+), 15 deletions(-) diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/PaperServiceImpl.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/PaperServiceImpl.java index 42a4f64..915f419 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/PaperServiceImpl.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/PaperServiceImpl.java @@ -16,14 +16,23 @@ import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.tamguo.common.utils.Result; import com.tamguo.common.utils.SystemConstant; import com.tamguo.config.redis.CacheService; +import com.tamguo.modules.sys.service.ISysAreaService; import com.tamguo.modules.tiku.dao.PaperMapper; import com.tamguo.modules.tiku.dao.QuestionMapper; import com.tamguo.modules.tiku.model.PaperEntity; +import com.tamguo.modules.tiku.service.ICourseService; import com.tamguo.modules.tiku.service.IPaperService; +import com.tamguo.modules.tiku.service.ISubjectService; @Service public class PaperServiceImpl extends ServiceImpl implements IPaperService{ + @Autowired + private ISubjectService iSubjectService; + @Autowired + private ICourseService iCourseService; + @Autowired + private ISysAreaService iSysAreaService; @Autowired private PaperMapper paperMapper; @Autowired @@ -37,7 +46,13 @@ public class PaperServiceImpl extends ServiceImpl impl List paperList = (List) cacheService.getObject(SystemConstant.HISTORY_PAPER); if(paperList == null){ Page page = new Page<>(1 , 6); - paperList = paperMapper.selectPage(page, Condition.create().eq("type", SystemConstant.ZHENGTI_PAPER_ID).eq("area_id", SystemConstant.BEIJING_AREA_ID).orderDesc(Arrays.asList("id"))); + paperList = paperMapper.selectPage(page, Condition.create().eq("type", SystemConstant.ZHENGTI_PAPER_ID).orderDesc(Arrays.asList("id"))); + for(int i=0 ; i impl List paperList = (List) cacheService.getObject(SystemConstant.SIMULATION_PAPER); if(paperList == null){ Page page = new Page<>(1 , 6); - paperList = paperMapper.selectPage(page, Condition.create().eq("type", SystemConstant.MONI_PAPER_ID).eq("area_id", SystemConstant.BEIJING_AREA_ID).orderDesc(Arrays.asList("id"))); + paperList = paperMapper.selectPage(page, Condition.create().eq("type", SystemConstant.MONI_PAPER_ID).orderDesc(Arrays.asList("id"))); + for(int i=0 ; i impl if(paperList == null){ Page page = new Page<>(1 , 10); paperList = paperMapper.selectPage(page, Condition.create().orderDesc(Arrays.asList("id"))); + for(int i=0 ; i impl return Result.result(Result.SUCCESS_CODE, paper, "修改成功"); } + public ISubjectService getiSubjectService() { + return iSubjectService; + } + + public void setiSubjectService(ISubjectService iSubjectService) { + this.iSubjectService = iSubjectService; + } + } diff --git a/tamguo-tms/src/main/resources/templates/mobile/paper.html b/tamguo-tms/src/main/resources/templates/mobile/paper.html index 143b409..30588d7 100644 --- a/tamguo-tms/src/main/resources/templates/mobile/paper.html +++ b/tamguo-tms/src/main/resources/templates/mobile/paper.html @@ -394,7 +394,7 @@ body.filter_show {
-
+
diff --git a/tamguo-tms/src/main/resources/templates/mobile/question.html b/tamguo-tms/src/main/resources/templates/mobile/question.html index e8c4013..bddb951 100644 --- a/tamguo-tms/src/main/resources/templates/mobile/question.html +++ b/tamguo-tms/src/main/resources/templates/mobile/question.html @@ -385,7 +385,7 @@ body.filter_show {
-
+ diff --git a/tamguo-tms/src/main/resources/templates/mobile/subject.html b/tamguo-tms/src/main/resources/templates/mobile/subject.html index ae03650..d455bd0 100644 --- a/tamguo-tms/src/main/resources/templates/mobile/subject.html +++ b/tamguo-tms/src/main/resources/templates/mobile/subject.html @@ -74,11 +74,11 @@
理科数学 东城区2017年高三上学期期末考试
北京 北京 真题 理科数学 + th:title="${p.courseName}" th:text="${p.courseName}">理科数学
@@ -106,11 +106,11 @@
理科数学 东城区2017年高三上学期期末考试
北京 北京 真题 模拟 理科数学 + th:title="${p.courseName}" th:text="${p.courseName}">理科数学
@@ -127,7 +127,7 @@ data-ulog_search="ljweb_id=30001&ljweb_mod=m_pages_homepage_recommend-ershoufang&ljweb_bl=more&ljweb_strategy_id=default" data-evtid_lazyaction="10889" data-ulog_lazyaction="recommend_module=m_ershou_shouye&fb_service_id=100001&fb_context_id={"req_source_type":"zhiying_m"}&fb_expo_id=r87474238291230720&fb_strategy_id=10000076&fb_item_type=ershou_house&fb_item_detail=107000203369&fb_item_location=1&fb_ab_test_flag=reco_rule-100001-default-default&fb_response_ts=1535591483&fb_query_id=188971149" - th:href="${domainName}">为您推荐模拟试卷更多 + th:href="${domainName}">为您推荐热门试卷更多
    @@ -138,11 +138,11 @@
    理科数学 东城区2017年高三上学期期末考试
    北京 北京 真题 热门 理科数学 + th:title="${p.courseName}" th:text="${p.courseName}">理科数学