业务层次

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

@@ -30,7 +30,7 @@ public class MajorExamineAddBo {
     private Long updateTime;
     /** 考期名字 */
     @ApiModelProperty("考期名字")
-    private Long examineName;
+    private String examineName;
     /** 1正常 0关闭 */
     @ApiModelProperty("1正常 0关闭")
     private Integer status;

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

@@ -33,7 +33,7 @@ public class MajorExamineEditBo {
 
     /** 考期名字 */
     @ApiModelProperty("考期名字")
-    private Long examineName;
+    private String examineName;
 
     /** 1正常 0关闭 */
     @ApiModelProperty("1正常 0关闭")

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

@@ -37,9 +37,13 @@ public class MajorExamineQueryBo extends BaseEntity {
 	private String isAsc;
 
 
+	/** id */
+	@ApiModelProperty("id")
+	private Long id;
+
 	/** 考期名字 */
 	@ApiModelProperty("考期名字")
-	private Long examineName;
+	private String examineName;
 	/** 1正常 0关闭 */
 	@ApiModelProperty("1正常 0关闭")
 	private Integer status;

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

@@ -36,7 +36,7 @@ private static final long serialVersionUID=1L;
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
     /** 考期名字 */
-    private Long examineName;
+    private String examineName;
     /** 1正常 0关闭 */
     private Integer status;
     /** 编码KQ */

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

@@ -12,6 +12,7 @@ import com.zhongzheng.modules.course.vo.CourseProjectTypeVo;
 import com.zhongzheng.modules.user.bo.SchoolProjectAddBo;
 import com.zhongzheng.modules.user.domain.SchoolProject;
 import com.zhongzheng.modules.user.vo.SchoolVo;
+import org.apache.commons.math3.distribution.AbstractMultivariateRealDistribution;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -44,7 +45,15 @@ public class CourseSubjectServiceImpl extends ServiceImpl<CourseSubjectMapper, C
     @Override
     public CourseSubjectVo queryById(Long id){
         CourseSubject db = this.baseMapper.selectById(id);
-        return BeanUtil.toBean(db, CourseSubjectVo.class);
+        CourseSubjectVo courseSubjectVo = BeanUtil.toBean(db, CourseSubjectVo.class);
+        CourseProjectTypeQueryBo courseProjectTypeQueryBo = new CourseProjectTypeQueryBo();
+        courseProjectTypeQueryBo.setId(courseSubjectVo.getId());
+        List<Integer> status = new ArrayList<>();
+        status.add(1);
+        courseProjectTypeQueryBo.setStatus(status);
+        List<CourseProjectTypeVo> courseProjectTypeVos = baseMapper.selectProject(courseProjectTypeQueryBo);
+        courseSubjectVo.setCourseProjectTypes(courseProjectTypeVos);
+        return courseSubjectVo;
     }
 
     @Override

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

@@ -16,6 +16,7 @@ import com.zhongzheng.modules.course.domain.MajorExamine;
 import com.zhongzheng.modules.course.mapper.MajorExamineMapper;
 import com.zhongzheng.modules.course.vo.MajorExamineVo;
 import com.zhongzheng.modules.course.service.IMajorExamineService;
+import org.springframework.util.CollectionUtils;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -33,8 +34,13 @@ public class MajorExamineServiceImpl extends ServiceImpl<MajorExamineMapper, Maj
 
     @Override
     public MajorExamineVo queryById(Long id){
-        MajorExamine db = this.baseMapper.selectById(id);
-        return BeanUtil.toBean(db, MajorExamineVo.class);
+        MajorExamineQueryBo majorExamineQueryBo = new MajorExamineQueryBo();
+        majorExamineQueryBo.setId(id);
+        List<MajorExamineVo> majorExamineVos = entity2Vo(baseMapper.queryList(majorExamineQueryBo));
+        if (CollectionUtils.isEmpty(majorExamineVos)){
+            throw new IllegalArgumentException("请输入正确的ID");
+        }
+        return BeanUtil.toBean(majorExamineVos.get(0), MajorExamineVo.class);
     }
 
     @Override

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

@@ -4,6 +4,13 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.modules.course.bo.CourseProjectTypeQueryBo;
+import com.zhongzheng.modules.course.domain.Major;
+import com.zhongzheng.modules.course.mapper.MajorMapper;
+import com.zhongzheng.modules.course.service.IMajorService;
+import com.zhongzheng.modules.course.vo.CourseProjectTypeVo;
+import com.zhongzheng.modules.course.vo.MajorVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -17,6 +24,7 @@ import com.zhongzheng.modules.course.mapper.MajorLabelMapper;
 import com.zhongzheng.modules.course.vo.MajorLabelVo;
 import com.zhongzheng.modules.course.service.IMajorLabelService;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -31,10 +39,20 @@ import java.util.stream.Collectors;
 @Service
 public class MajorLabelServiceImpl extends ServiceImpl<MajorLabelMapper, MajorLabel> implements IMajorLabelService {
 
+    @Autowired
+    private IMajorService majorService;
+
+
+
     @Override
     public MajorLabelVo queryById(Long id){
         MajorLabel db = this.baseMapper.selectById(id);
-        return BeanUtil.toBean(db, MajorLabelVo.class);
+        MajorLabelVo majorLabelVo = BeanUtil.toBean(db, MajorLabelVo.class);
+        LambdaQueryWrapper<Major> lqw = Wrappers.lambdaQuery();
+        lqw.eq( Major::getLabelId, majorLabelVo.getId());
+        List<Major> list = majorService.list(lqw);
+        majorLabelVo.setMajorVos(entityMajorVo(list));
+        return majorLabelVo;
     }
 
     @Override
@@ -42,6 +60,20 @@ public class MajorLabelServiceImpl extends ServiceImpl<MajorLabelMapper, MajorLa
         return entity2Vo(baseMapper.queryList(bo));
     }
 
+    private List<MajorVo> entityMajorVo(Collection<Major> collection) {
+        List<MajorVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, MajorVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<Major> page = (Page<Major>)collection;
+            Page<MajorVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
     /**
     * 实体类转化成视图对象
     *

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

@@ -44,7 +44,15 @@ public class MajorServiceImpl extends ServiceImpl<MajorMapper, Major> implements
     @Override
     public MajorVo queryById(Long id){
         Major db = this.baseMapper.selectById(id);
-        return BeanUtil.toBean(db, MajorVo.class);
+        MajorVo majorVo = BeanUtil.toBean(db, MajorVo.class);
+        CourseProjectTypeQueryBo courseProjectTypeQueryBo = new CourseProjectTypeQueryBo();
+        courseProjectTypeQueryBo.setId(majorVo.getId());
+        List<Integer> status = new ArrayList<>();
+        status.add(1);
+        courseProjectTypeQueryBo.setStatus(status);
+        List<CourseProjectTypeVo> courseProjectTypeVos = baseMapper.selectProject(courseProjectTypeQueryBo);
+        majorVo.setCourseProjectTypeVo(courseProjectTypeVos);
+        return majorVo;
     }
 
     @Override

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

@@ -31,7 +31,7 @@ public class MajorExamineVo {
 	/** 考期名字 */
 	@Excel(name = "考期名字")
 	@ApiModelProperty("考期名字")
-	private Long examineName;
+	private String examineName;
 	/** 1正常 0关闭 */
 	@Excel(name = "1正常 0关闭")
 	@ApiModelProperty("1正常 0关闭")

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

@@ -2,11 +2,12 @@ package com.zhongzheng.modules.course.vo;
 
 import com.zhongzheng.common.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zhongzheng.modules.course.domain.Major;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -45,4 +46,9 @@ public class MajorLabelVo {
 	@Excel(name = "关联专业数目")
 	@ApiModelProperty("关联专业数目")
 	private Integer num;
+
+	/** 关联专业数目 */
+	@Excel(name = "专业")
+	@ApiModelProperty("专业")
+	private List<MajorVo> majorVos;
 }