Merge branch 'master' of http://49.234.186.218:9000/root/ieplus

ie-admin/src/main/java/com/ruoyi/web/controller/front/FrontPaperController.java

@@ -78,7 +78,8 @@ public class FrontPaperController {
 
     @ApiOperation("03 知识点树")
     @GetMapping(value = "knowledge")
-    public AjaxResult getKnowledge(@ApiParam("定向") @RequestParam(defaultValue = "false") boolean directed, @ApiParam("科目ID") Long subjectId) {
+    public AjaxResult getKnowledge(@ApiParam("定向") @RequestParam(defaultValue = "false") boolean directed, @ApiParam("科目ID") Long subjectId,
+                                   @ApiParam("考卷题类别0普通2必刷") @RequestParam(required = false) Integer questionType) {
         SysUser sysUser = SecurityUtils.getLoginUser().getUser();
         Set<Long> knowledgeIdSet = null;
         if(directed) {
@@ -87,7 +88,7 @@ public class FrontPaperController {
                 knowledgeIdSet = learnTeacherService.getKnowledgeIdSet(learnStudent.getMajorPlanId(), sysUser.getExamType().name());
             }
         }
-        List<LearnTeacherService.TreeNode> nodeList = learnTeacherService.getKnowledgeTree(sysUser.getExamType().title(), subjectId, knowledgeIdSet, sysUser.getUserId());
+        List<LearnTeacherService.TreeNode> nodeList = learnTeacherService.getKnowledgeTree(sysUser.getExamType().title(), subjectId, knowledgeIdSet, sysUser.getUserId(), questionType);
         if(CollectionUtils.isEmpty(knowledgeIdSet)) {
             return AjaxResult.success(nodeList);
         }

ie-admin/src/main/java/com/ruoyi/web/controller/learn/LearnTeacherController.java

@@ -103,7 +103,7 @@ public class LearnTeacherController extends BaseController {
         if("ExactHand".equals(buildType)) {
             knowledgeIdSet = learnTeacherService.getKnowledgeIdSet(majorPlanId, examType);
         }
-        return AjaxResult.success(learnTeacherService.getKnowledgeTree(examType, subjectId, knowledgeIdSet, null));
+        return AjaxResult.success(learnTeacherService.getKnowledgeTree(examType, subjectId, knowledgeIdSet, null, null));
     }
 
     @GetMapping(value = "classStatistic")

ie-admin/src/main/java/com/ruoyi/web/service/LearnTeacherService.java

@@ -21,6 +21,7 @@ import com.ruoyi.dz.service.IDzSubjectService;
 import com.ruoyi.enums.ExamineeStatus;
 import com.ruoyi.enums.PaperStatus;
 import com.ruoyi.enums.PaperType;
+import com.ruoyi.enums.QuestionType;
 import com.ruoyi.ie.domain.AMarjorPlan;
 import com.ruoyi.ie.mapper.AMarjorPlanMapper;
 import com.ruoyi.learn.domain.*;
@@ -432,7 +433,7 @@ public class LearnTeacherService {
         paperService.savePaper(paper, pqList);
     }
 
-    public List<TreeNode> getKnowledgeTree(String examineeType, Long subjectId, Set<Long> knowledgeIdSet, Long studentId) {
+    public List<TreeNode> getKnowledgeTree(String examineeType, Long subjectId, Set<Long> knowledgeIdSet, Long studentId, Integer questionType) {
         LearnKnowledgeTree ktCond = new LearnKnowledgeTree();
         if (null != subjectId && !subjectId.equals(100L)) {
             ktCond.setSubjectId(subjectId);
@@ -444,6 +445,9 @@ public class LearnTeacherService {
             Map cond = Maps.newHashMap();
             cond.put("studentId", studentId);
             cond.put("knowIds", ktList.stream().map(LearnKnowledgeTree::getId).collect(Collectors.toList()));
+            if(null != questionType && !questionType.equals(0)) {
+                cond.put("types", Lists.newArrayList(QuestionType.Single.getTitle(), QuestionType.Judgment.getTitle()));
+            }
             knowCountMap = Maps.newHashMap();
             for(LearnQuestions qs : learnQuestionsMapper.statByKnowledge(cond)) {
                 knowCountMap.put(qs.getKnowledgeId(), new Integer[] { qs.getNumber().intValue(), qs.getId().intValue(), qs.getYear().intValue()} );

ie-admin/src/main/resources/logback.xml

@@ -27,7 +27,7 @@
 		</encoder>
 		<filter class="ch.qos.logback.classic.filter.LevelFilter">
             <!-- 过滤的级别 -->
-            <level>INFO</level>
+            <level>DEBUG</level>
             <!-- 匹配时的操作：接收（记录） -->
             <onMatch>ACCEPT</onMatch>
             <!-- 不匹配时的操作：拒绝（不记录） -->
@@ -72,7 +72,7 @@
     </appender>
 	
 	<!-- 系统模块日志级别控制  -->
-	<logger name="com.ruoyi" level="info" />
+	<logger name="com.ruoyi" level="debug"/>
 	<!-- Spring日志级别控制  -->
 	<logger name="org.springframework" level="warn" />