tanzh 3 年之前
父節點
當前提交
cdfd734f26

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

@@ -285,6 +285,9 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
                 //把用户预约的数据和默认数据组合在一起
                 userMockSubscribeList2.forEach(userMockSubscribe -> {
                     UserMockSubscribeVo userMockSubscribeVo = iMockMajorSubjectTimeService.listByEachExamId(userMockSubscribe.getEachExamId());
+                    if (Validator.isNotEmpty(userMockSubscribe.getHandStatus())){
+                        userMockSubscribeVo.setHandStatus(userMockSubscribe.getHandStatus());
+                    }
                     LambdaQueryWrapper<MockMajorSubjectTime> lqw = Wrappers.lambdaQuery();
                     lqw.eq(MockMajorSubjectTime::getMockMajorSubjectId, userMockSubscribe.getMockMajorSubjectId());
                     lqw.orderByDesc(MockMajorSubjectTime::getId).last("limit 1");

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

@@ -154,7 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND mms.subject_id = #{subjectId}
         </if>
         <if test="applyName != null and applyName != ''">
-            AND ma.apply_Name = #{applyName}
+            AND ma.apply_name = #{applyName}
         </if>
         <if test="subscribeStatus != null and subscribeStatus != ''">
             AND ums.subscribe_status = #{subscribeStatus}