tanzh 3 years ago
parent
commit
866bae27a5

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

@@ -154,6 +154,6 @@ public class UserMockSubscribeController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:subscribe:query')")
     @GetMapping("/info/{subscribeId}")
     public AjaxResult<UserMockSubscribeVo> getSubscribeInfo(@PathVariable("subscribeId" ) Long subscribeId) {
-        return AjaxResult.success(iUserMockSubscribeService.queryById(subscribeId));
+        return AjaxResult.success(iUserMockSubscribeService.listSubscribeInfo(subscribeId));
     }
 }

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

@@ -26,4 +26,6 @@ public interface UserMockSubscribeMapper extends BaseMapper<UserMockSubscribe> {
     List<UserMockSubscribeVo> listBySubject(UserMockSubscribeQueryBo bo);
 
     List<UserMockSubscribeVo> listLiveSubscribe();
+
+    UserMockSubscribeVo listSubscribeInfo(Long subscribeId);
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserMockSubscribeService.java

@@ -59,4 +59,6 @@ public interface IUserMockSubscribeService extends IService<UserMockSubscribe> {
     List<UserMockSubscribeVo> listSubscribe(UserMockSubscribeQueryBo bo);
 
     List<UserMockSubscribeVo> listLiveSubscribe();
+
+	UserMockSubscribeVo listSubscribeInfo(Long subscribeId);
 }

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

@@ -329,4 +329,9 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
     public List<UserMockSubscribeVo> listLiveSubscribe() {
         return baseMapper.listLiveSubscribe();
     }
+
+    @Override
+    public UserMockSubscribeVo listSubscribeInfo(Long subscribeId) {
+        return baseMapper.listSubscribeInfo(subscribeId);
+    }
 }

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

@@ -64,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="liveSubscribe" column="live_subscribe"/>
         <result property="liveStartTime" column="live_start_time"/>
         <result property="liveEndTime" column="live_end_time"/>
+        <result property="liveUrl" column="live_url"/>
         <result property="prefixName" column="prefix_name"/>
         <result property="hasMockRemind" column="has_mock_remind"/>
         <result property="hasLiveSubscribe" column="has_live_subscribe"/>
@@ -205,6 +206,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and ums.has_live_subscribe = 0
           and cs.live_start_time is not null
     </select>
+    <select id="listSubscribeInfo" parameterType="java.lang.Long" resultMap="UserMockSubscribeVoResult">
+        SELECT
+        ums.*,
+        cs.live_start_time,
+        cs.live_end_time,
+        cs.live_url
+        FROM
+        user_mock_subscribe ums
+        LEFT JOIN mock_major_subject mms ON ums.mock_major_subject_id = mms.mock_major_subject_id
+        LEFT JOIN course_section cs ON mms.section_id = cs.section_id
+        WHERE
+        ums.subscribe_id =#{subscribeId}
+    </select>
 
 
 </mapper>