业务层次

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

@@ -39,6 +39,10 @@ public class CourseBusinessQueryBo extends BaseEntity {
 	@ApiModelProperty("编码YW")
 	private String encoder;
 
+	/** 业务ID */
+	@ApiModelProperty("业务ID")
+	private Long id;
+
 	/** 项目名称 */
 	@ApiModelProperty("项目名称")
 	private String businessName;

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

@@ -29,7 +29,7 @@ public class MajorLabelAddBo {
     private Long updateTime;
     /** 标签名字 */
     @ApiModelProperty("标签名字")
-    private Long labelName;
+    private String labelName;
     /** 1正常 0关闭 */
     @ApiModelProperty("1正常 0关闭")
     private Integer status;

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

@@ -32,7 +32,7 @@ public class MajorLabelEditBo {
 
     /** 标签名字 */
     @ApiModelProperty("标签名字")
-    private Long labelName;
+    private String labelName;
 
     /** 1正常 0关闭 */
     @ApiModelProperty("1正常 0关闭")

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

@@ -39,7 +39,7 @@ public class MajorLabelQueryBo extends BaseEntity {
 
 	/** 标签名字 */
 	@ApiModelProperty("标签名字")
-	private Long labelName;
+	private String labelName;
 	/** 1正常 0关闭 */
 	@ApiModelProperty("1正常 0关闭")
 	private List<Integer> status;

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

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -47,7 +48,7 @@ public class MajorQueryBo extends BaseEntity {
 	private Long labelId;
 	/** 1正常 0关闭 */
 	@ApiModelProperty("1正常 0关闭")
-	private Integer status;
+	private List<Integer> status;
 	/** 编码ZY */
 	@ApiModelProperty("编码ZY")
 	private String encoder;

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

@@ -35,7 +35,7 @@ private static final long serialVersionUID=1L;
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
     /** 标签名字 */
-    private Long labelName;
+    private String labelName;
     /** 1正常 0关闭 */
     private Integer status;
     /** 编码BQ */

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

@@ -16,6 +16,7 @@ import com.zhongzheng.modules.course.domain.CourseBusiness;
 import com.zhongzheng.modules.course.mapper.CourseBusinessMapper;
 import com.zhongzheng.modules.course.vo.CourseBusinessVo;
 import com.zhongzheng.modules.course.service.ICourseBusinessService;
+import org.springframework.util.CollectionUtils;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -33,8 +34,13 @@ public class CourseBusinessServiceImpl extends ServiceImpl<CourseBusinessMapper,
 
     @Override
     public CourseBusinessVo queryById(Long id){
-        CourseBusiness db = this.baseMapper.selectById(id);
-        return BeanUtil.toBean(db, CourseBusinessVo.class);
+        CourseBusinessQueryBo courseBusinessQueryBo = new CourseBusinessQueryBo();
+        courseBusinessQueryBo.setId(id);
+        List<CourseBusinessVo> courseBusinessVos = entity2Vo(baseMapper.queryList(courseBusinessQueryBo));
+        if (CollectionUtils.isEmpty(courseBusinessVos)){
+            throw new IllegalArgumentException("请输入正确业务ID");
+        }
+        return BeanUtil.toBean(courseBusinessVos.get(0), CourseBusinessVo.class);
     }
 
     @Override

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

@@ -16,6 +16,7 @@ import com.zhongzheng.modules.course.domain.CourseProjectType;
 import com.zhongzheng.modules.course.mapper.CourseProjectTypeMapper;
 import com.zhongzheng.modules.course.vo.CourseProjectTypeVo;
 import com.zhongzheng.modules.course.service.ICourseProjectTypeService;
+import org.springframework.util.CollectionUtils;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -33,8 +34,13 @@ public class CourseProjectTypeServiceImpl extends ServiceImpl<CourseProjectTypeM
 
     @Override
     public CourseProjectTypeVo queryById(Long id){
-        CourseProjectType db = this.baseMapper.selectById(id);
-        return BeanUtil.toBean(db, CourseProjectTypeVo.class);
+        CourseProjectTypeQueryBo courseProjectTypeQueryBo = new CourseProjectTypeQueryBo();
+        courseProjectTypeQueryBo.setId(id);
+        List<CourseProjectTypeVo> courseProjectTypeVos = entity2Vo(baseMapper.queryList(courseProjectTypeQueryBo));
+        if (CollectionUtils.isEmpty(courseProjectTypeVos)){
+            throw new IllegalArgumentException("请输入正确业务ID");
+        }
+        return BeanUtil.toBean(courseProjectTypeVos.get(0), CourseProjectTypeVo.class);
     }
 
     @Override

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

@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
 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.IMajorProjectService;
 import com.zhongzheng.modules.course.vo.CourseProjectTypeVo;
@@ -52,8 +53,8 @@ public class MajorServiceImpl extends ServiceImpl<MajorMapper, Major> implements
         lqw.like(StrUtil.isNotBlank(bo.getCategoryName()), Major::getCategoryName, bo.getCategoryName());
         lqw.eq(StrUtil.isNotBlank(bo.getMajorReferral()), Major::getMajorReferral, bo.getMajorReferral());
         lqw.eq(bo.getLabelId() != null, Major::getLabelId, bo.getLabelId());
-        lqw.eq(bo.getStatus() != null, Major::getStatus, bo.getStatus());
         lqw.eq(StrUtil.isNotBlank(bo.getEncoder()), Major::getEncoder, bo.getEncoder());
+        lqw.in(bo.getStatus() != null, Major::getStatus, bo.getStatus());
         return entity2Vo(this.list(lqw));
     }
 

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

@@ -31,7 +31,7 @@ public class MajorLabelVo {
 	/** 标签名字 */
 	@Excel(name = "标签名字")
 	@ApiModelProperty("标签名字")
-	private Long labelName;
+	private String labelName;
 	/** 1正常 0关闭 */
 	@Excel(name = "1正常 0关闭")
 	@ApiModelProperty("1正常 0关闭")

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/SchoolQueryBo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -44,7 +45,7 @@ public class SchoolQueryBo extends BaseEntity {
 	private String encoder;
 	/** 状态 1正常 0关闭 */
 	@ApiModelProperty("状态 1正常 0关闭")
-	private Integer status;
+	private List<Integer> status;
 	/** 学校省份 */
 	@ApiModelProperty("学校省份")
 	private String schoolProvince;

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/SchoolServiceImpl.java

@@ -5,6 +5,7 @@ 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.CourseEducationType;
 import com.zhongzheng.modules.course.service.ICourseProjectTypeService;
 import com.zhongzheng.modules.course.vo.CourseProjectTypeVo;
 import com.zhongzheng.modules.user.bo.*;
@@ -45,7 +46,16 @@ public class SchoolServiceImpl extends ServiceImpl<SchoolMapper, School> impleme
     @Override
     public SchoolVo queryById(Long id){
         School db = this.baseMapper.selectById(id);
-        return BeanUtil.toBean(db, SchoolVo.class);
+        SchoolVo schoolVo = BeanUtil.toBean(db, SchoolVo.class);
+
+        CourseProjectTypeQueryBo courseProjectTypeQueryBo = new CourseProjectTypeQueryBo();
+        courseProjectTypeQueryBo.setId(schoolVo.getId());
+        List<Integer> status = new ArrayList<>();
+        status.add(1);
+        courseProjectTypeQueryBo.setStatus(status);
+        List<CourseProjectTypeVo> courseProjectTypeVos = baseMapper.selectProject(courseProjectTypeQueryBo);
+        schoolVo.setCourseProjectTypes(courseProjectTypeVos);
+        return schoolVo;
     }
 
     @Override
@@ -53,9 +63,9 @@ public class SchoolServiceImpl extends ServiceImpl<SchoolMapper, School> impleme
         LambdaQueryWrapper<School> lqw = Wrappers.lambdaQuery();
         lqw.like(StrUtil.isNotBlank(bo.getSchoolName()), School::getSchoolName, bo.getSchoolName());
         lqw.eq(StrUtil.isNotBlank(bo.getEncoder()), School::getEncoder, bo.getEncoder());
-        lqw.eq(bo.getStatus() != null, School::getStatus, bo.getStatus());
         lqw.eq(StrUtil.isNotBlank(bo.getSchoolProvince()), School::getSchoolProvince, bo.getSchoolProvince());
         lqw.eq(StrUtil.isNotBlank(bo.getSchoolCity()), School::getSchoolCity, bo.getSchoolCity());
+        lqw.in(bo.getStatus() != null, School::getStatus, bo.getStatus());
         return entity2Vo(this.list(lqw));
     }
 

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

@@ -48,5 +48,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="educationId != null and educationId != ''">
             AND p.education_id = #{educationId}
         </if>
+        <if test="id != null and id != ''">
+            AND p.id = #{id}
+        </if>
     </select>
 </mapper>