fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserMockRecordMapper.java

@@ -16,7 +16,7 @@ import java.util.List;
  * @date 2022-5-31
  */
 public interface UserMockRecordMapper extends BaseMapper<UserMockRecord> {
-    List<UserMockRecordVo> selectList(UserMockRecordQueryBo bo);
+    List<UserMockRecordVo> selectAllList(UserMockRecordQueryBo bo);
     Long selectDoNum(UserMockRecordQueryBo bo);
     Long selectRightNum(UserMockRecordQueryBo bo);
     UserMockRecordVo selectDetail(UserMockRecordQueryBo bo);

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

@@ -135,7 +135,7 @@ public class UserMockRecordServiceImpl extends ServiceImpl<UserMockRecordMapper,
 
     @Override
     public List<UserMockRecordVo> selectList(UserMockRecordQueryBo bo) {
-        return UserMockRecordMapper.selectList(bo);
+        return UserMockRecordMapper.selectAllList(bo);
     }
 
     /**

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

@@ -183,6 +183,9 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
                 update.setFirstHandTime(null);
             }
         }
+        if (Validator.isNotEmpty(bo.getHandStatus()) && bo.getHandStatus() != 0) {
+            update.setFirstHandTime(DateUtils.getNowTime());
+        }
         update.setUpdateTime(DateUtils.getNowTime());
         return this.updateById(update);
     }
@@ -228,9 +231,11 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
                 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 (userMockRecordList != null && userMockRecordList.size() > 0) {
+                    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

@@ -174,9 +174,4 @@ public class UserMockSubscribeVo {
 	@Excel(name = "第一次交卷时间")
 	@ApiModelProperty("第一次交卷时间")
 	private Long firstHandTime;
-
-	/** 做题ID */
-	@Excel(name = "做题ID")
-	@ApiModelProperty("做题ID")
-	private List<Long> recordIds;
 }

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

@@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="eachExamId" column="each_exam_id"/>
     </resultMap>
 
-    <select id="selectList" parameterType="com.zhongzheng.modules.user.bo.UserMockRecordQueryBo" resultMap="UserMockRecordVoResult">
+    <select id="selectAllList" parameterType="com.zhongzheng.modules.user.bo.UserMockRecordQueryBo" resultMap="UserMockRecordVoResult">
         SELECT
             ue.*,
             e.exam_name,