院校

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

@@ -7,8 +7,10 @@ import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.modules.course.bo.*;
 import com.zhongzheng.modules.course.domain.CourseEducationType;
 import com.zhongzheng.modules.course.domain.MajorProject;
+import com.zhongzheng.modules.course.service.IMajorLabelService;
 import com.zhongzheng.modules.course.service.IMajorProjectService;
 import com.zhongzheng.modules.course.vo.CourseProjectTypeVo;
+import com.zhongzheng.modules.course.vo.MajorLabelVo;
 import com.zhongzheng.modules.course.vo.MajorProjectVo;
 import com.zhongzheng.modules.user.bo.SchoolProjectAddBo;
 import com.zhongzheng.modules.user.domain.SchoolProject;
@@ -41,6 +43,10 @@ public class MajorServiceImpl extends ServiceImpl<MajorMapper, Major> implements
     @Autowired
     private IMajorProjectService majorProjectService;
 
+
+    @Autowired
+    private IMajorLabelService majorLabelService;
+
     @Override
     public MajorVo queryById(Long id){
         Major db = this.baseMapper.selectById(id);
@@ -91,6 +97,11 @@ public class MajorServiceImpl extends ServiceImpl<MajorMapper, Major> implements
             courseProjectTypeQueryBo.setStatus(status);
             List<CourseProjectTypeVo> courseProjectTypeVos = baseMapper.selectProject(courseProjectTypeQueryBo);
             majorVo.setCourseProjectTypeVo(courseProjectTypeVos);
+
+            MajorLabelVo majorLabelVo = majorLabelService.queryById(majorVo.getLabelId());
+            majorVo.setLabelEncoder(majorLabelVo.getEncoder());
+            majorVo.setLabelName(majorLabelVo.getLabelName());
+
         }
         return voList;
     }

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

@@ -40,6 +40,16 @@ public class MajorVo {
 	@Excel(name = "标签ID")
 	@ApiModelProperty("标签ID")
 	private Long labelId;
+
+	/** 标签名称 */
+	@Excel(name = "标签名称")
+	@ApiModelProperty("标签名称")
+	private String labelName;
+
+	/** 标签ID */
+	@Excel(name = "标签编码")
+	@ApiModelProperty("标签编码")
+	private String labelEncoder;
 	/** 1正常 0关闭 */
 	@Excel(name = "1正常 0关闭")
 	@ApiModelProperty("1正常 0关闭")