小么熊🐻 3 年 前
コミット
85d919eedd

+ 13 - 4
jpcj-admin/src/main/java/com/miaxis/app/controller/h5/QuestionInfoController.java

@@ -5,10 +5,7 @@ import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.page.ResponsePageInfo;
 import com.miaxis.question.domain.QuestionInfo;
-import com.miaxis.question.dto.QuestionInfoDTO;
-import com.miaxis.question.dto.QuestionInfoFlDTO;
-import com.miaxis.question.dto.QuestionInfoFreeDTO;
-import com.miaxis.question.dto.QuestionInfoTestDTO;
+import com.miaxis.question.dto.*;
 import com.miaxis.question.service.IQuestionInfoService;
 import com.miaxis.question.vo.QuestionInfoDfVO;
 import com.miaxis.question.vo.QuestionInfoFlVO;
@@ -185,5 +182,17 @@ public class QuestionInfoController extends BaseController{
         return toResponsePageInfo(list);
     }
 
+
+    /**
+     * 查询秘密卷
+     */
+    @GetMapping("/selectMiQuestionInfoList")
+    @ApiOperation("查询秘密卷")
+    public ResponsePageInfo<QuestionInfo> selectMiQuestionInfoList(@ModelAttribute QuestionInfoMiDTO questionInfoMiDTO){
+        List<QuestionInfo> list = questionInfoService.selectMiQuestionInfoList(questionInfoMiDTO);
+        return toResponsePageInfo(list);
+    }
+
+
 }
 

+ 3 - 0
jpcj-service/src/main/java/com/miaxis/question/domain/QuestionInfo.java

@@ -262,4 +262,7 @@ public class QuestionInfo extends BaseBusinessEntity{
     @ApiModelProperty(value = "是否新规 0否 1是")
     private Integer isNew;
 
+
+
+
 }

+ 29 - 0
jpcj-service/src/main/java/com/miaxis/question/dto/QuestionInfoMiDTO.java

@@ -0,0 +1,29 @@
+package com.miaxis.question.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 地方题选分类返回对象
+ * @author miaxis
+ * @date 2021-10-20
+ */
+@Data
+@ApiModel(value = "QuestionInfoMiDTO", description = "秘卷输入对象")
+public class QuestionInfoMiDTO {
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "科目 科目一:1; 科目一:4")
+    private Integer kemu;
+
+    @ApiModelProperty(value = "取题车型 小车:xc;客车:kc;货车:hc;摩托车:mtc")
+    private String gs;
+
+    @ApiModelProperty(value = "类型 3:秘卷1  4:秘卷2  ")
+    private Integer category;
+
+}

+ 2 - 0
jpcj-service/src/main/java/com/miaxis/question/mapper/QuestionInfoMapper.java

@@ -61,4 +61,6 @@ public interface QuestionInfoMapper extends BaseMapper<QuestionInfo> {
     List<QuestionInfo> selectFreeQuestionInfoList(QuestionInfoFreeDTO freeDTO);
 
     List<QuestionInfo> selectQuestionInfoListByYdtIds(Long[] ids);
+
+    List<QuestionInfo> selectMiQuestionInfoList(QuestionInfoMiDTO questionInfoMiDTO);
 }

+ 1 - 0
jpcj-service/src/main/java/com/miaxis/question/service/IQuestionInfoService.java

@@ -46,5 +46,6 @@ public interface IQuestionInfoService extends IService<QuestionInfo>{
 
     List<QuestionInfo> selectTestK14QuestionInfoList(QuestionInfoTestDTO questionInfoTestDTO);
 
+    List<QuestionInfo> selectMiQuestionInfoList(QuestionInfoMiDTO questionInfoMiDTO);
 }
 

+ 8 - 0
jpcj-service/src/main/java/com/miaxis/question/service/impl/QuestionInfoServiceImpl.java

@@ -315,4 +315,12 @@ public class QuestionInfoServiceImpl extends ServiceImpl<QuestionInfoMapper, Que
         return allList;
     }
 
+    @Override
+    public List<QuestionInfo> selectMiQuestionInfoList(QuestionInfoMiDTO questionInfoMiDTO) {
+        return questionInfoMapper.selectMiQuestionInfoList(questionInfoMiDTO);
+    }
+
+
+
+
 }

+ 11 - 0
jpcj-service/src/main/resources/mapper/question/QuestionInfoMapper.xml

@@ -445,4 +445,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
+    <select id="selectMiQuestionInfoList" parameterType="QuestionInfoMiDTO" resultMap="QuestionInfoResult">
+        select * from
+            (select * from question_info t2 join
+                           (SELECT substring_index(group_concat(t.id order by t.id desc ),',',1) maxid FROM question_info t GROUP BY t.id_ydt) t1 on t2.id = t1.maxid) t3
+                JOIN t_app_question_category tt ON t3.id_ydt = tt.question_id where tt.gs = #{gs} AND tt.kemu = #{kemu} and tt.category = #{category}
+
+    </select>
+
+
+
+
 </mapper>