change пре 4 година
родитељ
комит
a28641b81f

+ 13 - 0
zhongzheng-admin/src/main/java/com/zhongzheng/controller/exam/ExamArrangementController.java

@@ -69,6 +69,19 @@ public class ExamArrangementController extends BaseController {
         return getDataTable(list);
     }
 
+
+    /**
+     * 查询订阅
+     */
+    @ApiOperation("查询订阅列表")
+    @PreAuthorize("@ss.hasPermi('modules.exam:arrangement:list')")
+    @GetMapping("/listSub")
+    public TableDataInfo<ExamUserVo> listUserSub(ExamArrangementQueryBo bo) {
+        startPage();
+        List<ExamUserVo> list = iExamArrangementService.queryUserSubList(bo);
+        return getDataTable(list);
+    }
+
     /**
      * 导出考试安排,包含考试指引列表
      */

+ 0 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/domain/ExamArrangementSub.java

@@ -29,7 +29,6 @@ private static final long serialVersionUID=1L;
     private Long examId;
 
     /** $column.columnComment */
-    @TableId(value = "sub_id")
     private Long subId;
 
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/mapper/ExamArrangementStudentMapper.java

@@ -16,4 +16,6 @@ import java.util.List;
 public interface ExamArrangementStudentMapper extends BaseMapper<ExamArrangementStudent> {
 
     List<ExamUserVo> selectExamUserList(ExamArrangementQueryBo bo);
+
+    List<ExamUserVo> selectSubList(ExamArrangementQueryBo bo);
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/IExamArrangementService.java

@@ -58,4 +58,6 @@ public interface IExamArrangementService extends IService<ExamArrangement> {
 	 * @return
 	 */
 	List<ExamUserVo> queryUserList(ExamArrangementQueryBo bo);
+
+    List<ExamUserVo> queryUserSubList(ExamArrangementQueryBo bo);
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/IExamArrangementStudentService.java

@@ -53,4 +53,6 @@ public interface IExamArrangementStudentService extends IService<ExamArrangement
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
     List<ExamUserVo> queryUserList(ExamArrangementQueryBo bo);
+
+	List<ExamUserVo> querySubList(ExamArrangementQueryBo bo);
 }

+ 6 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamArrangementServiceImpl.java

@@ -208,4 +208,10 @@ public class ExamArrangementServiceImpl extends ServiceImpl<ExamArrangementMappe
         List<ExamUserVo> examUserVos = examArrangementStudentService.queryUserList(bo);
         return examUserVos;
     }
+
+    @Override
+    public List<ExamUserVo> queryUserSubList(ExamArrangementQueryBo bo) {
+        List<ExamUserVo> examUserVos = examArrangementStudentService.querySubList(bo);
+        return examUserVos;
+    }
 }

+ 6 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamArrangementStudentServiceImpl.java

@@ -100,6 +100,12 @@ public class ExamArrangementStudentServiceImpl extends ServiceImpl<ExamArrangeme
         return entity2UserVo(examUserVos);
     }
 
+    @Override
+    public List<ExamUserVo> querySubList(ExamArrangementQueryBo bo) {
+        List<ExamUserVo> examUserVos = baseMapper.selectSubList(bo);
+        return entity2UserVo(examUserVos);
+    }
+
     /**
      * 实体类转化成视图对象
      *

+ 17 - 0
zhongzheng-system/src/main/resources/mapper/modules/exam/ExamArrangementStudentMapper.xml

@@ -77,4 +77,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
 
     </select>
+
+    <select id="selectSubList" parameterType="com.zhongzheng.modules.exam.bo.ExamArrangementQueryBo" resultMap="UserResult">
+        SELECT
+        u.*,
+        e.*
+        FROM
+        exam_arrangement_sub s
+        LEFT JOIN `user` u ON s.student_id = u.user_id
+        LEFT JOIN exam_arrangement e ON s.arrangement_id = e.id
+        LEFT JOIN exam_arrangement_time t ON t.arrangement_id = e.id
+        WHERE 1=1
+        AND e.status != 0
+        <if test="startTime != null and startTime != ''">
+            AND t.start_time BETWEEN #{startTime} and #{endTime}
+        </if>
+
+    </select>
 </mapper>