教育项目业务类型

zhongzheng-admin/src/main/java/com/zhongzheng/controller/user/SchoolController.java

@@ -3,18 +3,9 @@ package com.zhongzheng.controller.user;
 import java.util.List;
 import java.util.Arrays;
 
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.zhongzheng.modules.order.domain.OrderGoods;
-import com.zhongzheng.modules.user.bo.SchoolAddBo;
-import com.zhongzheng.modules.user.bo.SchoolEditBo;
-import com.zhongzheng.modules.user.bo.SchoolQueryBo;
-import com.zhongzheng.modules.user.domain.School;
-import com.zhongzheng.modules.user.service.ISchoolService;
-import com.zhongzheng.modules.user.vo.SchoolVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -27,7 +18,11 @@ import com.zhongzheng.common.annotation.Log;
 import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.enums.BusinessType;
-
+import com.zhongzheng.modules.user.vo.SchoolVo;
+import com.zhongzheng.modules.user.bo.SchoolQueryBo;
+import com.zhongzheng.modules.user.bo.SchoolAddBo;
+import com.zhongzheng.modules.user.bo.SchoolEditBo;
+import com.zhongzheng.modules.user.service.ISchoolService;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import io.swagger.annotations.Api;
@@ -35,14 +30,14 @@ import io.swagger.annotations.ApiOperation;
 
 /**
  * 高校Controller
- *
- * @author hjl
- * @date 2021-05-19
+ * 
+ * @author ruoyi
+ * @date 2021-10-09
  */
 @Api(value = "高校控制器", tags = {"高校管理"})
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
-@RequestMapping("/user/school")
+@RequestMapping("/modules.user/school")
 public class SchoolController extends BaseController {
 
     private final ISchoolService iSchoolService;
@@ -51,32 +46,32 @@ public class SchoolController extends BaseController {
      * 查询高校列表
      */
     @ApiOperation("查询高校列表")
-    @PreAuthorize("@ss.hasPermi('user:school:list')")
+    @PreAuthorize("@ss.hasPermi('modules.user:school:list')")
     @GetMapping("/list")
-    public TableDataInfo<School> list(SchoolQueryBo bo) {
+    public TableDataInfo<SchoolVo> list(SchoolQueryBo bo) {
         startPage();
-        List<School> list = iSchoolService.selectList(bo);
+        List<SchoolVo> list = iSchoolService.queryList(bo);
         return getDataTable(list);
     }
 
     /**
      * 导出高校列表
      */
-    /*@ApiOperation("导出高校列表")
-    @PreAuthorize("@ss.hasPermi('system:school:export')")
+    @ApiOperation("导出高校列表")
+    @PreAuthorize("@ss.hasPermi('modules.user:school:export')")
     @Log(title = "高校", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult<SchoolVo> export(SchoolQueryBo bo) {
         List<SchoolVo> list = iSchoolService.queryList(bo);
         ExcelUtil<SchoolVo> util = new ExcelUtil<SchoolVo>(SchoolVo.class);
         return util.exportExcel(list, "高校");
-    }*/
+    }
 
     /**
      * 获取高校详细信息
      */
     @ApiOperation("获取高校详细信息")
-    @PreAuthorize("@ss.hasPermi('user:school:query')")
+    @PreAuthorize("@ss.hasPermi('modules.user:school:query')")
     @GetMapping("/{id}")
     public AjaxResult<SchoolVo> getInfo(@PathVariable("id" ) Long id) {
         return AjaxResult.success(iSchoolService.queryById(id));
@@ -86,11 +81,10 @@ public class SchoolController extends BaseController {
      * 新增高校
      */
     @ApiOperation("新增高校")
-    @ApiOperationSupport(ignoreParameters = {"updateTime","createTime"})
-    @PreAuthorize("@ss.hasPermi('user:school:add')")
+    @PreAuthorize("@ss.hasPermi('modules.user:school:add')")
     @Log(title = "高校", businessType = BusinessType.INSERT)
     @PostMapping()
-    public AjaxResult<Void> add(@Validated @RequestBody SchoolAddBo bo) {
+    public AjaxResult<Void> add(@RequestBody SchoolAddBo bo) {
         return toAjax(iSchoolService.insertByAddBo(bo) ? 1 : 0);
     }
 
@@ -98,22 +92,21 @@ public class SchoolController extends BaseController {
      * 修改高校
      */
     @ApiOperation("修改高校")
-    @ApiOperationSupport(ignoreParameters = {"updateTime","createTime"})
-    @PreAuthorize("@ss.hasPermi('user:school:edit')")
+    @PreAuthorize("@ss.hasPermi('modules.user:school:edit')")
     @Log(title = "高校", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@Validated @RequestBody SchoolEditBo bo) {
+    @PutMapping()
+    public AjaxResult<Void> edit(@RequestBody SchoolEditBo bo) {
         return toAjax(iSchoolService.updateByEditBo(bo) ? 1 : 0);
     }
 
     /**
      * 删除高校
      */
-    /* @ApiOperation("删除高校")
-    @PreAuthorize("@ss.hasPermi('system:school:remove')")
+    @ApiOperation("删除高校")
+    @PreAuthorize("@ss.hasPermi('modules.user:school:remove')")
     @Log(title = "高校" , businessType = BusinessType.DELETE)
-    @PostMapping("/delete")
+    @DeleteMapping("/{ids}")
     public AjaxResult<Void> remove(@PathVariable Long[] ids) {
         return toAjax(iSchoolService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
-    }*/
+    }
 }

zhongzheng-admin/src/main/java/com/zhongzheng/controller/user/SchoolProjectController.java

@@ -0,0 +1,112 @@
+package com.zhongzheng.controller.user;
+
+import java.util.List;
+import java.util.Arrays;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.modules.user.vo.SchoolProjectVo;
+import com.zhongzheng.modules.user.bo.SchoolProjectQueryBo;
+import com.zhongzheng.modules.user.bo.SchoolProjectAddBo;
+import com.zhongzheng.modules.user.bo.SchoolProjectEditBo;
+import com.zhongzheng.modules.user.service.ISchoolProjectService;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 院校绑定项目Controller
+ * 
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Api(value = "院校绑定项目控制器", tags = {"院校绑定项目管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/modules.user/project")
+public class SchoolProjectController extends BaseController {
+
+    private final ISchoolProjectService iSchoolProjectService;
+
+    /**
+     * 查询院校绑定项目列表
+     */
+    @ApiOperation("查询院校绑定项目列表")
+    @PreAuthorize("@ss.hasPermi('modules.user:project:list')")
+    @GetMapping("/list")
+    public TableDataInfo<SchoolProjectVo> list(SchoolProjectQueryBo bo) {
+        startPage();
+        List<SchoolProjectVo> list = iSchoolProjectService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出院校绑定项目列表
+     */
+    @ApiOperation("导出院校绑定项目列表")
+    @PreAuthorize("@ss.hasPermi('modules.user:project:export')")
+    @Log(title = "院校绑定项目", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<SchoolProjectVo> export(SchoolProjectQueryBo bo) {
+        List<SchoolProjectVo> list = iSchoolProjectService.queryList(bo);
+        ExcelUtil<SchoolProjectVo> util = new ExcelUtil<SchoolProjectVo>(SchoolProjectVo.class);
+        return util.exportExcel(list, "院校绑定项目");
+    }
+
+    /**
+     * 获取院校绑定项目详细信息
+     */
+    @ApiOperation("获取院校绑定项目详细信息")
+    @PreAuthorize("@ss.hasPermi('modules.user:project:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<SchoolProjectVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iSchoolProjectService.queryById(id));
+    }
+
+    /**
+     * 新增院校绑定项目
+     */
+    @ApiOperation("新增院校绑定项目")
+    @PreAuthorize("@ss.hasPermi('modules.user:project:add')")
+    @Log(title = "院校绑定项目", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody SchoolProjectAddBo bo) {
+        return toAjax(iSchoolProjectService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改院校绑定项目
+     */
+    @ApiOperation("修改院校绑定项目")
+    @PreAuthorize("@ss.hasPermi('modules.user:project:edit')")
+    @Log(title = "院校绑定项目", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public AjaxResult<Void> edit(@RequestBody SchoolProjectEditBo bo) {
+        return toAjax(iSchoolProjectService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除院校绑定项目
+     */
+    @ApiOperation("删除院校绑定项目")
+    @PreAuthorize("@ss.hasPermi('modules.user:project:remove')")
+    @Log(title = "院校绑定项目" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(iSchoolProjectService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }
+}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/user/SchoolTypeController.java

@@ -1,116 +0,0 @@
-package com.zhongzheng.controller.user;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.zhongzheng.modules.user.bo.SchoolTypeAddBo;
-import com.zhongzheng.modules.user.bo.SchoolTypeEditBo;
-import com.zhongzheng.modules.user.bo.SchoolTypeQueryBo;
-import com.zhongzheng.modules.user.service.ISchoolTypeService;
-import com.zhongzheng.modules.user.vo.SchoolTypeVo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 高校类型Controller
- *
- * @author hjl
- * @date 2021-05-18
- */
-@Api(value = "高校类型控制器", tags = {"高校类型管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/system/type")
-public class SchoolTypeController extends BaseController {
-
-    private final ISchoolTypeService iSchoolTypeService;
-
-    /**
-     * 查询高校类型列表
-     */
-    @ApiOperation("查询高校类型列表")
-    @PreAuthorize("@ss.hasPermi('system:type:list')")
-    @GetMapping("/list")
-    public TableDataInfo<SchoolTypeVo> list(SchoolTypeQueryBo bo) {
-        startPage();
-        List<SchoolTypeVo> list = iSchoolTypeService.queryList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出高校类型列表
-     */
-  /*  @ApiOperation("导出高校类型列表")
-    @PreAuthorize("@ss.hasPermi('system:type:export')")
-    @Log(title = "高校类型", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<SchoolTypeVo> export(SchoolTypeQueryBo bo) {
-        List<SchoolTypeVo> list = iSchoolTypeService.queryList(bo);
-        ExcelUtil<SchoolTypeVo> util = new ExcelUtil<SchoolTypeVo>(SchoolTypeVo.class);
-        return util.exportExcel(list, "高校类型");
-    }*/
-
-    /**
-     * 获取高校类型详细信息
-     */
-    @ApiOperation("获取高校类型详细信息")
-    @PreAuthorize("@ss.hasPermi('system:type:query')")
-    @GetMapping("/{id}")
-    public AjaxResult<SchoolTypeVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iSchoolTypeService.queryById(id));
-    }
-
-    /**
-     * 新增高校类型
-     */
-    @ApiOperation("新增高校类型")
-    @ApiOperationSupport(ignoreParameters = {"updateTime","createTime"})
-    @PreAuthorize("@ss.hasPermi('system:type:add')")
-    @Log(title = "高校类型", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@Validated  @RequestBody SchoolTypeAddBo bo) {
-        return toAjax(iSchoolTypeService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改高校类型
-     */
-    @ApiOperation("修改高校类型")
-    @ApiOperationSupport(ignoreParameters = {"updateTime","createTime"})
-    @PreAuthorize("@ss.hasPermi('system:type:edit')")
-    @Log(title = "高校类型", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@Validated @RequestBody SchoolTypeEditBo bo) {
-        return toAjax(iSchoolTypeService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除高校类型
-     */
-    @ApiOperation("删除高校类型")
-    @PreAuthorize("@ss.hasPermi('system:type:remove')")
-    @Log(title = "高校类型" , businessType = BusinessType.DELETE)
-    @PostMapping("/delete")
-    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
-        return toAjax(iSchoolTypeService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
-    }
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseProjectTypeMapper.java

@@ -1,7 +1,11 @@
 package com.zhongzheng.modules.course.mapper;
 
+import com.zhongzheng.modules.course.bo.CourseProjectTypeQueryBo;
 import com.zhongzheng.modules.course.domain.CourseProjectType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.course.vo.CourseProjectTypeVo;
+
+import java.util.Collection;
 
 /**
  * 项目类型Mapper接口
@@ -11,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface CourseProjectTypeMapper extends BaseMapper<CourseProjectType> {
 
+    Collection<CourseProjectTypeVo> queryList(CourseProjectTypeQueryBo bo);
 }

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

@@ -38,12 +38,7 @@ public class CourseProjectTypeServiceImpl extends ServiceImpl<CourseProjectTypeM
 
     @Override
     public List<CourseProjectTypeVo> queryList(CourseProjectTypeQueryBo bo) {
-        LambdaQueryWrapper<CourseProjectType> lqw = Wrappers.lambdaQuery();
-        lqw.like(StrUtil.isNotBlank(bo.getProjectName()), CourseProjectType::getProjectName, bo.getProjectName());
-        lqw.eq(StrUtil.isNotBlank(bo.getEncoder()), CourseProjectType::getEncoder, bo.getEncoder());
-        lqw.eq(StrUtil.isNotBlank(bo.getEducationId()), CourseProjectType::getEducationId, bo.getEducationId());
-        lqw.eq(StrUtil.isNotBlank(bo.getStatus()), CourseProjectType::getStatus, bo.getStatus());
-        return entity2Vo(this.list(lqw));
+        return entity2Vo(baseMapper.queryList(bo));
     }
 
     /**
@@ -52,12 +47,12 @@ public class CourseProjectTypeServiceImpl extends ServiceImpl<CourseProjectTypeM
     * @param collection 实体类集合
     * @return
     */
-    private List<CourseProjectTypeVo> entity2Vo(Collection<CourseProjectType> collection) {
+    private List<CourseProjectTypeVo> entity2Vo(Collection<CourseProjectTypeVo> collection) {
         List<CourseProjectTypeVo> voList = collection.stream()
                 .map(any -> BeanUtil.toBean(any, CourseProjectTypeVo.class))
                 .collect(Collectors.toList());
         if (collection instanceof Page) {
-            Page<CourseProjectType> page = (Page<CourseProjectType>)collection;
+            Page<CourseProjectTypeVo> page = (Page<CourseProjectTypeVo>)collection;
             Page<CourseProjectTypeVo> pageVo = new Page<>();
             BeanUtil.copyProperties(page,pageVo);
             pageVo.addAll(voList);

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

@@ -4,8 +4,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
 import java.util.Date;
 
 
@@ -13,20 +11,19 @@ import java.util.Date;
 /**
  * 高校添加对象 school
  *
- * @author hjl
- * @date 2021-05-21
+ * @author ruoyi
+ * @date 2021-10-09
  */
 @Data
 @ApiModel("高校添加对象")
 public class SchoolAddBo {
 
-    /** 学校类型 */
-    @ApiModelProperty("学校类型")
-    private Long schoolTypeId;
     /**  高校名称 */
     @ApiModelProperty(" 高校名称")
-    @NotBlank(message = "高校名称不能为空")
     private String schoolName;
+    /** 编码YX */
+    @ApiModelProperty("编码YX")
+    private String encoder;
     /** 状态 1正常 0关闭 */
     @ApiModelProperty("状态 1正常 0关闭")
     private Integer status;
@@ -36,25 +33,13 @@ public class SchoolAddBo {
     /** $column.columnComment */
     @ApiModelProperty("$column.columnComment")
     private Long updateTime;
-    /** 简介 */
-    @ApiModelProperty("简介")
-    private String introduction;
+    /** 学校省份 */
+    @ApiModelProperty("学校省份")
+    private String schoolProvince;
     /** 学校城市 */
     @ApiModelProperty("学校城市")
     private String schoolCity;
-    /** 优势专业 */
-    @ApiModelProperty("优势专业")
-    private String advantageSpecialty;
-    /** 联系人 */
-    @ApiModelProperty("联系人")
-    private String contact;
-    /** 联系电话 */
-    @ApiModelProperty("联系电话")
-    private String phone;
-    /** 地址 */
-    @ApiModelProperty("地址")
-    private String address;
-    /** 学校等级字典ID */
-    @ApiModelProperty("学校等级字典ID")
-    private Long dictCode;
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
 }

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

@@ -4,35 +4,31 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
 import java.util.Date;
 
 
 /**
  * 高校编辑对象 school
  *
- * @author hjl
- * @date 2021-05-21
+ * @author ruoyi
+ * @date 2021-10-09
  */
 @Data
 @ApiModel("高校编辑对象")
 public class SchoolEditBo {
 
-
     /** $column.columnComment */
     @ApiModelProperty("$column.columnComment")
     private Long id;
 
-    /** 学校类型 */
-    @ApiModelProperty("学校类型")
-    private Long schoolTypeId;
-
     /**  高校名称 */
     @ApiModelProperty(" 高校名称")
-    @NotBlank(message = "高校名称不能为空")
     private String schoolName;
 
+    /** 编码YX */
+    @ApiModelProperty("编码YX")
+    private String encoder;
+
     /** 状态 1正常 0关闭 */
     @ApiModelProperty("状态 1正常 0关闭")
     private Integer status;
@@ -41,31 +37,16 @@ public class SchoolEditBo {
     @ApiModelProperty("$column.columnComment")
     private Long updateTime;
 
-    /** 简介 */
-    @ApiModelProperty("简介")
-    private String introduction;
+    /** 学校省份 */
+    @ApiModelProperty("学校省份")
+    private String schoolProvince;
 
     /** 学校城市 */
     @ApiModelProperty("学校城市")
     private String schoolCity;
 
-    /** 优势专业 */
-    @ApiModelProperty("优势专业")
-    private String advantageSpecialty;
-
-    /** 联系人 */
-    @ApiModelProperty("联系人")
-    private String contact;
-
-    /** 联系电话 */
-    @ApiModelProperty("联系电话")
-    private String phone;
-
-    /** 地址 */
-    @ApiModelProperty("地址")
-    private String address;
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
 
-    /** 学校等级字典ID */
-    @ApiModelProperty("学校等级字典ID")
-    private Long dictCode;
 }

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

@@ -0,0 +1,34 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 院校绑定项目添加对象 school_project
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Data
+@ApiModel("院校绑定项目添加对象")
+public class SchoolProjectAddBo {
+
+    /** 项目ID */
+    @ApiModelProperty("项目ID")
+    private Long projectId;
+    /** 学校ID */
+    @ApiModelProperty("学校ID")
+    private Long schoolId;
+
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+}

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

@@ -0,0 +1,32 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 院校绑定项目编辑对象 school_project
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Data
+@ApiModel("院校绑定项目编辑对象")
+public class SchoolProjectEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 项目ID */
+    @ApiModelProperty("项目ID")
+    private Long projectId;
+
+    /** 学校ID */
+    @ApiModelProperty("学校ID")
+    private Long schoolId;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/SchoolTypeQueryBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/SchoolProjectQueryBo.java

@@ -12,15 +12,15 @@ import java.util.HashMap;
 import com.zhongzheng.common.core.domain.BaseEntity;
 
 /**
- * 高校类型分页查询对象 school_type
+ * 院校绑定项目分页查询对象 school_project
  *
- * @author hjl
- * @date 2021-05-18
+ * @author ruoyi
+ * @date 2021-10-09
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel("高校类型分页查询对象")
-public class SchoolTypeQueryBo extends BaseEntity {
+@ApiModel("院校绑定项目分页查询对象")
+public class SchoolProjectQueryBo extends BaseEntity {
 
 	/** 分页大小 */
 	@ApiModelProperty("分页大小")
@@ -36,17 +36,10 @@ public class SchoolTypeQueryBo extends BaseEntity {
 	private String isAsc;
 
 
-	/** 学校类型名称 */
-	@ApiModelProperty("学校类型名称")
-	private String typeName;
-	/** 显示顺序 */
-	@ApiModelProperty("显示顺序")
-	private Long orderNum;
-	/** 状态 0关闭 1开启 */
-	@ApiModelProperty("状态 0关闭 1开启")
-	private Integer status;
-	/** 介绍 */
-	@ApiModelProperty("介绍")
-	private String introduce;
-
+	/** 项目ID */
+	@ApiModelProperty("项目ID")
+	private Long projectId;
+	/** 学校ID */
+	@ApiModelProperty("学校ID")
+	private Long schoolId;
 }

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

@@ -6,7 +6,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -15,8 +14,8 @@ import com.zhongzheng.common.core.domain.BaseEntity;
 /**
  * 高校分页查询对象 school
  *
- * @author hjl
- * @date 2021-05-21
+ * @author ruoyi
+ * @date 2021-10-09
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -37,35 +36,19 @@ public class SchoolQueryBo extends BaseEntity {
 	private String isAsc;
 
 
-	/** 学校类型 */
-	@ApiModelProperty("学校类型")
-	private Long schoolTypeId;
 	/**  高校名称 */
 	@ApiModelProperty(" 高校名称")
 	private String schoolName;
+	/** 编码YX */
+	@ApiModelProperty("编码YX")
+	private String encoder;
 	/** 状态 1正常 0关闭 */
 	@ApiModelProperty("状态 1正常 0关闭")
-	private List<Integer> status;
-	/** 简介 */
-	@ApiModelProperty("简介")
-	private String introduction;
+	private Integer status;
+	/** 学校省份 */
+	@ApiModelProperty("学校省份")
+	private String schoolProvince;
 	/** 学校城市 */
 	@ApiModelProperty("学校城市")
 	private String schoolCity;
-	/** 优势专业 */
-	@ApiModelProperty("优势专业")
-	private String advantageSpecialty;
-	/** 联系人 */
-	@ApiModelProperty("联系人")
-	private String contact;
-	/** 联系电话 */
-	@ApiModelProperty("联系电话")
-	private String phone;
-	/** 地址 */
-	@ApiModelProperty("地址")
-	private String address;
-	/** 学校等级字典ID */
-	@ApiModelProperty("学校等级字典ID")
-	private Long dictCode;
-
 }

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

@@ -1,42 +0,0 @@
-package com.zhongzheng.modules.user.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import java.util.Date;
-
-
-
-/**
- * 高校类型添加对象 school_type
- *
- * @author hjl
- * @date 2021-05-18
- */
-@Data
-@ApiModel("高校类型添加对象")
-public class SchoolTypeAddBo {
-
-    /** 学校类型名称 */
-    @ApiModelProperty(value ="学校类型名称",required = true)
-    @NotBlank(message = "学校类型名称不能为空")
-    private String typeName;
-    /** 显示顺序 */
-    @ApiModelProperty("显示顺序")
-    private Long orderNum;
-    /** 状态 0关闭 1开启 */
-    @ApiModelProperty("状态 0关闭 1开启")
-    private Integer status;
-    /** 介绍 */
-    @ApiModelProperty("介绍")
-    private String introduce;
-    /** 创建时间 */
-    @ApiModelProperty("创建时间")
-    private Long createTime;
-    /** 更新时间 */
-    @ApiModelProperty("更新时间")
-    private Long updateTime;
-}

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

@@ -1,47 +0,0 @@
-package com.zhongzheng.modules.user.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import java.util.Date;
-
-
-/**
- * 高校类型编辑对象 school_type
- *
- * @author hjl
- * @date 2021-05-18
- */
-@Data
-@ApiModel("高校类型编辑对象")
-public class SchoolTypeEditBo {
-
-
-    /** $column.columnComment */
-    @ApiModelProperty("$column.columnComment")
-    private Long id;
-
-    /** 学校类型名称 */
-    @ApiModelProperty(value ="学校类型名称",required = true)
-    @NotBlank(message = "学校类型名称不能为空")
-    private String typeName;
-
-    /** 显示顺序 */
-    @ApiModelProperty("显示顺序")
-    private Long orderNum;
-
-    /** 状态 0关闭 1开启 */
-    @ApiModelProperty("状态 0关闭 1开启")
-    private Integer status;
-
-    /** 介绍 */
-    @ApiModelProperty("介绍")
-    private String introduce;
-
-    /** 更新时间 */
-    @ApiModelProperty("更新时间")
-    private Long updateTime;
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/School.java

@@ -12,8 +12,8 @@ import com.zhongzheng.common.annotation.Excel;
 /**
  * 高校对象 school
  *
- * @author hjl
- * @date 2021-05-21
+ * @author ruoyi
+ * @date 2021-10-09
  */
 @Data
 @NoArgsConstructor
@@ -23,51 +23,25 @@ public class School implements Serializable {
 
 private static final long serialVersionUID=1L;
 
-
     /** $column.columnComment */
     @TableId(value = "id")
     private Long id;
-
-    /** 学校类型 */
-    private Long schoolTypeId;
-
     /**  高校名称 */
     private String schoolName;
-
+    /** 编码YX */
+    private String encoder;
     /** 状态 1正常 0关闭 */
     private Integer status;
-
     /** 创建时间 */
     @TableField(fill = FieldFill.INSERT)
     private Long createTime;
-
     /** $column.columnComment */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
-
-    /** 简介 */
-    private String introduction;
-
+    /** 学校省份 */
+    private String schoolProvince;
     /** 学校城市 */
     private String schoolCity;
-
-    /** 优势专业 */
-    private String advantageSpecialty;
-
-    /** 联系人 */
-    private String contact;
-
-    /** 联系电话 */
-    private String phone;
-
-    /** 地址 */
-    private String address;
-
-    /** 学校等级字典ID */
-    private Long dictCode;
-
-    /**  高校等级 */
-    @TableField(exist = false)
-    private String dictLabel;
-
+    /** 备注 */
+    private String remark;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/SchoolType.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/SchoolProject.java

@@ -10,42 +10,30 @@ import java.math.BigDecimal;
 import com.zhongzheng.common.annotation.Excel;
 
 /**
- * 高校类型对象 school_type
+ * 院校绑定项目对象 school_project
  *
  * @author ruoyi
- * @date 2021-05-18
+ * @date 2021-10-09
  */
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("school_type")
-public class SchoolType implements Serializable {
+@TableName("school_project")
+public class SchoolProject implements Serializable {
 
 private static final long serialVersionUID=1L;
 
-
     /** $column.columnComment */
     @TableId(value = "id")
     private Long id;
+    /** 项目ID */
+    private Long projectId;
+    /** 学校ID */
+    private Long schoolId;
 
-    /** 学校类型名称 */
-    private String typeName;
-
-    /** 显示顺序 */
-    private Long orderNum;
-
-    /** 状态 0关闭 1开启 */
-    private Integer status;
-
-    /** 介绍 */
-    private String introduce;
-
-    /** 创建时间 */
     @TableField(fill = FieldFill.INSERT)
     private Long createTime;
-
-    /** 更新时间 */
+    /** $column.columnComment */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
-
 }

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

@@ -1,20 +1,14 @@
 package com.zhongzheng.modules.user.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.modules.user.bo.SchoolQueryBo;
-import com.zhongzheng.modules.user.bo.UserSchoolInfoQueryBo;
 import com.zhongzheng.modules.user.domain.School;
-import com.zhongzheng.modules.user.domain.UserSchoolInfo;
-
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * 高校Mapper接口
  *
- * @author hjl
- * @date 2021-05-21
+ * @author ruoyi
+ * @date 2021-10-09
  */
 public interface SchoolMapper extends BaseMapper<School> {
-    List<School> selectList(SchoolQueryBo bo);
 
 }

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

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.user.mapper;
+
+import com.zhongzheng.modules.user.domain.SchoolProject;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 院校绑定项目Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+public interface SchoolProjectMapper extends BaseMapper<SchoolProject> {
+
+}

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

@@ -1,15 +0,0 @@
-package com.zhongzheng.modules.user.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.modules.user.domain.SchoolType;
-
-/**
- * 高校类型Mapper接口
- *
- * @author hjl
- * @date 2021-05-18
- */
-public interface SchoolTypeMapper extends BaseMapper<SchoolType> {
-
-}

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

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.user.service;
+
+import com.zhongzheng.modules.user.domain.SchoolProject;
+import com.zhongzheng.modules.user.vo.SchoolProjectVo;
+import com.zhongzheng.modules.user.bo.SchoolProjectQueryBo;
+import com.zhongzheng.modules.user.bo.SchoolProjectAddBo;
+import com.zhongzheng.modules.user.bo.SchoolProjectEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 院校绑定项目Service接口
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+public interface ISchoolProjectService extends IService<SchoolProject> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	SchoolProjectVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<SchoolProjectVo> queryList(SchoolProjectQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入院校绑定项目
+	 * @param bo 院校绑定项目新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(SchoolProjectAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改院校绑定项目
+	 * @param bo 院校绑定项目编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(SchoolProjectEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -1,13 +1,11 @@
 package com.zhongzheng.modules.user.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.modules.user.bo.SchoolAddBo;
-import com.zhongzheng.modules.user.bo.SchoolEditBo;
-import com.zhongzheng.modules.user.bo.SchoolQueryBo;
-import com.zhongzheng.modules.user.bo.UserSchoolInfoQueryBo;
 import com.zhongzheng.modules.user.domain.School;
-import com.zhongzheng.modules.user.domain.UserSchoolInfo;
 import com.zhongzheng.modules.user.vo.SchoolVo;
+import com.zhongzheng.modules.user.bo.SchoolQueryBo;
+import com.zhongzheng.modules.user.bo.SchoolAddBo;
+import com.zhongzheng.modules.user.bo.SchoolEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.Collection;
 import java.util.List;
@@ -15,8 +13,8 @@ import java.util.List;
 /**
  * 高校Service接口
  *
- * @author hjl
- * @date 2021-05-21
+ * @author ruoyi
+ * @date 2021-10-09
  */
 public interface ISchoolService extends IService<School> {
 	/**
@@ -30,8 +28,6 @@ public interface ISchoolService extends IService<School> {
 	 */
 	List<SchoolVo> queryList(SchoolQueryBo bo);
 
-	List<School> selectList(SchoolQueryBo bo);
-
 	/**
 	 * 根据新增业务对象插入高校
 	 * @param bo 高校新增业务对象

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

@@ -1,53 +0,0 @@
-package com.zhongzheng.modules.user.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.modules.user.bo.SchoolTypeAddBo;
-import com.zhongzheng.modules.user.bo.SchoolTypeEditBo;
-import com.zhongzheng.modules.user.bo.SchoolTypeQueryBo;
-import com.zhongzheng.modules.user.domain.SchoolType;
-import com.zhongzheng.modules.user.vo.SchoolTypeVo;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 高校类型Service接口
- *
- * @author hjl
- * @date 2021-05-18
- */
-public interface ISchoolTypeService extends IService<SchoolType> {
-	/**
-	 * 查询单个
-	 * @return
-	 */
-	SchoolTypeVo queryById(Long id);
-
-	/**
-	 * 查询列表
-	 */
-	List<SchoolTypeVo> queryList(SchoolTypeQueryBo bo);
-
-	/**
-	 * 根据新增业务对象插入高校类型
-	 * @param bo 高校类型新增业务对象
-	 * @return
-	 */
-	Boolean insertByAddBo(SchoolTypeAddBo bo);
-
-	/**
-	 * 根据编辑业务对象修改高校类型
-	 * @param bo 高校类型编辑业务对象
-	 * @return
-	 */
-	Boolean updateByEditBo(SchoolTypeEditBo bo);
-
-	/**
-	 * 校验并删除数据
-	 * @param ids 主键集合
-	 * @param isValid 是否校验,true-删除前校验,false-不校验
-	 * @return
-	 */
-	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-}

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

@@ -0,0 +1,100 @@
+package com.zhongzheng.modules.user.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import org.springframework.stereotype.Service;
+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.SchoolProjectAddBo;
+import com.zhongzheng.modules.user.bo.SchoolProjectQueryBo;
+import com.zhongzheng.modules.user.bo.SchoolProjectEditBo;
+import com.zhongzheng.modules.user.domain.SchoolProject;
+import com.zhongzheng.modules.user.mapper.SchoolProjectMapper;
+import com.zhongzheng.modules.user.vo.SchoolProjectVo;
+import com.zhongzheng.modules.user.service.ISchoolProjectService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 院校绑定项目Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Service
+public class SchoolProjectServiceImpl extends ServiceImpl<SchoolProjectMapper, SchoolProject> implements ISchoolProjectService {
+
+    @Override
+    public SchoolProjectVo queryById(Long id){
+        SchoolProject db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, SchoolProjectVo.class);
+    }
+
+    @Override
+    public List<SchoolProjectVo> queryList(SchoolProjectQueryBo bo) {
+        LambdaQueryWrapper<SchoolProject> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getProjectId() != null, SchoolProject::getProjectId, bo.getProjectId());
+        lqw.eq(bo.getSchoolId() != null, SchoolProject::getSchoolId, bo.getSchoolId());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<SchoolProjectVo> entity2Vo(Collection<SchoolProject> collection) {
+        List<SchoolProjectVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, SchoolProjectVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<SchoolProject> page = (Page<SchoolProject>)collection;
+            Page<SchoolProjectVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(SchoolProjectAddBo bo) {
+        SchoolProject add = BeanUtil.toBean(bo, SchoolProject.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(SchoolProjectEditBo bo) {
+        SchoolProject update = BeanUtil.toBean(bo, SchoolProject.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(SchoolProject entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

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

@@ -3,20 +3,18 @@ package com.zhongzheng.modules.user.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
-import com.zhongzheng.modules.user.bo.SchoolAddBo;
-import com.zhongzheng.modules.user.bo.SchoolEditBo;
-import com.zhongzheng.modules.user.bo.SchoolQueryBo;
-import com.zhongzheng.modules.user.domain.School;
-import com.zhongzheng.modules.user.mapper.SchoolMapper;
-import com.zhongzheng.modules.user.mapper.UserSchoolInfoMapper;
-import com.zhongzheng.modules.user.service.ISchoolService;
-import com.zhongzheng.modules.user.vo.SchoolVo;
-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;
 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;
+import com.zhongzheng.modules.user.service.ISchoolService;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -26,15 +24,12 @@ import java.util.stream.Collectors;
 /**
  * 高校Service业务层处理
  *
- * @author hjl
- * @date 2021-05-21
+ * @author ruoyi
+ * @date 2021-10-09
  */
 @Service
 public class SchoolServiceImpl extends ServiceImpl<SchoolMapper, School> implements ISchoolService {
 
-    @Autowired
-    private SchoolMapper schoolMapper;
-
     @Override
     public SchoolVo queryById(Long id){
         School db = this.baseMapper.selectById(id);
@@ -44,24 +39,14 @@ public class SchoolServiceImpl extends ServiceImpl<SchoolMapper, School> impleme
     @Override
     public List<SchoolVo> queryList(SchoolQueryBo bo) {
         LambdaQueryWrapper<School> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getSchoolTypeId() != null, School::getSchoolTypeId, bo.getSchoolTypeId());
         lqw.like(StrUtil.isNotBlank(bo.getSchoolName()), School::getSchoolName, bo.getSchoolName());
-        lqw.in(bo.getStatus() != null, School::getStatus, bo.getStatus());
-        lqw.eq(StrUtil.isNotBlank(bo.getIntroduction()), School::getIntroduction, bo.getIntroduction());
+        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.eq(StrUtil.isNotBlank(bo.getAdvantageSpecialty()), School::getAdvantageSpecialty, bo.getAdvantageSpecialty());
-        lqw.eq(StrUtil.isNotBlank(bo.getContact()), School::getContact, bo.getContact());
-        lqw.eq(StrUtil.isNotBlank(bo.getPhone()), School::getPhone, bo.getPhone());
-        lqw.eq(StrUtil.isNotBlank(bo.getAddress()), School::getAddress, bo.getAddress());
-        lqw.eq(bo.getDictCode() != null, School::getDictCode, bo.getDictCode());
         return entity2Vo(this.list(lqw));
     }
 
-    @Override
-    public List<School> selectList(SchoolQueryBo bo) {
-        return schoolMapper.selectList(bo);
-    }
-
     /**
     * 实体类转化成视图对象
     *

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

@@ -1,118 +0,0 @@
-package com.zhongzheng.modules.user.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.lang.Validator;
-import cn.hutool.core.util.StrUtil;
-import com.zhongzheng.common.exception.CustomException;
-import com.zhongzheng.common.utils.DateUtils;
-import com.zhongzheng.modules.user.bo.SchoolTypeAddBo;
-import com.zhongzheng.modules.user.bo.SchoolTypeEditBo;
-import com.zhongzheng.modules.user.bo.SchoolTypeQueryBo;
-import com.zhongzheng.modules.user.domain.SchoolType;
-import com.zhongzheng.modules.user.mapper.SchoolTypeMapper;
-import com.zhongzheng.modules.user.service.ISchoolTypeService;
-import com.zhongzheng.modules.user.vo.SchoolTypeVo;
-import org.springframework.stereotype.Service;
-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 java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 高校类型Service业务层处理
- *
- * @author hjl
- * @date 2021-05-18
- */
-@Service
-public class SchoolTypeServiceImpl extends ServiceImpl<SchoolTypeMapper, SchoolType> implements ISchoolTypeService {
-
-    @Override
-    public SchoolTypeVo queryById(Long id){
-        SchoolType db = this.baseMapper.selectById(id);
-        return BeanUtil.toBean(db, SchoolTypeVo.class);
-    }
-
-    @Override
-    public List<SchoolTypeVo> queryList(SchoolTypeQueryBo bo) {
-        LambdaQueryWrapper<SchoolType> lqw = Wrappers.lambdaQuery();
-        lqw.like(StrUtil.isNotBlank(bo.getTypeName()), SchoolType::getTypeName, bo.getTypeName());
-        lqw.eq(bo.getOrderNum() != null, SchoolType::getOrderNum, bo.getOrderNum());
-        lqw.eq(bo.getStatus() != null, SchoolType::getStatus, bo.getStatus());
-        lqw.eq(StrUtil.isNotBlank(bo.getIntroduce()), SchoolType::getIntroduce, bo.getIntroduce());
-        return entity2Vo(this.list(lqw));
-    }
-
-    /**
-    * 实体类转化成视图对象
-    *
-    * @param collection 实体类集合
-    * @return
-    */
-    private List<SchoolTypeVo> entity2Vo(Collection<SchoolType> collection) {
-        List<SchoolTypeVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, SchoolTypeVo.class))
-                .collect(Collectors.toList());
-        if (collection instanceof Page) {
-            Page<SchoolType> page = (Page<SchoolType>)collection;
-            Page<SchoolTypeVo> pageVo = new Page<>();
-            BeanUtil.copyProperties(page,pageVo);
-            pageVo.addAll(voList);
-            voList = pageVo;
-        }
-        return voList;
-    }
-
-    @Override
-    public Boolean insertByAddBo(SchoolTypeAddBo bo) {
-        SchoolType add = BeanUtil.toBean(bo, SchoolType.class);
-        validEntityBeforeSave(add);
-        add.setCreateTime(DateUtils.getNowTime());
-        add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add);
-    }
-
-    @Override
-    public Boolean updateByEditBo(SchoolTypeEditBo bo) {
-        SchoolType update = BeanUtil.toBean(bo, SchoolType.class);
-        validEntityBeforeSave(update);
-        update.setUpdateTime(DateUtils.getNowTime());
-        return this.updateById(update);
-    }
-
-    /**
-     * 保存前的数据校验
-     *
-     * @param entity 实体类数据
-     */
-    private void validEntityBeforeSave(SchoolType entity){
-        //TODO 做一些数据校验,如唯一约束
-        if(checkNameUnique(entity)){
-            throw new CustomException("分类名已存在");
-        }
-    }
-
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return this.removeByIds(ids);
-    }
-
-    private boolean checkNameUnique(SchoolType entity) {
-        SchoolType info = getOne(new LambdaQueryWrapper<SchoolType>()
-                .eq(SchoolType::getTypeName,entity.getTypeName())
-                .last("limit 1"));
-        if (Validator.isNotNull(info)) {
-            return true;
-        }
-        return false;
-    }
-}

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

@@ -0,0 +1,35 @@
+package com.zhongzheng.modules.user.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 院校绑定项目视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Data
+@ApiModel("院校绑定项目视图对象")
+public class SchoolProjectVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 项目ID */
+	@Excel(name = "项目ID")
+	@ApiModelProperty("项目ID")
+	private Long projectId;
+	/** 学校ID */
+	@Excel(name = "学校ID")
+	@ApiModelProperty("学校ID")
+	private Long schoolId;
+}

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

@@ -1,44 +0,0 @@
-package com.zhongzheng.modules.user.vo;
-
-import com.zhongzheng.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import java.util.Date;
-
-
-
-/**
- * 高校类型视图对象 mall_package
- *
- * @author ruoyi
- * @date 2021-05-18
- */
-@Data
-@ApiModel("高校类型视图对象")
-public class SchoolTypeVo {
-	private static final long serialVersionUID = 1L;
-
-	/** $pkColumn.columnComment */
-	@ApiModelProperty("$pkColumn.columnComment")
-	private Long id;
-
-	/** 学校类型名称 */
-	@Excel(name = "学校类型名称")
-	@ApiModelProperty("学校类型名称")
-	private String typeName;
-	/** 显示顺序 */
-	@Excel(name = "显示顺序")
-	@ApiModelProperty("显示顺序")
-	private Long orderNum;
-	/** 状态 0关闭 1开启 */
-	@Excel(name = "状态 0关闭 1开启")
-	@ApiModelProperty("状态 0关闭 1开启")
-	private Integer status;
-	/** 介绍 */
-	@Excel(name = "介绍")
-	@ApiModelProperty("介绍")
-	private String introduce;
-
-}

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

@@ -12,8 +12,8 @@ import java.util.Date;
 /**
  * 高校视图对象 mall_package
  *
- * @author hjl
- * @date 2021-05-21
+ * @author ruoyi
+ * @date 2021-10-09
  */
 @Data
 @ApiModel("高校视图对象")
@@ -24,45 +24,28 @@ public class SchoolVo {
 	@ApiModelProperty("$pkColumn.columnComment")
 	private Long id;
 
-	/** 学校类型 */
-	@Excel(name = "学校类型")
-	@ApiModelProperty("学校类型")
-	private Long schoolTypeId;
 	/**  高校名称 */
 	@Excel(name = " 高校名称")
 	@ApiModelProperty(" 高校名称")
 	private String schoolName;
+	/** 编码YX */
+	@Excel(name = "编码YX")
+	@ApiModelProperty("编码YX")
+	private String encoder;
 	/** 状态 1正常 0关闭 */
 	@Excel(name = "状态 1正常 0关闭")
 	@ApiModelProperty("状态 1正常 0关闭")
 	private Integer status;
-	/** 简介 */
-	@Excel(name = "简介")
-	@ApiModelProperty("简介")
-	private String introduction;
+	/** 学校省份 */
+	@Excel(name = "学校省份")
+	@ApiModelProperty("学校省份")
+	private String schoolProvince;
 	/** 学校城市 */
 	@Excel(name = "学校城市")
 	@ApiModelProperty("学校城市")
 	private String schoolCity;
-	/** 优势专业 */
-	@Excel(name = "优势专业")
-	@ApiModelProperty("优势专业")
-	private String advantageSpecialty;
-	/** 联系人 */
-	@Excel(name = "联系人")
-	@ApiModelProperty("联系人")
-	private String contact;
-	/** 联系电话 */
-	@Excel(name = "联系电话")
-	@ApiModelProperty("联系电话")
-	private String phone;
-	/** 地址 */
-	@Excel(name = "地址")
-	@ApiModelProperty("地址")
-	private String address;
-	/** 学校等级字典ID */
-	@Excel(name = "学校等级字典ID")
-	@ApiModelProperty("学校等级字典ID")
-	private Long dictCode;
-
+	/** 备注 */
+	@Excel(name = "备注")
+	@ApiModelProperty("备注")
+	private String remark;
 }

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

@@ -15,5 +15,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
     </resultMap>
 
+    <resultMap type="com.zhongzheng.modules.course.vo.CourseProjectTypeVo" id="CourseProjectTypeVoResult">
+        <result property="id" column="id"/>
+        <result property="projectName" column="project_name"/>
+        <result property="encoder" column="encoder"/>
+        <result property="remark" column="remark"/>
+        <result property="educationId" column="education_id"/>
+        <result property="status" column="status"/>
+        <result property="status" column="status"/>
+    </resultMap>
+
+    <select id="queryList" parameterType="com.zhongzheng.modules.course.bo.CourseProjectTypeQueryBo"  resultMap="CourseProjectTypeVoResult">
 
+    </select>
 </mapper>

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

@@ -6,47 +6,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="com.zhongzheng.modules.user.domain.School" id="SchoolResult">
         <result property="id" column="id"/>
-        <result property="schoolTypeId" column="school_type_id"/>
         <result property="schoolName" column="school_name"/>
+        <result property="encoder" column="encoder"/>
         <result property="status" column="status"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
-        <result property="introduction" column="introduction"/>
+        <result property="schoolProvince" column="school_province"/>
         <result property="schoolCity" column="school_city"/>
-        <result property="advantageSpecialty" column="advantage_specialty"/>
-        <result property="contact" column="contact"/>
-        <result property="phone" column="phone"/>
-        <result property="address" column="address"/>
-        <result property="dictCode" column="dict_code"/>
-        <result property="dictLabel" column="dict_label"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
-    <select id="selectList" resultMap="SchoolResult">
-        SELECT
-        s.*,
-        dd.dict_label
-        FROM
-        school s
-        LEFT JOIN sys_dict_data dd ON s.dict_code = dd.dict_code
-        WHERE
-        1 = 1
-        <if test="status != null and status.size()!=0 ">
-            AND s.status in
-            <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
-                #{item}
-            </foreach>
-        </if>
-        <if test="schoolName != null and schoolName != ''" >
-            AND s.school_name like concat('%', #{schoolName}, '%')
-        </if>
-        <if test="contact != null and contact != ''" >
-            AND s.contact like concat('%', #{contact}, '%')
-        </if>
-        <if test="phone != null and phone != ''" >
-            AND s.phone = #{phone}
-        </if>
-        <if test="dictCode != null and dictCode != ''" >
-            AND s.dict_code = #{dictCode}
-        </if>
-    </select>
+
 </mapper>

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhongzheng.modules.user.mapper.SchoolProjectMapper">
+
+    <resultMap type="com.zhongzheng.modules.user.domain.SchoolProject" id="SchoolProjectResult">
+        <result property="id" column="id"/>
+        <result property="projectId" column="project_id"/>
+        <result property="schoolId" column="school_id"/>
+    </resultMap>
+
+
+</mapper>

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

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.modules.user.mapper.SchoolTypeMapper">
-
-    <resultMap type="com.zhongzheng.modules.user.domain.SchoolType" id="SchoolTypeResult">
-        <result property="id" column="id"/>
-        <result property="typeName" column="type_name"/>
-        <result property="orderNum" column="order_num"/>
-        <result property="status" column="status"/>
-        <result property="introduce" column="introduce"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateTime" column="update_time"/>
-    </resultMap>
-
-
-</mapper>