fix 修改字段

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

@@ -28,7 +28,7 @@ public class MockMajorSubjectAddBo {
     private Long examId;
     /** 讲解ID */
     @ApiModelProperty("讲解ID")
-    private Long handoutsId;
+    private Long sectionId;
     /** 创建时间 */
     @ApiModelProperty("创建时间")
     private Long createTime;

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

@@ -36,7 +36,7 @@ public class MockMajorSubjectEditBo {
 
     /** 讲解ID */
     @ApiModelProperty("讲解ID")
-    private Long handoutsId;
+    private Long sectionId;
 
     /** 更新时间 */
     @ApiModelProperty("更新时间")

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

@@ -47,5 +47,5 @@ public class MockMajorSubjectQueryBo extends BaseEntity {
 	private Long examId;
 	/** 讲解ID */
 	@ApiModelProperty("讲解ID")
-	private Long handoutsId;
+	private Long sectionId;
 }

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

@@ -33,7 +33,7 @@ private static final long serialVersionUID=1L;
     /** 试卷ID */
     private Long examId;
     /** 讲解ID */
-    private Long handoutsId;
+    private Long sectionId;
     /** 创建时间 */
     @TableField(fill = FieldFill.INSERT)
     private Long createTime;

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

@@ -10,8 +10,10 @@ import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.modules.bank.domain.Exam;
 import com.zhongzheng.modules.bank.service.IExamService;
 import com.zhongzheng.modules.course.domain.CourseHandouts;
+import com.zhongzheng.modules.course.domain.CourseSection;
 import com.zhongzheng.modules.course.domain.Major;
 import com.zhongzheng.modules.course.service.ICourseHandoutsService;
+import com.zhongzheng.modules.course.service.ICourseSectionService;
 import com.zhongzheng.modules.course.service.IMajorService;
 import com.zhongzheng.modules.goods.domain.Goods;
 import com.zhongzheng.modules.goods.service.IGoodsService;
@@ -53,7 +55,7 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
     private IExamService iExamService;
 
     @Autowired
-    private ICourseHandoutsService iCourseHandoutsService;
+    private ICourseSectionService iCourseectionService;
 
     @Autowired
     private IGoodsService iGoodsService;
@@ -144,7 +146,7 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
                 MockMajorSubjectAddBo bo2 = new MockMajorSubjectAddBo();
                 bo2.setMockMajorId(mockMajorAdd.getMockMajorId());
                 bo2.setExamId(mockMajorSubjectAddBo.getExamId());
-                bo2.setHandoutsId(mockMajorSubjectAddBo.getHandoutsId());
+                bo2.setSectionId(mockMajorSubjectAddBo.getSectionId());
                 bo2.setSubjectId(mockMajorSubjectAddBo.getSubjectId());
                 MockMajorSubject mockMajorSubjectAdd = BeanUtil.toBean(bo2, MockMajorSubject.class);
                 mockMajorSubjectAdd.setCreateTime(DateUtils.getNowTime());
@@ -317,9 +319,9 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
                             LambdaQueryWrapper<Exam> lqw4 = new LambdaQueryWrapper<>();
                             lqw4.eq(Validator.isNotEmpty(mockMajorSubject.getExamId()), Exam::getExamId, mockMajorSubject.getExamId());
                             Exam exam = iExamService.getOne(lqw4);
-                            LambdaQueryWrapper<CourseHandouts> lqw5 = new LambdaQueryWrapper<>();
-                            lqw5.eq(Validator.isNotEmpty(mockMajorSubject.getHandoutsId()), CourseHandouts::getHandoutsId, mockMajorSubject.getHandoutsId());
-                            CourseHandouts courseHandouts = iCourseHandoutsService.getOne(lqw5);
+                            LambdaQueryWrapper<CourseSection> lqw5 = new LambdaQueryWrapper<>();
+                            lqw5.eq(Validator.isNotEmpty(mockMajorSubject.getSectionId()), CourseSection::getSectionId, mockMajorSubject.getSectionId());
+                            CourseSection courseSection = iCourseectionService.getOne(lqw5);
 
                             LambdaQueryWrapper<MockMajorSubjectTime> lqw6 = new LambdaQueryWrapper<>();
                             lqw6.eq(Validator.isNotEmpty(mockMajorSubject.getMockMajorSubjectId()), MockMajorSubjectTime::getMockMajorSubjectId, mockMajorSubject.getMockMajorSubjectId());
@@ -356,7 +358,7 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
                             mockMajorSubjectVo.setMockMajorSubjectTimeList(mockMajorSubjectTimeVoList);
                             mockMajorSubjectVo.setMockMajorSubjectGoodsList(mockMajorSubjectGoodsVoList);
                             mockMajorSubjectVo.setExamName(exam.getExamName());
-                            mockMajorSubjectVo.setHandoutsName(courseHandouts.getHandoutsName());
+                            mockMajorSubjectVo.setSectionName(courseSection.getName());
                             mockMajorSubjectVoList.add(mockMajorSubjectVo);
                         });
                     }

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

