考期专业科目

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/MajorProjectAddBo.java

@@ -23,7 +23,7 @@ public class MajorProjectAddBo {
     private Long projectId;
     /** 科目ID */
     @ApiModelProperty("科目ID")
-    private Long subjectId;
+    private Long majorId;
     /** 添加时间 */
     @ApiModelProperty("添加时间")
     private Long createTime;

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/MajorProjectEditBo.java

@@ -27,7 +27,7 @@ public class MajorProjectEditBo {
 
     /** 科目ID */
     @ApiModelProperty("科目ID")
-    private Long subjectId;
+    private Long majorId;
 
     /** 修改时间 */
     @ApiModelProperty("修改时间")

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/MajorProjectQueryBo.java

@@ -41,5 +41,5 @@ public class MajorProjectQueryBo extends BaseEntity {
 	private Long projectId;
 	/** 科目ID */
 	@ApiModelProperty("科目ID")
-	private Long subjectId;
+	private Long majorId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/MajorProject.java

@@ -29,7 +29,7 @@ private static final long serialVersionUID=1L;
     /** 项目ID */
     private Long projectId;
     /** 科目ID */
-    private Long subjectId;
+    private Long majorId;
     /** 添加时间 */
     @TableField(fill = FieldFill.INSERT)
     private Long createTime;

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/MajorProjectServiceImpl.java

@@ -40,7 +40,7 @@ public class MajorProjectServiceImpl extends ServiceImpl<MajorProjectMapper, Maj
     public List<MajorProjectVo> queryList(MajorProjectQueryBo bo) {
         LambdaQueryWrapper<MajorProject> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getProjectId() != null, MajorProject::getProjectId, bo.getProjectId());
-        lqw.eq(bo.getSubjectId() != null, MajorProject::getSubjectId, bo.getSubjectId());
+        lqw.eq(bo.getMajorId() != null, MajorProject::getMajorId, bo.getMajorId());
         return entity2Vo(this.list(lqw));
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/MajorServiceImpl.java

@@ -106,7 +106,7 @@ public class MajorServiceImpl extends ServiceImpl<MajorMapper, Major> implements
         for (Long schoolProject : bo.getMajorProjects()) {
             MajorProjectAddBo majorProjectAddBo = new MajorProjectAddBo();
             majorProjectAddBo.setProjectId(schoolProject);
-            majorProjectAddBo.setSubjectId(add.getId());
+            majorProjectAddBo.setMajorId(add.getId());
             majorProjectService.insertByAddBo(majorProjectAddBo);
         }
         return save;
@@ -118,12 +118,12 @@ public class MajorServiceImpl extends ServiceImpl<MajorMapper, Major> implements
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
         LambdaQueryWrapper<MajorProject> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getId()!=null,MajorProject::getSubjectId, bo.getId());
+        lqw.eq(bo.getId()!=null,MajorProject::getMajorId, bo.getId());
         majorProjectService.remove(lqw);
         for (Long schoolProject : bo.getMajorProjects()) {
             MajorProjectAddBo majorProjectAddBo = new MajorProjectAddBo();
             majorProjectAddBo.setProjectId(schoolProject);
-            majorProjectAddBo.setSubjectId(update.getId());
+            majorProjectAddBo.setMajorId(update.getId());
             majorProjectService.insertByAddBo(majorProjectAddBo);
         }
         return this.updateById(update);

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/MajorProjectVo.java

@@ -31,5 +31,5 @@ public class MajorProjectVo {
 	/** 科目ID */
 	@Excel(name = "科目ID")
 	@ApiModelProperty("科目ID")
-	private Long subjectId;
+	private Long majorId;
 }

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

@@ -39,5 +39,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item}
             </foreach>
         </if>
+        <if test="id != null and id!=0 ">
+            AND j.subject_id = #{id}
+        </if>
     </select>
 </mapper>

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

@@ -41,6 +41,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item}
             </foreach>
         </if>
+        <if test="id != null and id!=0 ">
+            AND j.major_id = #{id}
+        </if>
     </select>
 
 </mapper>