1. 题库增加上下架状态

admin-core/src/main/java/com/ibeetl/admin/core/util/enums/CoreDictType.java

@@ -14,5 +14,8 @@ public class CoreDictType {
    // 资源类型
    public static final  String RESOURCES_INFO_TYPE="resources_info_type";
 
+   // 上下架状态
+   public static final  String UP_STATUS="up_status";
+
     
 }

web/src/main/java/com/ibeetl/jlw/entity/ResourcesQuestion.java

@@ -73,6 +73,10 @@ public class ResourcesQuestion extends BaseEntity{
     //解析
 
     private String questionAnalysis ;
+
+    // 上下架状态
+
+    private Integer questionStatus;
 	
     //组织机构ID
 
@@ -267,5 +271,11 @@ public class ResourcesQuestion extends BaseEntity{
         this.userId = userId;
     }
 
+    public Integer getQuestionStatus() {
+        return questionStatus;
+    }
 
+    public void setQuestionStatus(Integer questionStatus) {
+        this.questionStatus = questionStatus;
+    }
 }

web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionService.java

@@ -72,7 +72,7 @@ public class ResourcesQuestionService extends CoreBaseService<ResourcesQuestion>
     }
 
     public boolean add (ResourcesQuestion resourcesQuestion){
-
+        resourcesQuestion.setQuestionStatus(1);
         resourcesQuestionDao.insert(resourcesQuestion,true);
 
         CourseInfo courseInfo = courseInfoDao.single(resourcesQuestion.getCourseInfoId());

web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionQuery.java

@@ -1,11 +1,14 @@
 package com.ibeetl.jlw.web.query;
 
 import com.ibeetl.admin.core.annotation.Query;
+import com.ibeetl.admin.core.util.enums.CoreDictType;
 import com.ibeetl.admin.core.web.query.PageParam;
 import com.ibeetl.jlw.entity.ResourcesQuestion;
 
 import java.math.BigDecimal;
 
+import static com.ibeetl.admin.core.annotation.Query.TYPE_DICT;
+
 /**
  *ResourcesQuestion查询
  */
@@ -34,6 +37,8 @@ public class ResourcesQuestionQuery extends PageParam {
     private String questionAnswer;
     @Query(name = "解析", display = false)
     private String questionAnalysis;
+    @Query(name = "题目状态（1上架，0下架）", display = true, type = TYPE_DICT,dict= CoreDictType.UP_STATUS)
+    private Integer questionStatus;
     @Query(name = "组织机构ID", display = false)
     private Long orgId;
     @Query(name = "后台用户ID", display = false)
@@ -159,6 +164,7 @@ public class ResourcesQuestionQuery extends PageParam {
         pojo.setQuestionOptionE(this.getQuestionOptionE());
         pojo.setQuestionAnswer(this.getQuestionAnswer());
         pojo.setQuestionAnalysis(this.getQuestionAnalysis());
+        pojo.setQuestionStatus(this.getQuestionStatus());
         pojo.setOrgId(this.getOrgId());
         pojo.setUserId(this.getUserId());
         return pojo;
@@ -212,4 +218,12 @@ public class ResourcesQuestionQuery extends PageParam {
     public void setJudgeNum(Integer judgeNum) {
         this.judgeNum = judgeNum;
     }
+
+    public Integer getQuestionStatus() {
+        return questionStatus;
+    }
+
+    public void setQuestionStatus(Integer questionStatus) {
+        this.questionStatus = questionStatus;
+    }
 }

web/src/main/java/com/ibeetl/jlw/web/query/StudentQuery.java

@@ -290,6 +290,7 @@ public class StudentQuery extends PageParam {
         pojo.setOrgId(this.getOrgId());
         pojo.setUserId(this.getUserId());
         pojo.setHeadImg(this.getHeadImg());
+        pojo.setStudentWeixinInfo(this.getStudentWeixinInfo());
         return pojo;
      }
 
@@ -431,4 +432,11 @@ public class StudentQuery extends PageParam {
         this.orderByResourcesTrainingProportion = orderByResourcesTrainingProportion;
     }
 
+    public String getStudentWeixinInfo() {
+        return studentWeixinInfo;
+    }
+
+    public void setStudentWeixinInfo(String studentWeixinInfo) {
+        this.studentWeixinInfo = studentWeixinInfo;
+    }
 }

web/src/main/resources/sql/jlw/resourcesQuestion.md

@@ -81,6 +81,9 @@ queryByCondition
     @if(!isEmpty(userId)){
         and t.user_id =#userId#
     @}
+    @if(!isEmpty(questionStatus)){
+        and t.question_status =#questionStatus#
+    @}
     ORDER BY t.resources_question_id DESC