@@ -41,7 +41,7 @@ public class MockMajorSubjectServiceImpl extends ServiceImpl<MockMajorSubjectMap
         lqw.eq(bo.getMockMajorId() != null, MockMajorSubject::getMockMajorId, bo.getMockMajorId());
         lqw.eq(bo.getSubjectId() != null, MockMajorSubject::getSubjectId, bo.getSubjectId());
         lqw.eq(bo.getExamId() != null, MockMajorSubject::getExamId, bo.getExamId());
-        lqw.eq(bo.getHandoutsId() != null, MockMajorSubject::getHandoutsId, bo.getHandoutsId());
+        lqw.eq(bo.getSectionId() != null, MockMajorSubject::getSectionId, bo.getSectionId());
         return entity2Vo(this.list(lqw));
     }
 

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

@@ -106,7 +106,7 @@ public class MockApplyVo {
 	/** 讲解ID */
 	@Excel(name = "讲解ID")
 	@ApiModelProperty("讲解ID")
-	private Long handoutsId;
+	private Long sectionId;
 
 	/** 模考专业集合 */
 	@Excel(name = "模考专业集合")

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

@@ -47,11 +47,11 @@ public class MockMajorSubjectVo {
 	/** 讲解ID */
 	@Excel(name = "讲解ID")
 	@ApiModelProperty("讲解ID")
-	private Long handoutsId;
+	private Long sectionId;
 	/** 讲解名称 */
 	@Excel(name = "讲解名称")
 	@ApiModelProperty("讲解名称")
-	private String handoutsName;
+	private String sectionName;
 
 	/** 模考专业科目绑定时间集合 */
 	@Excel(name = "模考专业科目绑定时间集合")

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

@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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="sectionId" column="section_id"/>
         <result property="subscribeNum" column="subscribe_num"/>
         <result property="subscribeCancelNum" column="subscribe_cancel_num"/>
         <result property="majorId" column="major_id"/>
@@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                mms.subject_id,
                mms.site_time,
                mms.exam_id,
-               mms.handouts_id
+               mms.section_id
         FROM mock_apply ma
         LEFT JOIN mock_major mm ON ma.apply_id = mm.apply_id
         LEFT JOIN mock_major_subject mms ON mm.mock_major_id = mms.mock_major_id
@@ -90,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                   mms.subject_id,
                   cs.subject_name,
                   mms.exam_id,
-                  mms.handouts_id,
+                  mms.section_id,
                   mmst.exam_time,
                   mmst.start_time,
                   mmst.end_time

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

@@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="mockMajorId" column="mock_major_id"/>
         <result property="subjectId" column="subject_id"/>
         <result property="examId" column="exam_id"/>
-        <result property="handoutsId" column="handouts_id"/>
+        <result property="sectionId" column="section_id"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
     </resultMap>