fix 模考列表

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

@@ -111,9 +111,8 @@ public class MockApplyController extends BaseController {
     @GetMapping("/listApply")
     public TableDataInfo<MockApplyVo> listApply(MockApplyQueryBo bo) {
         startPage();
-        List<MockApplyVo> list = iMockApplyService.listApply(bo);
+        List<MockApplyVo> list = iMockApplyService.queryApplyList(bo);
         return getDataTable(list);
     }
 
-
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/bo/MockApplyQueryBo.java

@@ -66,4 +66,10 @@ public class MockApplyQueryBo extends BaseEntity {
 	/** 编码 */
 	@ApiModelProperty("编码")
 	private String code;
+	/** 专业ID */
+	@ApiModelProperty("专业ID")
+	private Long majorId;
+	/** 专业名称 */
+	@ApiModelProperty("专业名称")
+	private Long majorName;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/mapper/MockApplyMapper.java

@@ -19,4 +19,6 @@ public interface MockApplyMapper extends BaseMapper<MockApply> {
     MockApplyVo getMockSubjectInfo(@Param(value = "mockMajorSubjectId")Long mockMajorSubjectId);
 
     List<MockApplyVo> listApply(MockApplyQueryBo bo);
+
+    List<MockApplyVo> queryApplyList(MockApplyQueryBo bo);
 }

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

@@ -53,4 +53,6 @@ public interface IMockApplyService extends IService<MockApply> {
 	MockApplyVo getMockSubjectInfo(Long mockMajorSubjectId);
 
 	List<MockApplyVo> listApply(MockApplyQueryBo bo);
+
+	List<MockApplyVo> queryApplyList(MockApplyQueryBo bo);
 }

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

@@ -221,4 +221,9 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
         return mockApplyVoList;
 
     }
+
+    @Override
+    public List<MockApplyVo> queryApplyList(MockApplyQueryBo bo) {
+        return baseMapper.queryApplyList(bo);
+    }
 }

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

@@ -92,6 +92,11 @@ public class MockApplyVo {
 	@ApiModelProperty("科目ID")
 	private Long subjectId;
 
+	/** 科目名称 */
+	@Excel(name = "科目名称")
+	@ApiModelProperty("科目名称")
+	private Long subjectName;
+
 	/** 试卷ID */
 	@Excel(name = "试卷ID")
 	@ApiModelProperty("试卷ID")
@@ -116,4 +121,27 @@ public class MockApplyVo {
 	@Excel(name = "预约取消数量")
 	@ApiModelProperty("预约取消数量")
 	private Integer subscribeCancelNum;
+
+	/** 专业ID */
+	@Excel(name = "专业ID")
+	@ApiModelProperty("专业ID")
+	private Long majorId;
+
+	/** 专业名称 */
+	@Excel(name = "专业名称")
+	@ApiModelProperty("专业名称")
+	private Long categoryName;
+
+	/** 考试日期 */
+	@Excel(name = "考试日期")
+	@ApiModelProperty("考试日期")
+	private Long examTime;
+	/** 开始时间 */
+	@Excel(name = "开始时间")
+	@ApiModelProperty("开始时间")
+	private String startTime;
+	/** 结束时间 */
+	@Excel(name = "结束时间")
+	@ApiModelProperty("结束时间")
+	private String endTime;
 }

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

@@ -38,10 +38,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="mockMajorId" column="mock_major_id"/>
         <result property="mockMajorSubjectId" column="mock_major_subject_id"/>
         <result property="subjectId" column="subject_id"/>
+        <result property="subjectName" column="subject_name"/>
         <result property="examId" column="exam_id"/>
         <result property="handoutsId" column="handouts_id"/>
         <result property="subscribeNum" column="subscribe_num"/>
         <result property="subscribeCancelNum" column="subscribe_cancel_num"/>
+        <result property="majorId" column="major_id"/>
+        <result property="categoryName" column="category_name"/>
+        <result property="categoryName" column="category_name"/>
     </resultMap>
     <select id="getMockSubjectInfo" parameterType="java.lang.Long" resultMap="MockApplyVoResult">
         SELECT ma.*,
@@ -68,6 +72,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  LEFT JOIN course_business cb ON ma.business_id = cb.id
                 LEFT
     </select>
+    <select id="queryApplyList" parameterType="com.zhongzheng.modules.mock.bo.MockApplyQueryBo" resultMap="MockApplyVoResult">
+        SELECT	ma.business_id,
+                  cb.business_name,
+                  ma.project_id,
+                  cpt.project_name,
+                  mm.major_id,
+                  m.category_name,
+                  mms.subject_id,
+                  cs.subject_name,
+                  mms.exam_id,
+                  mms.handouts_id,
+                  mmst.exam_time,
+                  mmst.start_time,
+                  mmst.end_time
+        FROM mock_apply ma
+                 LEFT JOIN course_business cb ON ma.business_id = cb.id
+                 LEFT JOIN course_project_type cpt ON ma.project_id = cpt.id
+                 LEFT JOIN mock_major mm ON ma.apply_id = mm.apply_id
+                 LEFT JOIN major m ON mm.major_id = m.id
+                 LEFT JOIN mock_major_subject mms ON mm.mock_major_id = mms.mock_major_id
+                 LEFT JOIN course_subject cs ON mms.subject_id = cs.id
+                 LEFT JOIN mock_major_subject_time mmst ON mms.mock_major_subject_id = mmst.mock_major_subject_id
+        WHERE
+              1=1
+        <if test="projectId != null and projectId != ''">
+            ma.project_id = #{projectId}
+        </if>
+        <if test="majorId != null and majorId != ''">
+            and major_id = #{majorId}
+        </if>
+        ORDER BY mmst.exam_time
+    </select>
 
 
 </mapper>