PC做题修改

jpcj-admin/src/main/java/com/miaxis/app/controller/h5/QuestionCollectionController.java

@@ -56,6 +56,7 @@ public class QuestionCollectionController extends BaseController {
         QuestionCollection questionCollection = new QuestionCollection();
         BeanUtils.copyProperties(questionCollectionDTO, questionCollection);
         questionCollection.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
+        questionCollection.setDeviceType(1);
         return toResponse(questionCollectionService.save(questionCollection) ? 1 : 0);
     }
 

jpcj-admin/src/main/java/com/miaxis/app/controller/h5/QuestionWrongController.java

@@ -52,6 +52,7 @@ public class QuestionWrongController extends BaseController {
         QuestionWrong questionWrong = new QuestionWrong();
         BeanUtils.copyProperties(questionWrongDTO, questionWrong);
         questionWrong.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
+        questionWrong.setDeviceType(1);
         return toResponse(questionWrongService.save(questionWrong) ? 1 : 0);
     }
 
@@ -73,6 +74,7 @@ public class QuestionWrongController extends BaseController {
             questionWrong.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
             questionWrong.setKm(wrong.getKm());
             questionWrong.setQuestionId(wgYunDTO.getId());
+            questionWrong.setDeviceType(1);
             Date crDate = new Date(wgYunDTO.getTimestamp());
             questionWrong.setCreateTime(crDate);
             qlist.add(questionWrong);
@@ -102,6 +104,7 @@ public class QuestionWrongController extends BaseController {
             questionWrong.setUserId(userId);
             questionWrong.setKm(wrong.getKm());
             questionWrong.setQuestionId(wgYunDTO.getId());
+            questionWrong.setDeviceType(1);
             Date crDate = new Date(wgYunDTO.getTimestamp());
             questionWrong.setCreateTime(crDate);
             qlist.add(questionWrong);
@@ -124,6 +127,7 @@ public class QuestionWrongController extends BaseController {
         QueryWrapper<QuestionWrong> queryWrapper = new QueryWrapper<QuestionWrong>();
         queryWrapper.eq("user_id", userId);
         queryWrapper.eq("question_id", questionId);
+        queryWrapper.eq("device_type",1);
         questionWrongService.remove(queryWrapper);
         return Response.success();
 
@@ -136,6 +140,7 @@ public class QuestionWrongController extends BaseController {
         QueryWrapper<QuestionWrong> queryWrapper = new QueryWrapper<QuestionWrong>();
         queryWrapper.eq("user_id", userId);
         queryWrapper.eq("km", questionWrongDelDTO.getKm());
+        queryWrapper.eq("device_type",1);
         questionWrongService.remove(queryWrapper);
         return Response.success();
     }
@@ -145,6 +150,7 @@ public class QuestionWrongController extends BaseController {
     @ApiOperation("恢复云端错题到本机（根据用户获取错题）")
     public Response<List<QuestionWrongIdDateVo>> appWrongByUser(@ModelAttribute QuestionWrongListDTO dto) {
         dto.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
+        dto.setDeviceType(1);
         List<QuestionWrongIdDateVo> list = questionWrongService.selectWrongIdByUserId(dto);
         return Response.success(list);
     }
@@ -154,6 +160,7 @@ public class QuestionWrongController extends BaseController {
     @ApiOperation("根据用户获取错题数")
     public Response<Integer> wrongCountByUser(@ModelAttribute QuestionWrongListDTO dto) {
         dto.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
+        dto.setDeviceType(1);
         Integer count = questionWrongService.selectWrongCountByUserId(dto);
         return Response.success(count);
     }

jpcj-service/src/main/java/com/miaxis/question/domain/QuestionCollection.java

@@ -47,6 +47,14 @@ public class QuestionCollection  {
     @ApiModelProperty(value = "考试科目（1、2、3、4）")
     private Integer km;
 
+
+    /** 终端类型 */
+    @Excel(name = "终端类型")
+    @TableField("km")
+    @ApiModelProperty(value = "终端类型")
+    private Integer deviceType;
+
+
     /** 创建时间 */
     @ApiModelProperty(value = "创建时间"  ,hidden = true)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS")

jpcj-service/src/main/java/com/miaxis/question/domain/QuestionWrong.java

@@ -45,6 +45,12 @@ public class QuestionWrong extends BaseBusinessEntity {
     @ApiModelProperty(value = "考试科目（1、2、3、4）")
     private Integer km;
 
+    /** 终端类型 1:H5  2:PC端 */
+    @Excel(name = "终端类型 1:H5  2:PC端")
+    @TableField("device_type")
+    @ApiModelProperty(value = "终端类型 1:H5  2:PC端")
+    private Integer deviceType;
+
 
 
 }

jpcj-service/src/main/java/com/miaxis/question/dto/QuestionCollectionDTO.java

@@ -26,8 +26,5 @@ public class QuestionCollectionDTO {
     private Integer km;
 
 
-    /** 题目类型 */
-    @ApiModelProperty(value = "题目类型 1判断，2选择，3多选")
-    private Integer questionType;
 
 }

jpcj-service/src/main/java/com/miaxis/question/dto/QuestionWrongListDTO.java

@@ -24,7 +24,8 @@ public class QuestionWrongListDTO extends BaseBusinessEntity {
     @ApiModelProperty(value = "考试科目（科目一、科目二、科目三、科目四）")
     private Integer km;
 
-
+    @ApiModelProperty(value = "终端类型",hidden = true)
+    private Integer deviceType;
 
 
 }

jpcj-service/src/main/resources/mapper/question/QuestionWrongMapper.xml

@@ -8,6 +8,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="userId"    column="user_id"    />
         <result property="questionId"    column="question_id"    />
+        <result property="km"    column="km"    />
+        <result property="deviceType"    column="device_type"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
     </resultMap>
@@ -21,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="userId != null and userId !='' "> and user_id = #{userId}</if>
             <if test="km != null and km!='' "> and km = #{km}</if>
+            <if test="deviceType != null and deviceType!='' "> and q2.device_type = #{deviceType}</if>
         </where>
     </select>
 
@@ -32,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="userId != null and userId !='' "> and q2.user_id = #{userId}</if>
             <if test="km != null and km!='' "> and q2.km = #{km}</if>
+            <if test="deviceType != null and deviceType!='' "> and q2.device_type = #{deviceType}</if>
         </where>
         order by q2.create_time
     </select>
@@ -42,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="userId != null and userId !='' "> and q2.user_id = #{userId}</if>
             <if test="km != null and km!='' "> and q2.km = #{km}</if>
+            <if test="deviceType != null and deviceType!='' "> and q2.device_type = #{deviceType}</if>
         </where>
 
     </select>