教育项目业务类型

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

@@ -37,7 +37,7 @@ import io.swagger.annotations.ApiOperation;
 @Api(value = "高校控制器", tags = {"高校管理"})
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
-@RequestMapping("/modules.user/school")
+@RequestMapping("/user/school")
 public class SchoolController extends BaseController {
 
     private final ISchoolService iSchoolService;
@@ -46,7 +46,7 @@ public class SchoolController extends BaseController {
      * 查询高校列表
      */
     @ApiOperation("查询高校列表")
-    @PreAuthorize("@ss.hasPermi('modules.user:school:list')")
+    @PreAuthorize("@ss.hasPermi('user:school:list')")
     @GetMapping("/list")
     public TableDataInfo<SchoolVo> list(SchoolQueryBo bo) {
         startPage();
@@ -57,7 +57,7 @@ public class SchoolController extends BaseController {
     /**
      * 导出高校列表
      */
-    @ApiOperation("导出高校列表")
+/*    @ApiOperation("导出高校列表")
     @PreAuthorize("@ss.hasPermi('modules.user:school:export')")
     @Log(title = "高校", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
@@ -65,13 +65,13 @@ public class SchoolController extends BaseController {
         List<SchoolVo> list = iSchoolService.queryList(bo);
         ExcelUtil<SchoolVo> util = new ExcelUtil<SchoolVo>(SchoolVo.class);
         return util.exportExcel(list, "高校");
-    }
+    }*/
 
     /**
      * 获取高校详细信息
      */
     @ApiOperation("获取高校详细信息")
-    @PreAuthorize("@ss.hasPermi('modules.user:school:query')")
+    @PreAuthorize("@ss.hasPermi('user:school:query')")
     @GetMapping("/{id}")
     public AjaxResult<SchoolVo> getInfo(@PathVariable("id" ) Long id) {
         return AjaxResult.success(iSchoolService.queryById(id));
@@ -81,7 +81,7 @@ public class SchoolController extends BaseController {
      * 新增高校
      */
     @ApiOperation("新增高校")
-    @PreAuthorize("@ss.hasPermi('modules.user:school:add')")
+    @PreAuthorize("@ss.hasPermi('user:school:add')")
     @Log(title = "高校", businessType = BusinessType.INSERT)
     @PostMapping()
     public AjaxResult<Void> add(@RequestBody SchoolAddBo bo) {
@@ -92,9 +92,9 @@ public class SchoolController extends BaseController {
      * 修改高校
      */
     @ApiOperation("修改高校")
-    @PreAuthorize("@ss.hasPermi('modules.user:school:edit')")
+    @PreAuthorize("@ss.hasPermi('user:school:edit')")
     @Log(title = "高校", businessType = BusinessType.UPDATE)
-    @PutMapping()
+    @PostMapping("/edit")
     public AjaxResult<Void> edit(@RequestBody SchoolEditBo bo) {
         return toAjax(iSchoolService.updateByEditBo(bo) ? 1 : 0);
     }
@@ -102,11 +102,11 @@ public class SchoolController extends BaseController {
     /**
      * 删除高校
      */
-    @ApiOperation("删除高校")
+ /*   @ApiOperation("删除高校")
     @PreAuthorize("@ss.hasPermi('modules.user:school:remove')")
     @Log(title = "高校" , businessType = BusinessType.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

@@ -1,112 +0,0 @@
-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-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseBusinessServiceImpl.java

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.course.service.impl;
 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 org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -65,7 +66,7 @@ public class CourseBusinessServiceImpl extends ServiceImpl<CourseBusinessMapper,
     public Boolean insertByAddBo(CourseBusinessAddBo bo) {
         CourseBusiness add = BeanUtil.toBean(bo, CourseBusiness.class);
         validEntityBeforeSave(add);
-        bo.setEncoder("YW"+DateUtils.getNowTime());
+        add.setEncoder(ServletUtils.getEncoded("YW"));
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
         return this.save(add);

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

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.course.service.impl;
 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 org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -69,7 +70,7 @@ public class CourseEducationTypeServiceImpl extends ServiceImpl<CourseEducationT
     public Boolean insertByAddBo(CourseEducationTypeAddBo bo) {
         CourseEducationType add = BeanUtil.toBean(bo, CourseEducationType.class);
         validEntityBeforeSave(add);
-        add.setEncoder("JY"+DateUtils.getNowTime());
+        add.setEncoder(ServletUtils.getEncoded("JY"));
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
         return this.save(add);

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

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.course.service.impl;
 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 org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -65,7 +66,7 @@ public class CourseProjectTypeServiceImpl extends ServiceImpl<CourseProjectTypeM
     public Boolean insertByAddBo(CourseProjectTypeAddBo bo) {
         CourseProjectType add = BeanUtil.toBean(bo, CourseProjectType.class);
         validEntityBeforeSave(add);
-        bo.setEncoder("XM"+DateUtils.getNowTime());
+        add.setEncoder(ServletUtils.getEncoded("XM"));
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
         return this.save(add);

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

@@ -42,4 +42,8 @@ public class SchoolAddBo {
     /** 备注 */
     @ApiModelProperty("备注")
     private String remark;
+
+    /** 绑定项目id集合 */
+    @ApiModelProperty("绑定项目id集合")
+    private Long[] schoolProjects;
 }

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

@@ -49,4 +49,9 @@ public class SchoolEditBo {
     @ApiModelProperty("备注")
     private String remark;
 
+
+    /** 绑定项目id集合 */
+    @ApiModelProperty("绑定项目id集合")
+    private Long[] schoolProjects;
+
 }

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

@@ -3,6 +3,11 @@ 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.common.utils.ServletUtils;
+import com.zhongzheng.modules.user.bo.SchoolProjectAddBo;
+import com.zhongzheng.modules.user.domain.SchoolProject;
+import com.zhongzheng.modules.user.service.ISchoolProjectService;
+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;
@@ -30,6 +35,9 @@ import java.util.stream.Collectors;
 @Service
 public class SchoolServiceImpl extends ServiceImpl<SchoolMapper, School> implements ISchoolService {
 
+    @Autowired
+    private ISchoolProjectService schoolProjectService;
+
     @Override
     public SchoolVo queryById(Long id){
         School db = this.baseMapper.selectById(id);
@@ -71,9 +79,17 @@ public class SchoolServiceImpl extends ServiceImpl<SchoolMapper, School> impleme
     public Boolean insertByAddBo(SchoolAddBo bo) {
         School add = BeanUtil.toBean(bo, School.class);
         validEntityBeforeSave(add);
+        add.setEncoder(ServletUtils.getEncoded("YX"));
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add);
+        boolean save = this.save(add);
+        for (Long schoolProject : bo.getSchoolProjects()) {
+            SchoolProjectAddBo schoolProjectAddBo = new SchoolProjectAddBo();
+            schoolProjectAddBo.setProjectId(schoolProject);
+            schoolProjectAddBo.setSchoolId(add.getId());
+            schoolProjectService.insertByAddBo(schoolProjectAddBo);
+        }
+        return save;
     }
 
     @Override
@@ -81,6 +97,15 @@ public class SchoolServiceImpl extends ServiceImpl<SchoolMapper, School> impleme
         School update = BeanUtil.toBean(bo, School.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
+        LambdaQueryWrapper<SchoolProject> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getId()!=null,SchoolProject::getSchoolId, bo.getId());
+        schoolProjectService.remove(lqw);
+        for (Long schoolProject : bo.getSchoolProjects()) {
+            SchoolProjectAddBo schoolProjectAddBo = new SchoolProjectAddBo();
+            schoolProjectAddBo.setProjectId(schoolProject);
+            schoolProjectAddBo.setSchoolId(update.getId());
+            schoolProjectService.insertByAddBo(schoolProjectAddBo);
+        }
         return this.updateById(update);
     }
 

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

@@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             course_business b
                 LEFT JOIN course_project_type p on b.project_id =p.id
                 LEFT JOIN course_education_type e ON p.education_id = e.id
+        and b.status != -1
     </select>
 
 </mapper>

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

@@ -32,5 +32,6 @@ 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
     </select>
 </mapper>