教育项目业务类型

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

@@ -36,7 +36,7 @@ public class CourseBusinessAddBo {
     private Long schoolYear;
     /** 0 未启用 1启用 */
     @ApiModelProperty("0 未启用 1启用")
-    private String status;
+    private Integer status;
     /** 添加时间 */
     @ApiModelProperty("添加时间")
     private Long createTime;

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

@@ -42,7 +42,7 @@ public class CourseBusinessEditBo {
 
     /** 0 未启用 1启用 */
     @ApiModelProperty("0 未启用 1启用")
-    private String status;
+    private Integer status;
 
     /** 修改时间 */
     @ApiModelProperty("修改时间")

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

@@ -49,5 +49,5 @@ public class CourseBusinessQueryBo extends BaseEntity {
 	private Long schoolYear;
 	/** 0 未启用 1启用 */
 	@ApiModelProperty("0 未启用 1启用")
-	private String status;
+	private Integer status;
 }

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

@@ -29,7 +29,7 @@ public class CourseEducationTypeAddBo {
     private String remark;
     /** 0 未启用 1启用 */
     @ApiModelProperty("0 未启用 1启用")
-    private String status;
+    private Integer status;
     /** 添加时间 */
     @ApiModelProperty("添加时间")
     private Long createTime;

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

@@ -35,7 +35,7 @@ public class CourseEducationTypeEditBo {
 
     /** 0 未启用 1启用 */
     @ApiModelProperty("0 未启用 1启用")
-    private String status;
+    private Integer status;
 
     /** 修改时间 */
     @ApiModelProperty("修改时间")

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

@@ -44,5 +44,5 @@ public class CourseEducationTypeQueryBo extends BaseEntity {
 	private String encoder;
 	/** 0 未启用 1启用 */
 	@ApiModelProperty("0 未启用 1启用")
-	private String status;
+	private Integer status;
 }

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

@@ -32,7 +32,7 @@ public class CourseProjectTypeAddBo {
     private String educationId;
     /** 0 未启用 1启用 */
     @ApiModelProperty("0 未启用 1启用")
-    private String status;
+    private Integer status;
     /** 添加时间 */
     @ApiModelProperty("添加时间")
     private Long createTime;

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

@@ -39,7 +39,7 @@ public class CourseProjectTypeEditBo {
 
     /** 0 未启用 1启用 */
     @ApiModelProperty("0 未启用 1启用")
-    private String status;
+    private Integer status;
 
     /** 修改时间 */
     @ApiModelProperty("修改时间")

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

@@ -36,6 +36,9 @@ public class CourseProjectTypeQueryBo extends BaseEntity {
 	private String isAsc;
 
 
+	/** $column.columnComment */
+	@ApiModelProperty("$column.columnComment")
+	private Long id;
 	/** 项目名称 */
 	@ApiModelProperty("项目名称")
 	private String projectName;

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

@@ -36,7 +36,7 @@ private static final long serialVersionUID=1L;
     /** 学年 */
     private Long schoolYear;
     /** 0 未启用 1启用 */
-    private String status;
+    private Integer status;
     /** 添加时间 */
     @TableField(fill = FieldFill.INSERT)
     private Long createTime;

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

@@ -33,7 +33,7 @@ private static final long serialVersionUID=1L;
     /** 备注 */
     private String remark;
     /** 0 未启用 1启用 */
-    private String status;
+    private Integer status;
     /** 添加时间 */
     @TableField(fill = FieldFill.INSERT)
     private Long createTime;

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

@@ -35,7 +35,7 @@ private static final long serialVersionUID=1L;
     /** 教育类型id */
     private String educationId;
     /** 0 未启用 1启用 */
-    private String status;
+    private Integer status;
     /** 添加时间 */
     @TableField(fill = FieldFill.INSERT)
     private Long createTime;

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

@@ -42,7 +42,7 @@ public class CourseEducationTypeServiceImpl extends ServiceImpl<CourseEducationT
         LambdaQueryWrapper<CourseEducationType> lqw = Wrappers.lambdaQuery();
         lqw.like(StrUtil.isNotBlank(bo.getEducationName()), CourseEducationType::getEducationName, bo.getEducationName());
         lqw.eq(StrUtil.isNotBlank(bo.getEncoder()), CourseEducationType::getEncoder, bo.getEncoder());
-        lqw.eq(StrUtil.isNotBlank(bo.getStatus()), CourseEducationType::getStatus, bo.getStatus());
+        lqw.eq(bo.getStatus()!=null, CourseEducationType::getStatus, bo.getStatus());
         return entity2Vo(this.list(lqw));
     }
 

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

@@ -43,7 +43,7 @@ public class CourseBusinessVo {
 	/** 0 未启用 1启用 */
 	@Excel(name = "0 未启用 1启用")
 	@ApiModelProperty("0 未启用 1启用")
-	private String status;
+	private Integer status;
 
 	/** 编码YW */
 	@ApiModelProperty("编码YW")

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

@@ -39,5 +39,5 @@ public class CourseEducationTypeVo {
 	/** 0 未启用 1启用 */
 	@Excel(name = "0 未启用 1启用")
 	@ApiModelProperty("0 未启用 1启用")
-	private String status;
+	private Integer status;
 }

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

@@ -47,5 +47,5 @@ public class CourseProjectTypeVo {
 	/** 0 未启用 1启用 */
 	@Excel(name = "0 未启用 1启用")
 	@ApiModelProperty("0 未启用 1启用")
-	private String status;
+	private Integer status;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/SchoolMapper.java

@@ -1,8 +1,11 @@
 package com.zhongzheng.modules.user.mapper;
 
+import com.zhongzheng.modules.course.vo.CourseProjectTypeVo;
 import com.zhongzheng.modules.user.domain.School;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * 高校Mapper接口
  *
@@ -11,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface SchoolMapper extends BaseMapper<School> {
 
+    List<CourseProjectTypeVo> selectProject();
 }

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

@@ -4,7 +4,9 @@ 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.user.bo.SchoolProjectAddBo;
+import com.zhongzheng.modules.course.service.ICourseProjectTypeService;
+import com.zhongzheng.modules.course.vo.CourseProjectTypeVo;
+import com.zhongzheng.modules.user.bo.*;
 import com.zhongzheng.modules.user.domain.SchoolProject;
 import com.zhongzheng.modules.user.service.ISchoolProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,9 +15,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.Page;
-import com.zhongzheng.modules.user.bo.SchoolAddBo;
-import com.zhongzheng.modules.user.bo.SchoolQueryBo;
-import com.zhongzheng.modules.user.bo.SchoolEditBo;
 import com.zhongzheng.modules.user.domain.School;
 import com.zhongzheng.modules.user.mapper.SchoolMapper;
 import com.zhongzheng.modules.user.vo.SchoolVo;
@@ -38,6 +37,9 @@ public class SchoolServiceImpl extends ServiceImpl<SchoolMapper, School> impleme
     @Autowired
     private ISchoolProjectService schoolProjectService;
 
+    @Autowired
+    private ICourseProjectTypeService courseProjectTypeService;
+
     @Override
     public SchoolVo queryById(Long id){
         School db = this.baseMapper.selectById(id);
@@ -72,6 +74,9 @@ public class SchoolServiceImpl extends ServiceImpl<SchoolMapper, School> impleme
             pageVo.addAll(voList);
             voList = pageVo;
         }
+        for (SchoolVo schoolVo : voList) {
+            List<CourseProjectTypeVo> courseProjectTypeVos = baseMapper.selectProject();
+        }
         return voList;
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/SchoolVo.java

@@ -2,11 +2,12 @@ package com.zhongzheng.modules.user.vo;
 
 import com.zhongzheng.common.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zhongzheng.modules.course.vo.CourseProjectTypeVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -48,4 +49,9 @@ public class SchoolVo {
 	@Excel(name = "备注")
 	@ApiModelProperty("备注")
 	private String remark;
+
+	/** 备注 */
+	@Excel(name = "绑定项目类型")
+	@ApiModelProperty("绑定项目类型")
+	private List<CourseProjectTypeVo> courseProjectTypes;
 }

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

@@ -32,6 +32,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             course_project_type p
                 LEFT JOIN course_education_type e ON p.education_id = e.id
-                and p.status != -1
+        <if test="status != null and status != ''">
+                and p.status = #{status}
+        </if>
+        <if test="id != null and id != ''">
+            p.id = #{id}
+        </if>
     </select>
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/user/SchoolMapper.xml

@@ -17,4 +17,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
 
+    <select id="selectProject" parameterType="com.zhongzheng.modules.course.bo.CourseProjectTypeQueryBo"  resultMap="CourseProjectTypeVoResult">
+        SELECT
+        p.*,
+        e.education_name
+        FROM
+        course_project_type p
+        LEFT JOIN course_education_type e ON p.education_id = e.id
+        and p.status != -1
+        <if test="id != null and id != ''">
+            p.id = #{id}
+        </if>
+    </select>
 </mapper>