Merge remote-tracking branch 'origin/master' into ywx

sstudy/src/main/java/com/xhkjedu/sstudy/controller/subjectbook/SubjectQuestiontypeController.java

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName SubjectQuestiontypeController
@@ -50,8 +51,22 @@ public class SubjectQuestiontypeController {
     @PostMapping("/listsel")
     public ResultVo listSubjectsForSel(@RequestBody TSubjectQuestiontype qtype){
         N_Utils.validation(new Object[]{qtype.getSubjectid(),"科目",1});
-        List<SubjectQuestiontypeVo> lst = subjectQuestiontypeService.listQuestiontypesForSel(qtype);
-        return new ResultVo(0,"查询科目集合成功",lst);
+        List<Map> lst = subjectQuestiontypeService.listQuestiontypesForSel(qtype);
+        return new ResultVo(0,"成功获取题型",lst);
+    }
+
+    /**
+     * @Description 获取题型，英语学科添加听力题
+     * @Param [qtype]
+     * @Return com.xhkjedu.vo.ResultVo
+     * @Author wn
+     * @Date 2022/8/17 10:22
+     **/
+    @PostMapping("/qtypesel")
+    public ResultVo listTypesForSearchQuestion(@RequestBody TSubjectQuestiontype qtype){
+        N_Utils.validation(new Object[]{qtype.getSubjectid(),"科目",1});
+        List<Map> lst = subjectQuestiontypeService.listTypesForSearchQuestion(qtype);
+        return new ResultVo(0,"成功获取题型",lst);
     }
 
     /**

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/subjectbook/SubjectMapper.java

@@ -62,4 +62,7 @@ public interface SubjectMapper extends TkMapper<TSubject> {
 
     //根据科目ids获取名称列表
     List<Map<String, String>> listNameByIds(@Param("subjectids") List<String> subjectids);
+
+    //根据科目id获取科目名称
+    String getSubjectnameById(@Param("subjectid") String subjectid);
 }

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/subjectbook/SubjectQuestiontypeMapper.java

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName SubjectQuestiontype
@@ -19,7 +20,10 @@ public interface SubjectQuestiontypeMapper extends TkMapper<TSubjectQuestiontype
 
     List<TSubjectQuestiontype> listQuestiontypes(@Param("type") TSubjectQuestiontype type);
 
-    List<SubjectQuestiontypeVo> listQuestiontypesForSel(@Param("type") TSubjectQuestiontype type);
+    List<Map> listQuestiontypesForSel(@Param("type") TSubjectQuestiontype type);
+
+    //获取有听力题的题型
+    List<Map> listQtypesHasHear(@Param("type") TSubjectQuestiontype type);
 
     //查找使用题型的模块
     String findUseModule(String qtypeid);

sstudy/src/main/java/com/xhkjedu/sstudy/model/question/TQuestion.java

@@ -24,7 +24,10 @@ public class TQuestion extends BaseBean {
     //处理题型1单选题2多选题3主观题4判断对错5判断√×6判断TF7完形填空8阅读理解9课堂画图题10任务型阅读11复合题12听力题
     private Integer ctype;
 
-    //听力题文件ctype=12
+    //是否是听力题0不是1是
+    private Integer hashear;
+
+    //听力题文件地址
     private String hearfile;
 
     //试题题型id

sstudy/src/main/java/com/xhkjedu/sstudy/model/subjectbook/TSubjectQuestiontype.java

@@ -25,6 +25,9 @@ public class TSubjectQuestiontype extends BaseBean {
     //处理题型1单选题2多选题3主观题4判断对错5判断✔6判断TF7完形填空8阅读理解
     private Integer ctype;
 
+    //是否删除0未删除1已删除
+    private Integer deleted;
+
     //创建人id
     private Integer createid;
 

sstudy/src/main/java/com/xhkjedu/sstudy/service/subjectbook/SubjectQuestiontypeService.java

@@ -1,5 +1,6 @@
 package com.xhkjedu.sstudy.service.subjectbook;
 
+import com.xhkjedu.sstudy.mapper.subjectbook.SubjectMapper;
 import com.xhkjedu.sstudy.mapper.subjectbook.SubjectQuestiontypeMapper;
 import com.xhkjedu.sstudy.model.subjectbook.TSubjectQuestiontype;
 import com.xhkjedu.sstudy.utils.StudyUtil;
@@ -8,7 +9,9 @@ import com.xhkjedu.sstudy.vo.subjectbook.SubjectQuestiontypeVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName SubjectQuestiontypeService
@@ -20,6 +23,8 @@ import java.util.List;
 public class SubjectQuestiontypeService {
     @Autowired
     private SubjectQuestiontypeMapper subjectQuestiontypeMapper;
+    @Autowired
+    private SubjectMapper subjectMapper;
 
     /**
      *功能描述 获取科目下所有题型
@@ -39,7 +44,7 @@ public class SubjectQuestiontypeService {
      * @param  * @param sqtype
      * @return java.util.List<com.xhkjedu.vo.subjectbook.SubjectQuestiontypeVo>
      */
-    public List<SubjectQuestiontypeVo> listQuestiontypesForSel(TSubjectQuestiontype sqtype){
+    public List<Map> listQuestiontypesForSel(TSubjectQuestiontype sqtype){
         return subjectQuestiontypeMapper.listQuestiontypesForSel(sqtype);
     }
 
@@ -52,6 +57,7 @@ public class SubjectQuestiontypeService {
      */
     public Integer addQuestiontype(TSubjectQuestiontype sqtype){
         String id = StudyUtil.getId();
+        sqtype.setDeleted(0);
         sqtype.setQtypeid(id);
         sqtype.setCreatetime(N_Utils.getSecondTimestamp());
         return subjectQuestiontypeMapper.insertSelective(sqtype);
@@ -89,4 +95,29 @@ public class SubjectQuestiontypeService {
         }
         return useModule;
     }
-}
+
+    /**
+     * @Description 获取题型，英语学科添加听力题
+     * @Param [sqtype]
+     * @Return java.util.List<java.util.Map>
+     * @Author wn
+     * @Date 2022/8/17 10:21
+     **/
+    public List<Map> listTypesForSearchQuestion(TSubjectQuestiontype sqtype) {
+        List<Map> list = subjectQuestiontypeMapper.listQuestiontypesForSel(sqtype);
+        //根据科目id获取科目名称
+        String  subjectname = subjectMapper.getSubjectnameById(sqtype.getSubjectid());
+        if(subjectname.contains("英语")){
+            //如果是英语题获取英语题对应试题包含听力题的题型
+            List<Map> heartypes = subjectQuestiontypeMapper.listQtypesHasHear(sqtype);
+            if(heartypes!=null && heartypes.size()>0){
+                Map tlmap = new HashMap();
+                tlmap.put("qtypename","听力题");
+                tlmap.put("qtypes",heartypes);
+                list.add(0,tlmap);
+            }
+        }
+        return list;
+    }
+
+    }

sstudy/src/main/java/com/xhkjedu/sstudy/vo/question/QuestionVo.java

@@ -45,6 +45,9 @@ public class QuestionVo {
     //创建人
     private String createname;
 
+    //是否是听力题0不是1是
+    private Integer hashear;
+
     //听力题文件地址
     private String hearfile;
 

sstudy/src/main/resources/mapper/question/QuestionMapper.xml

@@ -68,6 +68,7 @@
         <result property="count" column="count"></result>
         <result property="directorid" column="directorid"></result>
         <result property="directorname" column="directorname"></result>
+        <result property="hashear" column="hashear"></result>
         <result property="hearfile" column="hearfile"></result>
         <result property="belong" column="belong"></result>
         <result property="createid" column="createid"></result>
@@ -102,7 +103,7 @@
         where qp.questionid=#{questionid}
     </select>
     <select id="listQuestions" resultMap="questionResult">
-        select q.questionid,q.score,q.complexity,q.ctype,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.belong
+        select q.questionid,q.score,q.complexity,q.ctype,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.belong,q.hashear,q.hearfile
         ,q.qtypeid,q.qtypename,q.createtime,u.username createname,q.count,qd.directorid,d.directorname,0 pointid
         from t_question q left join t_user u on u.userid = q.createid
         left join t_question_director qd on q.questionid=qd.questionid
@@ -116,7 +117,7 @@
     <select id="findById" resultMap="questionResult">
         select q.questionid,q.score,q.complexity,q.ctype,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.belong
         ,q.qtypeid,q.qtypename,q.createtime,q.source,q.year,q.region,q.schoolname,q.subjectid,q.schoolid
-        ,qd.directorid,d.directorall directorname,d.lsbid,q.hearfile,q.qlevel,
+        ,qd.directorid,d.directorall directorname,d.lsbid,q.hashear,q.hearfile,q.qlevel,
         sb.level,sb.subjectid,s.subjectname,v.versionname,sb.lsbname
         ,(select a.areaall from t_areazone a where a.areacode=q.region)areaall
         from t_question q left join t_question_director qd on q.questionid=qd.questionid
@@ -213,6 +214,7 @@
         <result property="schoolname" column="schoolname"></result>
         <result property="qlevel" column="qlevel"></result>
         <result property="snum" column="snum"></result>
+        <result property="hashear" column="hashear"></result>
         <result property="hearfile" column="hearfile"></result>
         <collection property="sonqlist" ofType="java.util.Map"
                     column="questionid" select="listSonQuestionForSelect">
@@ -223,7 +225,7 @@
     <select id="listForSelect" resultMap="directPointQuestions">
         select q.questionid,q.score,q.complexity,q.qstem,q.qoption,q.qanswer,q.qanalyze
         ,q.qtypeid,q.qtypename,q.count,GROUP_CONCAT(p.pointname)points,q.ctype
-        ,q.source,q.year,q.region,q.schoolname,q.qlevel,q.hearfile
+        ,q.source,q.year,q.region,q.schoolname,q.qlevel,q.hearfile,q.hashear
         from t_question q left join t_question_point qp on q.questionid = qp.questionid
         left join t_point p on p.pointid=qp.pointid
         left join t_question_director qd on q.questionid=qd.questionid
@@ -301,12 +303,12 @@
     <!--批量保存-->
     <insert id="saveBathQuestion" parameterType="com.xhkjedu.sstudy.model.question.TQuestion">
         INSERT INTO t_question (questionid,qstem,qstemtxt,qoption,qanswer,qanalyze,score,complexity,
-                                ctype,hearfile,qtypeid,qtypename, subjectid,qlevel,snum,sorder,questionpid,
+                                ctype,hashear,hearfile,qtypeid,qtypename, subjectid,qlevel,snum,sorder,questionpid,
                                 qstate,source,year,region,schoolname,createid,createtime,belong,schoolid)
         VALUES
         <foreach collection ="list" item="p" index= "index" separator =",">
             (#{p.questionid},#{p.qstem},#{p.qstemtxt},#{p.qoption},#{p.qanswer},#{p.qanalyze},#{p.score},#{p.complexity},
-             #{p.ctype},#{p.hearfile},#{p.qtypeid},#{p.qtypename},#{p.subjectid},#{p.qlevel},#{p.snum},#{p.sorder},#{p.questionpid},
+             #{p.ctype},#{p.hashear},#{p.hearfile},#{p.qtypeid},#{p.qtypename},#{p.subjectid},#{p.qlevel},#{p.snum},#{p.sorder},#{p.questionpid},
              #{p.qstate},#{p.source},#{p.year},#{p.region},#{p.schoolname},#{p.createid},#{p.createtime},#{p.belong},#{p.schoolid})
         </foreach>
     </insert>

sstudy/src/main/resources/mapper/subjectbook/SubjectMapper.xml

@@ -64,4 +64,9 @@
             #{subjectid}
         </foreach>
     </select>
+
+    <!--根据科目id获取科目名称-->
+    <select id="getSubjectnameById" resultType="java.lang.String">
+        select subjectname from t_subject where subjectid=#{subjectid}
+    </select>
 </mapper>

sstudy/src/main/resources/mapper/subjectbook/SubjectQuestiontypeMapper.xml

@@ -7,7 +7,7 @@
         SELECT s.qtypeid,s.qtypename,s.subjectid,s.qtypeorder,s.ctype,s.createid,s.createtime,
         u.username AS createname,s.belong
         FROM t_subject_questiontype s LEFT JOIN t_user u ON s.createid=u.userid
-        WHERE s.subjectid=#{type.subjectid} and (s.belong=1
+        WHERE s.subjectid=#{type.subjectid} and s.deleted=0 and (s.belong=1
         <if test="type.schoolid!=null">
             or s.schoolid=#{type.schoolid}
         </if>)
@@ -15,15 +15,27 @@
     </select>
 
     <!-- 根据科目下题型列表用于选择题型 -->
-    <select id="listQuestiontypesForSel" resultType="com.xhkjedu.sstudy.vo.subjectbook.SubjectQuestiontypeVo">
+    <select id="listQuestiontypesForSel" resultType="java.util.Map">
         SELECT qtypeid,qtypename,qtypeorder,ctype,belong from t_subject_questiontype
-        WHERE subjectid=#{type.subjectid} and (belong=1
+        WHERE subjectid=#{type.subjectid} and deleted=0 and (belong=1
         <if test="type.schoolid!=null">
             or schoolid=#{type.schoolid}
         </if>)
         order by qtypeorder asc
     </select>
 
+    <!--获取有听力题的题型-->
+    <select id="listQtypesHasHear" resultType="java.util.Map">
+        select q.qtypeid,s.qtypename,s.qtypeorder,s.ctype,s.belong from t_question q
+        left join t_subject_questiontype s on q.qtypeid=s.qtypeid
+        where q.hashear=1 and q.qstate=1 and q.subjectid=#{type.subjectid} and s.deleted=0
+        and (q.belong=1
+        <if test="type.schoolid!=null">
+            or q.schoolid=#{type.schoolid}
+        </if>)
+        group by q.qtypeid order by s.qtypeorder
+    </select>
+
     <!--查找使用题型的模块-->
     <select id="findUseModule" resultType="java.lang.String">
         SELECT CONCAT((select (case when count(*)>0 then '试题' else '' end) from t_question where qtypeid=#{qtypeid})