fix 模考做题记录与错题记录

zhongzheng-admin/src/main/java/com/zhongzheng/controller/user/UserMockRecordController.java

@@ -0,0 +1,75 @@
+package com.zhongzheng.controller.user;
+
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.modules.user.bo.UserMockRecordEditBo;
+import com.zhongzheng.modules.user.bo.UserMockRecordQueryBo;
+import com.zhongzheng.modules.user.service.IUserMockRecordService;
+import com.zhongzheng.modules.user.vo.UserMockRecordVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 用户模考做题历史Controller
+ *
+ * @author hjl
+ * @date 2021-12-15
+ */
+@Api(value = "用户模考做题历史控制器", tags = {"用户模考做题历史管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/mock/record")
+public class UserMockRecordController extends BaseController {
+
+    private final IUserMockRecordService iUserMockRecordService;
+
+
+
+    /**
+     * 查询用户模考历史试卷列表
+     */
+    @ApiOperation("查询用户模考历史试卷列表")
+    @GetMapping("/selectExamList")
+    public AjaxResult<List<UserMockRecordVo>> selectExamList(UserMockRecordQueryBo bo) {
+        List<UserMockRecordVo> list = iUserMockRecordService.selectExamList(bo);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 获取用户模考做题历史详细信息
+     */
+    @ApiOperation("获取用户模考做题历史详细信息")
+    @GetMapping("/{recordId}")
+    public AjaxResult<UserMockRecordVo> getInfo(@PathVariable("recordId" ) Long recordId) {
+        return AjaxResult.success(iUserMockRecordService.queryById(recordId));
+    }
+
+    /**
+     * 查询用户模考做题历史列表
+     */
+    @ApiOperation("查询用户模考做题历史列表")
+    @GetMapping("/list")
+    public TableDataInfo<UserMockRecordVo> list(UserMockRecordQueryBo bo) {
+        startPage();
+        List<UserMockRecordVo> list = iUserMockRecordService.selectList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 修改用户模考做题历史
+     */
+    @ApiOperation("修改用户模考做题历史")
+    @Log(title = "用户模考做题历史", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody UserMockRecordEditBo bo) {
+        return toAjax(iUserMockRecordService.updateByEditBo(bo) ? 1 : 0);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserMockSubscribeAddBo.java

@@ -64,19 +64,7 @@ public class UserMockSubscribeAddBo {
     /** 考试日期 */
     @ApiModelProperty("考试日期")
     private Long applySiteExamTime;
-    /** 做题次数 */
-    @ApiModelProperty("做题次数")
-    private Long doNum;
-    /** 第一次做题得分 */
-    @ApiModelProperty("第一次做题得分")
-    private BigDecimal firstScore;
-    /** 第一次主观题待评分 0否 1是 */
-    @ApiModelProperty("第一次主观题待评分 0否 1是")
-    private Integer firstSubjectiveScore;
     /** 第一次交卷时间 */
     @ApiModelProperty("第一次交卷时间")
     private Long firstHandTime;
-    /** 题号ID*/
-    @ApiModelProperty("题号ID")
-    private String recordIds;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserMockSubscribeEditBo.java

@@ -80,24 +80,8 @@ public class UserMockSubscribeEditBo {
     @ApiModelProperty("考试日期")
     private Long applySiteExamTime;
 
-    /** 做题次数 */
-    @ApiModelProperty("做题次数")
-    private Long doNum;
-
-    /** 第一次做题得分 */
-    @ApiModelProperty("第一次做题得分")
-    private BigDecimal firstScore;
-
-    /** 第一次主观题待评分 0否 1是 */
-    @ApiModelProperty("第一次主观题待评分 0否 1是")
-    private Integer firstSubjectiveScore;
-
     /** 第一次交卷时间 */
     @ApiModelProperty("第一次交卷时间")
     private Long firstHandTime;
 
-    /** 题号ID */
-    @ApiModelProperty("题号ID")
-    private String recordIds;
-
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserMockSubscribeQueryBo.java

@@ -77,15 +77,6 @@ public class UserMockSubscribeQueryBo extends BaseEntity {
 	@ApiModelProperty("考试日期")
 	private Long applySiteExamTime;
 
-	/** 做题次数 */
-	@ApiModelProperty("做题次数")
-	private Long doNum;
-	/** 第一次做题得分 */
-	@ApiModelProperty("第一次做题得分")
-	private BigDecimal firstScore;
-	/** 第一次主观题待评分 0否 1是 */
-	@ApiModelProperty("第一次主观题待评分 0否 1是")
-	private Integer firstSubjectiveScore;
 	/** 第一次交卷时间 */
 	@ApiModelProperty("第一次交卷时间")
 	private Long firstHandTime;
@@ -118,9 +109,6 @@ public class UserMockSubscribeQueryBo extends BaseEntity {
 	@ApiModelProperty("考试结束时间")
 	private Long endTime;
 
-	/** 题号ID */
-	@ApiModelProperty("题号ID")
-	private String recordIds;
 
 	/** 考试状态 0未考试 1已结束 */
 	@ApiModelProperty("考试状态 0未考试 1已结束")

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserMockSubscribe.java

@@ -59,14 +59,6 @@ private static final long serialVersionUID=1L;
     private String applySiteEndTime;
     /** 考试日期 */
     private Long applySiteExamTime;
-    /** 做题次数 */
-    private Long doNum;
-    /** 第一次做题得分 */
-    private BigDecimal firstScore;
-    /** 第一次主观题待评分 0否 1是 */
-    private Integer firstSubjectiveScore;
     /** 第一次交卷时间 */
     private Long firstHandTime;
-    /** 题号ID */
-    private String recordIds;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserMockSubscribeServiceImpl.java

@@ -15,6 +15,8 @@ import com.zhongzheng.modules.mock.service.IMockMajorSubjectService;
 import com.zhongzheng.modules.mock.vo.MockApplyVo;
 import com.zhongzheng.modules.order.service.IOrderService;
 import com.zhongzheng.modules.user.domain.User;
+import com.zhongzheng.modules.user.domain.UserMockRecord;
+import com.zhongzheng.modules.user.service.IUserMockRecordService;
 import com.zhongzheng.modules.user.service.IUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -53,6 +55,9 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
     @Autowired
     private IOrderService iOrderService;
 
+    @Autowired
+    private IUserMockRecordService iUserMockRecordService;
+
     @Override
     public UserMockSubscribeVo queryById(Long subscribeId){
         UserMockSubscribe db = this.baseMapper.selectById(subscribeId);
@@ -75,11 +80,7 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
         lqw.eq(StrUtil.isNotBlank(bo.getApplySiteStartTime()), UserMockSubscribe::getApplySiteStartTime, bo.getApplySiteStartTime());
         lqw.eq(StrUtil.isNotBlank(bo.getApplySiteEndTime()), UserMockSubscribe::getApplySiteEndTime, bo.getApplySiteEndTime());
         lqw.eq(bo.getApplySiteExamTime() != null, UserMockSubscribe::getApplySiteExamTime, bo.getApplySiteExamTime());
-        lqw.eq(bo.getDoNum() != null, UserMockSubscribe::getDoNum, bo.getDoNum());
-        lqw.eq(bo.getFirstScore() != null, UserMockSubscribe::getFirstScore, bo.getFirstScore());
-        lqw.eq(bo.getFirstSubjectiveScore() != null, UserMockSubscribe::getFirstSubjectiveScore, bo.getFirstSubjectiveScore());
         lqw.eq(bo.getFirstHandTime() != null, UserMockSubscribe::getFirstHandTime, bo.getFirstHandTime());
-        lqw.eq(bo.getRecordIds() != null, UserMockSubscribe::getRecordIds, bo.getRecordIds());
         return entity2Vo(this.list(lqw));
     }
 
@@ -178,25 +179,11 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
         validEntityBeforeSave(update);
         UserMockSubscribeVo userMockSubscribeVo = this.queryById(update.getSubscribeId());
         if (BeanUtil.isNotEmpty(userMockSubscribeVo)) {
-            if (Validator.isNotEmpty(userMockSubscribeVo.getFirstScore())) {
-                update.setFirstScore(null);
-            }
-            if (Validator.isNotEmpty(userMockSubscribeVo.getFirstSubjectiveScore()) && userMockSubscribeVo.getFirstSubjectiveScore() == 1) {
-                update.setFirstSubjectiveScore(null);
-            }
             if (Validator.isNotEmpty(userMockSubscribeVo.getFirstHandTime())) {
                 update.setFirstHandTime(null);
             }
-            if (Validator.isNotEmpty(bo.getHandStatus()) && bo.getHandStatus() != 0) {
-                update.setDoNum(userMockSubscribeVo.getDoNum() + 1);
-            }
         }
         update.setUpdateTime(DateUtils.getNowTime());
-        if (Validator.isNotEmpty(bo.getRecordIds()) && userMockSubscribeVo.getRecordIds() != null) {
-            update.setRecordIds(userMockSubscribeVo.getRecordIds() + "," + bo.getRecordIds());
-        }else if (Validator.isNotEmpty(bo.getRecordIds()) && userMockSubscribeVo.getRecordIds() == null) {
-            update.setRecordIds(userMockSubscribeVo.getRecordIds() + bo.getRecordIds());
-        }
         return this.updateById(update);
     }
 
@@ -237,6 +224,14 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
         List<UserMockSubscribeVo> userMockSubscribeVoList = baseMapper.listSubscribe(bo);
         List<UserMockSubscribeVo> userMockSubscribeVos = new ArrayList<>();
         if (userMockSubscribeVoList != null && userMockSubscribeVoList.size() > 0) {
+            userMockSubscribeVoList.stream().forEach(userMockSubscribeVo -> {
+                LambdaQueryWrapper<UserMockRecord> lqw = Wrappers.lambdaQuery();
+                lqw.eq(UserMockRecord::getEachExamId, userMockSubscribeVo.getEachExamId());
+                List<UserMockRecord> userMockRecordList = iUserMockRecordService.list(lqw);
+                userMockSubscribeVo.setDoNum(userMockRecordList.size());
+                userMockSubscribeVo.setFirstScore(userMockRecordList.get(0).getTotalScore());
+                userMockSubscribeVo.setFirstSubjectiveScore(userMockRecordList.get(0).getScore() == null ? 0 : 1);
+            });
             if (Validator.isEmpty(bo.getMockStatus())) {
                 return userMockSubscribeVoList;
             }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserMockSubscribeVo.java

@@ -8,7 +8,7 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -158,7 +158,7 @@ public class UserMockSubscribeVo {
 	/** 做题次数 */
 	@Excel(name = "做题次数")
 	@ApiModelProperty("做题次数")
-	private Long doNum;
+	private Integer doNum;
 
 	/** 第一次做题得分 */
 	@Excel(name = "第一次做题得分")
@@ -178,5 +178,5 @@ public class UserMockSubscribeVo {
 	/** 做题ID */
 	@Excel(name = "做题ID")
 	@ApiModelProperty("做题ID")
-	private String recordIds;
+	private List<Long> recordIds;
 }

zhongzheng-system/src/main/resources/mapper/modules/user/UserMockSubscribeMapper.xml

@@ -21,11 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="applySiteStartTime" column="apply_site_start_time"/>
         <result property="applySiteEndTime" column="apply_site_end_time"/>
         <result property="applySiteExamTime" column="apply_site_exam_time"/>
-        <result property="doNum" column="do_num"/>
-        <result property="firstScore" column="first_score"/>
-        <result property="firstSubjectiveScore" column="first_subjective_score"/>
         <result property="firstHandTime" column="first_hand_time"/>
-        <result property="recordIds" column="record_ids"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.user.vo.UserMockSubscribeVo" id="UserMockSubscribeVoResult">