Merge branch 'pre' of http://120.79.166.78:19005/zhongzheng-edu/saas_entrepot into pre

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserMockSubscribeController.java

@@ -150,7 +150,7 @@ public class UserMockSubscribeController extends BaseController {
      */
     @ApiOperation("获取预约模考详细信息")
     @PreAuthorize("@ss.hasPermi('system:subscribe:query')")
-    @GetMapping("/{subscribeId}")
+    @GetMapping("/info/{subscribeId}")
     public AjaxResult<UserMockSubscribeVo> getSubscribeInfo(@PathVariable("subscribeId" ) Long subscribeId) {
         return AjaxResult.success(iUserMockSubscribeService.queryById(subscribeId));
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -1392,9 +1392,9 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                 UserVo userVo = iUserService.queryById(classGradeStudentVo.getUserId());
                 Map<String, Object> param = new HashMap<>();
                 param.put("businessName", classGradeStudentVo.getBusinessName() + classGradeStudentVo.getProjectName());
-                if (Validator.isNotEmpty(IAliSmsService.sendInformSms(userVo.getTelphone(), JSON.toJSONString(param), mockBookingReminder))) {
+                /*if (Validator.isNotEmpty(IAliSmsService.sendInformSms(userVo.getTelphone(), JSON.toJSONString(param), mockBookingReminder))) {
                     iInformUserService.insertByAddBo(informUserAddBo);
-                }
+                }*/
             }
         }
         mockApplyVos.forEach(mockApplyVo -> {
@@ -1464,9 +1464,9 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     Map<String, Object> param = new HashMap<>();
                     param.put("subjectName", courseSubject.getSubjectName());
                     param.put("applyName", mockApply.getApplyName());
-                    if (Validator.isNotEmpty(IAliSmsService.sendInformSms(userVo.getTelphone(), JSON.toJSONString(param), mockRemind))) {
+                    /*if (Validator.isNotEmpty(IAliSmsService.sendInformSms(userVo.getTelphone(), JSON.toJSONString(param), mockRemind))) {
                         iInformUserService.insertByAddBo(informUserAddBo);
-                    }
+                    }*/
                 }
                 UserMockSubscribeEditBo bo1 = new UserMockSubscribeEditBo();
                 bo1.setSubscribeId(subscribeVo.getSubscribeId());
@@ -1511,9 +1511,9 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                 Map<String, Object> param = new HashMap<>();
                 param.put("subjectName", userMockSubscribeVo.getSubjectName());
                 param.put("prefixName", userMockSubscribeVo.getPrefixName());
-                if (Validator.isNotEmpty(IAliSmsService.sendInformSms(userVo.getTelphone(), JSON.toJSONString(param), liveStartRemind))) {
+                /*if (Validator.isNotEmpty(IAliSmsService.sendInformSms(userVo.getTelphone(), JSON.toJSONString(param), liveStartRemind))) {
                     iInformUserService.insertByAddBo(informUserAddBo);
-                }
+                }*/
             }
             UserMockSubscribeEditBo bo1 = new UserMockSubscribeEditBo();
             bo1.setSubscribeId(userMockSubscribeVo.getSubscribeId());

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

@@ -69,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="applyName != null and applyName != ''">
             and ma.apply_name = #{applyName}
         </if>
+        AND ma.`status` = 1
     </select>
     <select id="listByEachExamId" parameterType="java.lang.Long" resultType="com.zhongzheng.modules.user.vo.UserMockSubscribeVo">
         SELECT

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

@@ -186,6 +186,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="applyName != null and applyName != ''">
             and ma.applyName = #{applyName}
         </if>
+        AND ma.`status` = 1
     </select>
     <select id="listLiveSubscribe" resultMap="UserMockSubscribeVoResult">
         SELECT