提交：V1.3,添加科目筛选条件

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

@@ -37,7 +37,9 @@ public class MockMajorSubjectAddBo {
     /** 更新时间 */
     @ApiModelProperty("更新时间")
     private Long updateTime;
-
+    /** 考试时长（分钟） */
+    @ApiModelProperty("考试时长（分钟）")
+    private Integer duration;
     /** 关联商品列表 */
     @ApiModelProperty("关联商品列表")
     private List<MockMajorSubjectGoodsAddBo> mockMajorSubjectGoodsList;

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

@@ -42,6 +42,10 @@ public class MockMajorSubjectEditBo {
     @ApiModelProperty("更新时间")
     private Long updateTime;
 
+    /** 考试时长（分钟） */
+    @ApiModelProperty("考试时长（分钟）")
+    private Integer duration;
+
     /** 关联商品列表 */
     @ApiModelProperty("关联商品列表")
     private List<MockMajorSubjectGoodsEditBo> mockMajorSubjectGoodsList;

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

@@ -36,7 +36,4 @@ public class MockMajorSubjectTimeAddBo {
     /** 修改时间 */
     @ApiModelProperty("修改时间")
     private Long updateTime;
-    /** 考试时长（分钟） */
-    @ApiModelProperty("考试时长（分钟）")
-    private Integer duration;
 }

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

@@ -41,9 +41,7 @@ public class MockMajorSubjectTimeEditBo {
     @ApiModelProperty("修改时间")
     private Long updateTime;
 
-    /** 考试时长（分钟） */
-    @ApiModelProperty("考试时长（分钟）")
-    private Integer duration;
+
 
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/domain/MockMajorSubject.java

@@ -39,6 +39,8 @@ private static final long serialVersionUID=1L;
     private Long examId;
     /** 讲解ID */
     private Long sectionId;
+    /** 考试时长（分钟） */
+    private Integer duration;
     /** 创建时间 */
     @TableField(fill = FieldFill.INSERT)
     private Long createTime;

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/domain/MockMajorSubjectTime.java

@@ -37,8 +37,6 @@ private static final long serialVersionUID=1L;
     private String startTime;
     /** 结束时间 */
     private String endTime;
-    /** 考试时长（分钟） */
-    private Integer duration;
     /** 修改时间 */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;

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

@@ -160,6 +160,7 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
                 bo2.setExamId(mockMajorSubjectAddBo.getExamId());
                 bo2.setSectionId(mockMajorSubjectAddBo.getSectionId());
                 bo2.setSubjectId(mockMajorSubjectAddBo.getSubjectId());
+                bo2.setDuration(mockMajorSubjectAddBo.getDuration());
                 MockMajorSubject mockMajorSubjectAdd = BeanUtil.toBean(bo2, MockMajorSubject.class);
                 mockMajorSubjectAdd.setCreateTime(DateUtils.getNowTime());
                 mockMajorSubjectAdd.setUpdateTime(DateUtils.getNowTime());
@@ -278,6 +279,7 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
                 bo2.setExamId(mockMajorSubjectAddBo.getExamId());
                 bo2.setSectionId(mockMajorSubjectAddBo.getSectionId());
                 bo2.setSubjectId(mockMajorSubjectAddBo.getSubjectId());
+                bo2.setDuration(mockMajorSubjectAddBo.getDuration());
                 MockMajorSubject mockMajorSubjectAdd = BeanUtil.toBean(bo2, MockMajorSubject.class);
                 mockMajorSubjectAdd.setCreateTime(DateUtils.getNowTime());
                 mockMajorSubjectAdd.setUpdateTime(DateUtils.getNowTime());

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

@@ -199,4 +199,14 @@ public class MockApplyVo {
 	@ApiModelProperty("模考通知状态 0未通知 1已通知")
 	private Integer mockRemind;
 
+	/** 是否活动模考 0否 1是 */
+	@ApiModelProperty("是否活动模考 0否 1是")
+	private Integer mockActivity;
+	/** 活动开始时间 */
+	@ApiModelProperty("活动开始时间")
+	private Long activityStartTime;
+	/** 活动结束时间 */
+	@ApiModelProperty("活动结束时间")
+	private Long activityEndTime;
+
 }

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

@@ -94,6 +94,10 @@ public class MockMajorSubjectVo {
 	@ApiModelProperty("暂未生成回放 1未生成")
 	private Integer waitStatus;
 
+	/** 考试时长（分钟） */
+	@ApiModelProperty("考试时长")
+	private Integer duration;
+
 	/** 模考专业科目绑定时间集合 */
 	@Excel(name = "模考专业科目绑定时间集合")
 	@ApiModelProperty("模考专业科目绑定时间集合")

zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -573,6 +573,7 @@
         SELECT
             c.*,
                 #{gradeId} as grade_id,
+               cs.subject_name,
         <if test="userId != null ">
             (SELECT COUNT(DISTINCT ubr.module_id,ubr.chapter_id,ubr.exam_id) FROM user_bank_record ubr  where ubr.`status`=1 and ubr.course_id= gc.course_id and ubr.report_status=1 and ubr.grade_id = #{gradeId} and ubr.user_id = #{userId} and ubr.current_status = 1) as record_num,
         </if>
@@ -580,6 +581,7 @@
         FROM
             course c
                 LEFT JOIN goods_course gc ON gc.course_id = c.course_id
+                LEFT JOIN course_subject cs ON cs.id = c.subject_id
                 LEFT JOIN (SELECT
                                COUNT( m.id ) AS exam_num,
                                m.course_id