fix pc模考列表

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

@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.text.ParseException;
 import java.util.Arrays;
 import java.util.List;
 
@@ -114,8 +115,10 @@ public class MockApplyController extends BaseController {
     @ApiOperation("查询模考安排列表")
     @PreAuthorize("@ss.hasPermi('system:apply:list')")
     @GetMapping("/listApply")
-    public TableDataInfo<MockApplyVo> listApply(MockApplyQueryBo bo) {
+    public TableDataInfo<MockApplyVo> listApply(MockApplyQueryBo bo){
         startPage();
+        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/service/IMockApplyService.java

@@ -7,6 +7,7 @@ import com.zhongzheng.modules.mock.bo.MockApplyAddBo;
 import com.zhongzheng.modules.mock.bo.MockApplyEditBo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.text.ParseException;
 import java.util.Collection;
 import java.util.List;
 

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

@@ -361,8 +361,19 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
     }
 
     @Override
-    public List<MockApplyVo> queryApplyList(MockApplyQueryBo bo) {
-        return baseMapper.queryApplyList(bo);
+    public List<MockApplyVo> queryApplyList(MockApplyQueryBo bo){
+        List<MockApplyVo> mockApplyVoList = baseMapper.queryApplyList(bo);
+        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());
+                List<UserMockSubscribe> userMockSubscribeList = iUserMockSubscribeService.list(lqw);
+                mockApplyVo.setIsSubscribe(BeanUtil.isEmpty(userMockSubscribeList) ? 0 : 1);
+            });
+        }
+        return mockApplyVoList;
     }
 
     @Override

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

@@ -149,6 +149,10 @@ public class MockApplyVo {
 	@ApiModelProperty("开考限制时间")
 	private String timeLimit;
 
+	@Excel(name = "是否预约")
+	@ApiModelProperty("是否预约")
+	private Integer isSubscribe;
+
 	/** 模考绑定专业集合 */
 	@Excel(name = "模考绑定专业集合")
 	@ApiModelProperty("模考绑定专业集合")

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

@@ -153,6 +153,7 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
         validEntityBeforeSave(add);
         add.setSubscribeStatus(1);
         add.setExamStatus(0);
+        add.setApplySiteExamTime(formatTime(add.getApplySiteExamTime(), add.getApplySiteStartTime()));
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
         this.save(add);

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

@@ -109,11 +109,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and ma.project_id = #{projectId}
         </if>
         <if test="majorId != null and majorId != ''">
-            and major_id = #{majorId}
+            and mm.major_id = #{majorId}
         </if>
         <if test="businessId != null and businessId != ''">
             and ma.business_id = #{businessId}
         </if>
+        <if test="startTime != null and startTime != ''">
+            and mmst.exam_time &gt; #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and mmst.exam_time &lt; #{endTime}
+        </if>
         ORDER BY mmst.exam_time
     </select>
     <select id="listApplyBusiness" resultType="com.zhongzheng.modules.mock.vo.MockApplyVo">