fix pc模考是否能预约判断

zhongzheng-api/src/main/java/com/zhongzheng/controller/mock/MockApplyController.java

@@ -117,8 +117,8 @@ public class MockApplyController extends BaseController {
     @GetMapping("/listApply")
     public TableDataInfo<MockApplyVo> listApply(MockApplyQueryBo bo){
         startPage();
-        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setUserId(loginUser.getUser().getUserId());
+        /*ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());*/
         List<MockApplyVo> list = iMockApplyService.queryApplyList(bo);
         return getDataTable(list);
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/bo/MockApplyQueryBo.java

@@ -70,6 +70,9 @@ public class MockApplyQueryBo extends BaseEntity {
 	/** 专业ID */
 	@ApiModelProperty("专业ID")
 	private Long majorId;
+	/** 科目ID */
+	@ApiModelProperty("科目ID")
+	private Long subjectId;
 	/** 专业名称 */
 	@ApiModelProperty("专业名称")
 	private String majorName;

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

@@ -366,11 +366,14 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
         if (BeanUtil.isNotEmpty(mockApplyVoList)) {
             mockApplyVoList.stream().forEach(mockApplyVo -> {
                 LambdaQueryWrapper<UserMockSubscribe> lqw = Wrappers.lambdaQuery();
-                lqw.eq(UserMockSubscribe::getMockMajorSubjectId, mockApplyVo.getMockMajorSubjectId());
                 lqw.eq(UserMockSubscribe::getUserId, bo.getUserId());
-                lqw.eq(UserMockSubscribe::getApplySiteExamTime,mockApplyVo.getExamTime());
+                lqw.eq(UserMockSubscribe::getEachExamId,mockApplyVo.getEachExamId());
                 List<UserMockSubscribe> userMockSubscribeList = iUserMockSubscribeService.list(lqw);
-                mockApplyVo.setIsSubscribe(BeanUtil.isEmpty(userMockSubscribeList) ? 0 : 1);
+                if (userMockSubscribeList != null && userMockSubscribeList.size() > 0) {
+                    mockApplyVo.setIsSubscribe(0);
+                }else {
+                    mockApplyVo.setIsSubscribe(1);
+                }
             });
         }
         return mockApplyVoList;

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

@@ -25,6 +25,11 @@ public class MockApplyVo {
 	@ApiModelProperty("$pkColumn.columnComment")
 	private Long applyId;
 
+	/** 每场模考id */
+	@Excel(name = "每场模考id")
+	@ApiModelProperty("每场模考id")
+	private Long eachExamId;
+
 	/** 模考封面 */
 	@Excel(name = "模考封面")
 	@ApiModelProperty("模考封面")
@@ -149,8 +154,8 @@ public class MockApplyVo {
 	@ApiModelProperty("开考限制时间")
 	private String timeLimit;
 
-	@Excel(name = "是否预约")
-	@ApiModelProperty("是否预约")
+	@Excel(name = "是否预约 1可以 0不可以")
+	@ApiModelProperty("是否预约 1可以 0不可以")
 	private Integer isSubscribe;
 
 	/** 模考绑定专业集合 */

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

@@ -22,6 +22,9 @@ public class UserMockSubscribeAddBo {
     /** 学员ID */
     @ApiModelProperty("学员ID")
     private Long userId;
+    /** 每场模考ID */
+    @ApiModelProperty("每场模考ID")
+    private Long eachExamId;
     /** 1正常 2取消 */
     @ApiModelProperty("1正常 2取消")
     private Integer subscribeStatus;

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

@@ -27,6 +27,10 @@ public class UserMockSubscribeEditBo {
     @ApiModelProperty("学员ID")
     private Long userId;
 
+    /** 每场模考ID */
+    @ApiModelProperty("每场模考ID")
+    private Long eachExamId;
+
     /** 1正常 2取消 */
     @ApiModelProperty("1正常 2取消")
     private Integer subscribeStatus;

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

@@ -40,6 +40,9 @@ public class UserMockSubscribeQueryBo extends BaseEntity {
 	/** 学员ID */
 	@ApiModelProperty("学员ID")
 	private Long userId;
+	/** 每场模考ID */
+	@ApiModelProperty("每场模考ID")
+	private Long eachExamId;
 	/** 1正常 2取消 */
 	@ApiModelProperty("1正常 2取消")
 	private Integer subscribeStatus;

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

@@ -29,6 +29,8 @@ private static final long serialVersionUID=1L;
     private Long subscribeId;
     /** 学员ID */
     private Long userId;
+    /** 每场考试ID */
+    private Long eachExamId;
     /** 1正常 2取消 */
     private Integer subscribeStatus;
     /** 1 已开通 0未开通 */

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

@@ -63,6 +63,7 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
     public List<UserMockSubscribeVo> queryList(UserMockSubscribeQueryBo bo) {
         LambdaQueryWrapper<UserMockSubscribe> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getUserId() != null, UserMockSubscribe::getUserId, bo.getUserId());
+        lqw.eq(bo.getEachExamId() != null, UserMockSubscribe::getEachExamId, bo.getEachExamId());
         lqw.eq(bo.getSubscribeStatus() != null, UserMockSubscribe::getSubscribeStatus, bo.getSubscribeStatus());
         lqw.eq(bo.getBeforeStatus() != null, UserMockSubscribe::getBeforeStatus, bo.getBeforeStatus());
         lqw.eq(bo.getExamStatus() != null, UserMockSubscribe::getExamStatus, bo.getExamStatus());
@@ -113,7 +114,7 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
         //查询该学员该科目的预约记录
         LambdaQueryWrapper<UserMockSubscribe> lqw = Wrappers.lambdaQuery();
         lqw.eq(UserMockSubscribe::getUserId, bo.getUserId());
-        lqw.eq(UserMockSubscribe::getMockMajorSubjectId, bo.getMockMajorSubjectId());
+        lqw.eq(UserMockSubscribe::getEachExamId, bo.getEachExamId());
         lqw.eq(UserMockSubscribe::getApplyId, bo.getApplyId());
         lqw.orderByDesc(UserMockSubscribe::getCreateTime).last("limit 1");
         UserMockSubscribe userMockSubscribe = this.getOne(lqw);

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

@@ -30,6 +30,10 @@ public class UserMockSubscribeVo {
 	@Excel(name = "学员ID")
 	@ApiModelProperty("学员ID")
 	private Long userId;
+	/** 每场模考ID */
+	@Excel(name = "每场模考ID")
+	@ApiModelProperty("每场模考ID")
+	private Long eachExamId;
 	/** 学员姓名 */
 	@Excel(name = "学员姓名")
 	@ApiModelProperty("学员姓名")

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

@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="subscribeCancelNum" column="subscribe_cancel_num"/>
         <result property="majorId" column="major_id"/>
         <result property="categoryName" column="category_name"/>
-        <result property="categoryName" column="category_name"/>
+        <result property="eachExamId" column="each_exam_id"/>
     </resultMap>
     <select id="getMockSubjectInfo" parameterType="java.lang.Long" resultMap="MockApplyVoResult">
         SELECT ma.*,
@@ -82,7 +82,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY ma.create_time desc
     </select>
     <select id="queryApplyList" parameterType="com.zhongzheng.modules.mock.bo.MockApplyQueryBo" resultMap="MockApplyVoResult">
-        SELECT	ma.business_id,
+        SELECT	  ma.apply_id,
+                  ma.business_id,
                   cb.business_name,
                   ma.apply_name,
                   ma.project_id,
@@ -95,7 +96,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                   mms.section_id,
                   mmst.exam_time,
                   mmst.start_time,
-                  mmst.end_time
+                  mmst.end_time,
+                  mms.mock_major_subject_id,
+                  ma.apply_start_time,
+                  ma.apply_end_time,
+                  mmst.id each_exam_id
         FROM mock_apply ma
                  LEFT JOIN course_business cb ON ma.business_id = cb.id
                  LEFT JOIN course_project_type cpt ON ma.project_id = cpt.id
@@ -112,6 +117,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="majorId != null and majorId != ''">
             and mm.major_id = #{majorId}
         </if>
+        <if test="subjectId != null and subjectId != ''">
+            and mms.subject_id = #{subjectId}
+        </if>
         <if test="businessId != null and businessId != ''">
             and ma.business_id = #{businessId}
         </if>

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

@@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="com.zhongzheng.modules.user.vo.UserMockSubscribeVo" id="UserMockSubscribeVoResult">
         <result property="subscribeId" column="subscribe_id"/>
         <result property="userId" column="user_id"/>
+        <result property="eachExamId" column="each_exam_id"/>
         <result property="realname" column="realname"/>
         <result property="idCard" column="id_card"/>
         <result property="subscribeStatus" column="subscribe_status"/>