fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/mapper/MockMajorSubjectTimeMapper.java

@@ -2,6 +2,7 @@ package com.zhongzheng.modules.mock.mapper;
 
 import com.zhongzheng.modules.mock.domain.MockMajorSubjectTime;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.mock.vo.MockMajorSubjectTimeVo;
 import com.zhongzheng.modules.user.bo.UserMockSubscribeQueryBo;
 import com.zhongzheng.modules.user.vo.UserMockSubscribeVo;
 
@@ -15,7 +16,7 @@ import java.util.List;
  */
 public interface MockMajorSubjectTimeMapper extends BaseMapper<MockMajorSubjectTime> {
 
-    List<MockMajorSubjectTime> listBySubject(UserMockSubscribeQueryBo bo);
+    List<MockMajorSubjectTimeVo> listBySubject(UserMockSubscribeQueryBo bo);
 
     UserMockSubscribeVo listByEachExamId(Long eachExamId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/service/IMockMajorSubjectTimeService.java

@@ -52,7 +52,7 @@ public interface IMockMajorSubjectTimeService extends IService<MockMajorSubjectT
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
-    List<MockMajorSubjectTime> listBySubject(UserMockSubscribeQueryBo bo);
+    List<MockMajorSubjectTimeVo> listBySubject(UserMockSubscribeQueryBo bo);
 
     UserMockSubscribeVo listByEachExamId(Long eachExamId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/service/impl/MockMajorSubjectTimeServiceImpl.java

@@ -103,7 +103,7 @@ public class MockMajorSubjectTimeServiceImpl extends ServiceImpl<MockMajorSubjec
     }
 
     @Override
-    public List<MockMajorSubjectTime> listBySubject(UserMockSubscribeQueryBo bo) {
+    public List<MockMajorSubjectTimeVo> listBySubject(UserMockSubscribeQueryBo bo) {
         return baseMapper.listBySubject(bo);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/vo/MockMajorSubjectTimeVo.java

@@ -40,4 +40,8 @@ public class MockMajorSubjectTimeVo {
 	@Excel(name = "结束时间")
 	@ApiModelProperty("结束时间")
 	private String endTime;
+	/** 模考标题 */
+	@Excel(name = "模考标题")
+	@ApiModelProperty("模考标题")
+	private String applyName;
 }

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

@@ -23,5 +23,5 @@ public interface UserMockSubscribeMapper extends BaseMapper<UserMockSubscribe> {
 
     List<UserMockSubscribeVo> listSubscribe(UserMockSubscribeQueryBo bo);
 
-    List<UserMockSubscribe> listBySubject(UserMockSubscribeQueryBo bo);
+    List<UserMockSubscribeVo> listBySubject(UserMockSubscribeQueryBo bo);
 }

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

@@ -15,6 +15,7 @@ import com.zhongzheng.modules.mock.service.IMockMajorSubjectGoodsService;
 import com.zhongzheng.modules.mock.service.IMockMajorSubjectService;
 import com.zhongzheng.modules.mock.service.IMockMajorSubjectTimeService;
 import com.zhongzheng.modules.mock.vo.MockApplyVo;
+import com.zhongzheng.modules.mock.vo.MockMajorSubjectTimeVo;
 import com.zhongzheng.modules.order.service.IOrderService;
 import com.zhongzheng.modules.user.domain.User;
 import com.zhongzheng.modules.user.domain.UserMockRecord;
@@ -251,8 +252,8 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
             }
             if (Validator.isNotEmpty(bo.getMockStatus()) && bo.getMockStatus() == 1) {
                 //查询默认数据（同一批模考中的同一科目的最新的一条）
-                List<MockMajorSubjectTime> mockMajorSubjectTimeList = iMockMajorSubjectTimeService.listBySubject(bo);
-                List<MockMajorSubjectTime> mockMajorSubjectTimeList2 = new ArrayList<>();
+                List<MockMajorSubjectTimeVo> mockMajorSubjectTimeList = iMockMajorSubjectTimeService.listBySubject(bo);
+                List<MockMajorSubjectTimeVo> mockMajorSubjectTimeList2 = new ArrayList<>();
                 mockMajorSubjectTimeList.forEach(mockMajorSubjectTime -> {
                     try {
                         if (System.currentTimeMillis()/1000 > formatTime(mockMajorSubjectTime.getExamTime(), mockMajorSubjectTime.getEndTime())) {
@@ -264,8 +265,8 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
                 });
 
                 //查询用户最新所预约模考的科目
-                List<UserMockSubscribe> userMockSubscribeList = baseMapper.listBySubject(bo);
-                List<UserMockSubscribe> userMockSubscribeList2 = new ArrayList<>();
+                List<UserMockSubscribeVo> userMockSubscribeList = baseMapper.listBySubject(bo);
+                List<UserMockSubscribeVo> userMockSubscribeList2 = new ArrayList<>();
                 userMockSubscribeList.forEach(userMockSubscribe -> {
                     try {
                         if (System.currentTimeMillis()/1000 > formatTime(userMockSubscribe.getApplySiteExamTime(), userMockSubscribe.getApplySiteEndTime())) {

zhongzheng-system/src/main/resources/mapper/modules/mock/MockMajorSubjectTimeMapper.xml

@@ -14,6 +14,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
     </resultMap>
 
+    <resultMap type="com.zhongzheng.modules.mock.vo.MockMajorSubjectTimeVo" id="MockMajorSubjectTimeVoResult">
+        <result property="id" column="id"/>
+        <result property="mockMajorSubjectId" column="mock_major_subject_id"/>
+        <result property="examTime" column="exam_time"/>
+        <result property="startTime" column="start_time"/>
+        <result property="endTime" column="end_time"/>
+        <result property="applyName" column="apply_name"/>
+    </resultMap>
+
     <resultMap type="com.zhongzheng.modules.user.vo.UserMockSubscribeVo" id="UserMockSubscribeVoResult">
         <result property="userId" column="user_id"/>
         <result property="eachExamId" column="each_exam_id"/>
@@ -40,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="liveStartTime" column="live_start_time"/>
         <result property="liveEndTime" column="live_end_time"/>
     </resultMap>
-    <select id="listBySubject" parameterType="com.zhongzheng.modules.user.bo.UserMockSubscribeQueryBo" resultType="com.zhongzheng.modules.mock.domain.MockMajorSubjectTime">
+    <select id="listBySubject" parameterType="com.zhongzheng.modules.user.bo.UserMockSubscribeQueryBo" resultMap="MockMajorSubjectTimeVoResult">
         SELECT
         mmst.*,
         ma.apply_name
@@ -63,6 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="listByEachExamId" parameterType="java.lang.Long" resultType="com.zhongzheng.modules.user.vo.UserMockSubscribeVo">
         SELECT
+            mmst.id each_exam_id,
             mmst.exam_time apply_site_exam_time,
             mmst.start_time applySiteStartTime,
             mmst.end_time applySiteEndTime,

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

@@ -159,7 +159,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND ums.apply_site_exam_time < #{endTime}
         </if>
     </select>
-    <select id="listBySubject" parameterType="com.zhongzheng.modules.user.bo.UserMockSubscribeQueryBo" resultType="com.zhongzheng.modules.user.domain.UserMockSubscribe">
+    <select id="listBySubject" parameterType="com.zhongzheng.modules.user.bo.UserMockSubscribeQueryBo" resultMap="UserMockSubscribeVoResult">
         SELECT
         ums.*
         FROM