Merge remote-tracking branch 'origin/master'

twzd-admin/src/main/java/com/miaxis/app/controller/h5/QuestionInfoController.java

@@ -77,10 +77,7 @@ public class QuestionInfoController extends BaseController{
     @GetMapping(value = "/getQuestionInfoByIds")
     @ApiOperation("获取题库详细信息批量取题")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "ids",value = "题目ids" ,dataType = "List", required = true),
-            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
-            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
-    })
+            @ApiImplicitParam(name = "ids",value = "题目ids" ,dataType = "List", required = true)})
     public ResponsePageInfo<QuestionInfo> getQuestionInfoByIds(Long[] ids){
         List<QuestionInfo> list = questionInfoService.selectQuestionInfoListByIds(ids);
         return toResponsePageInfo(list);

twzd-service/src/main/java/com/miaxis/question/mapper/QuestionInfoMapper.java

@@ -57,4 +57,6 @@ public interface QuestionInfoMapper extends BaseMapper<QuestionInfo> {
     List<QuestionInfo> selectTestQuestionInfoList(QuestionInfoTestDTO questionInfoTestDTO);
 
     List<QuestionInfo> selectFreeQuestionInfoList(QuestionInfoFreeDTO freeDTO);
+
+    List<QuestionInfo> selectQuestionInfoListByYdtIds(Long[] ids);
 }

twzd-service/src/main/java/com/miaxis/question/service/IQuestionInfoService.java

@@ -43,5 +43,8 @@ public interface IQuestionInfoService extends IService<QuestionInfo>{
     List<QuestionInfo> selectTestQuestionInfo(QuestionInfoTestDTO questionInfoTestDTO);
 
     List<QuestionInfo> selectFreeQuestionInfo();
+
+    List<QuestionInfo> selectQuestionInfoListByYdtIds(Long[] ids);
+
 }
 

twzd-service/src/main/java/com/miaxis/question/service/impl/QuestionInfoServiceImpl.java

@@ -62,6 +62,11 @@ public class QuestionInfoServiceImpl extends ServiceImpl<QuestionInfoMapper, Que
         return questionInfoMapper.selectQuestionInfoListIds(ids);
     }
 
+    @Override
+    public List<QuestionInfo> selectQuestionInfoListByYdtIds(Long[] ids) {
+        return questionInfoMapper.selectQuestionInfoListByYdtIds(ids);
+    }
+
     @Override
     public List<QuestionInfoJxVO> selectJxQuestionInfo(QuestionInfoFlDTO questionInfoFlDTO) {
         return questionInfoMapper.selectJxQuestionInfo(questionInfoFlDTO);
@@ -150,7 +155,7 @@ public class QuestionInfoServiceImpl extends ServiceImpl<QuestionInfoMapper, Que
                 //旧判断20题
                 questionInfoTestDTO.setQuestionType(1);
                 questionInfoTestDTO.setNum(20);
-                questionInfoTestDTO.setExcellIssueName("必学");
+                questionInfoTestDTO.setExcellIssueName("必");
                 List<QuestionInfo> list1 = questionInfoMapper.selectTestQuestionInfoList(questionInfoTestDTO);
                 //新判断20题
                 questionInfoTestDTO.setQuestionType(1);
@@ -160,7 +165,7 @@ public class QuestionInfoServiceImpl extends ServiceImpl<QuestionInfoMapper, Que
                 //旧选择30题
                 questionInfoTestDTO.setQuestionType(2);
                 questionInfoTestDTO.setNum(30);
-                questionInfoTestDTO.setExcellIssueName("必学");
+                questionInfoTestDTO.setExcellIssueName("必");
                 List<QuestionInfo> list3 = questionInfoMapper.selectTestQuestionInfoList(questionInfoTestDTO);
                 //新选择30题
                 questionInfoTestDTO.setQuestionType(2);

twzd-service/src/main/resources/mapper/qustion/QuestionInfoMapper.xml → twzd-service/src/main/resources/mapper/question/QuestionInfoMapper.xml

@@ -371,4 +371,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
+    <select id="selectQuestionInfoListByYdtIds" parameterType="Long" resultMap="QuestionInfoResult">
+        <include refid="selectQuestionInfoVo"/>
+        <where>
+            and id_ydt in
+            <foreach collection="array" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+
+        </where>
+    </select>
+
+
 </mapper>