diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniArticleController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniArticleController.java index a80d897..69ded1d 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniArticleController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniArticleController.java @@ -63,7 +63,10 @@ public class MiniArticleController { private IYxArticleContentService yxArticleContentService; @Autowired private MiniArticleService miniArticleService; - + @Autowired + private IYxSchoolGraduateDegreeService yxSchoolGraduateDegreeService; + @Autowired + private IYxSchoolResearchTeachingService yxSchoolResearchTeachingService; @ApiOperation(value = "文章列表") @GetMapping(value = "/page") public Result articlePage(QueryArticleVO queryArticleVO) { @@ -109,6 +112,41 @@ public class MiniArticleController { return Result.OK(); } + if(false){ + Map maps= new LinkedHashMap<>(); + YxSchoolResearchTeaching yxSchoolResearchTeaching = null; + List schoolGraduateDegreeList = yxSchoolGraduateDegreeService.list(); + String schoolId = null;//院校id + String graduateSchool = null;//研究生院 + String selfMarking = null;//自划线 + String degreeNature = null;//学位性质 （专硕/学硕） + for (YxSchoolGraduateDegree yxSchoolGraduateDegree : schoolGraduateDegreeList) { + schoolId = yxSchoolGraduateDegree.getSchoolId(); + graduateSchool = yxSchoolGraduateDegree.getGraduateSchool(); + selfMarking = yxSchoolGraduateDegree.getSelfMarking(); + yxSchoolResearchTeaching = maps.getOrDefault(schoolId,new YxSchoolResearchTeaching()); + yxSchoolResearchTeaching.setSchoolId(yxSchoolGraduateDegree.getSchoolId()); + degreeNature = yxSchoolGraduateDegree.getDegreeNature(); + //保存研究生院 + if (StringUtils.isNotBlank(graduateSchool) && "是".equals(graduateSchool)) { + yxSchoolResearchTeaching.setYjsy(1); + } + //自划线 + if (StringUtils.isNotBlank(selfMarking) && "是".equals(selfMarking)) { + yxSchoolResearchTeaching.setZhx(1); + } + + if ("专硕".equals(degreeNature)) { + yxSchoolResearchTeaching.setProfessionalMasterDegreePoint(yxSchoolResearchTeaching.getProfessionalMasterDegreePoint()+1); + }else{//学硕 + yxSchoolResearchTeaching.setAcademicMasterDegreePoint(yxSchoolResearchTeaching.getAcademicMasterDegreePoint()+1); + } + maps.put(schoolId,yxSchoolResearchTeaching); + } + Collection values = maps.values(); + yxSchoolResearchTeachingService.saveBatch(values); + return Result.OK(); + } //分页 Integer pageNum = queryArticleVO.getPageNum(); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniSchoolGraduateDegreeController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniSchoolGraduateDegreeController.java new file mode 100644 index 0000000..d6d38cc --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniSchoolGraduateDegreeController.java @@ -0,0 +1,136 @@ +package org.jeecg.modules.mini.controller; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.StringUtils; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.mini.dto.SchoolGraduateDegreeDTO; +import org.jeecg.modules.yx.entity.YxSchoolGraduateDegree; +import org.jeecg.modules.yx.service.IYxSchoolGraduateDegreeService; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.BeanClassLoaderAware; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * @Description + * @Author ZhouWenTao + * @Date 2024/3/11 14:33 + */ +@Api(tags = "小程序端-院校研究生信息接口") +@RestController +@RequestMapping("/mini/schoolGraduateDegree") +@Slf4j +public class MiniSchoolGraduateDegreeController { + @Autowired + private IYxSchoolGraduateDegreeService yxSchoolMasterDegreeService; + + /** + * 科研教学，根据院校id获取专硕和学硕点信息 + * + * @param schoolId 院校id + * @return Object + */ + @GetMapping(value = "/findSchoolGraduateDegreeList") + public Result findSchoolGraduateDegreeList(@RequestParam String schoolId) { + //构建查询对象 + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(YxSchoolGraduateDegree::getSchoolId, schoolId); + List list = yxSchoolMasterDegreeService.list(lambdaQueryWrapper); + //组装数据 + String degreenature = null;//学位性质 + String disciplineField = null;//学术领域 + //专硕map + Map professionalMasterDegreeDTOMap = new LinkedHashMap<>(); + //学硕map + Map academicMasterDegreeDTOMap = new LinkedHashMap<>(); + SchoolGraduateDegreeDTO schoolGraduateDegreeDTO = null; + String key = null; + for (YxSchoolGraduateDegree yxSchoolGraduateDegree : list) { + degreenature = yxSchoolGraduateDegree.getDegreeNature(); + disciplineField = yxSchoolGraduateDegree.getDisciplineField(); + key = degreenature + "_" + disciplineField + "_" + yxSchoolGraduateDegree.getMajorName(); + if ("专硕".equals(degreenature)) {//专硕 + schoolGraduateDegreeDTO = professionalMasterDegreeDTOMap.get(key); + } else {//学硕 + schoolGraduateDegreeDTO = academicMasterDegreeDTOMap.get(key); + } + if (schoolGraduateDegreeDTO == null) { + schoolGraduateDegreeDTO = new SchoolGraduateDegreeDTO(); + schoolGraduateDegreeDTO.setSubjectCode(yxSchoolGraduateDegree.getSubjectCode()); + schoolGraduateDegreeDTO.setMajorCode(yxSchoolGraduateDegree.getMajorCode()); + schoolGraduateDegreeDTO.setMajorName(yxSchoolGraduateDegree.getMajorName()); + schoolGraduateDegreeDTO.setResearchDirection(yxSchoolGraduateDegree.getResearchDirection()); + schoolGraduateDegreeDTO.setDegreeNature(degreenature); + schoolGraduateDegreeDTO.setDisciplineField(disciplineField); + schoolGraduateDegreeDTO.setSchoolGraduateDegreeList(new ArrayList<>()); + } + schoolGraduateDegreeDTO.getSchoolGraduateDegreeList().add(yxSchoolGraduateDegree); + if ("专硕".equals(degreenature)) {//专硕 + professionalMasterDegreeDTOMap.put(key,schoolGraduateDegreeDTO); + } else {//学硕 + academicMasterDegreeDTOMap.put(key,schoolGraduateDegreeDTO); + } + } + + JSONObject responseBody=new JSONObject(); + responseBody.put("professionalMasterDegreeList",professionalMasterDegreeDTOMap.values()); + responseBody.put("academicMasterDegreeList",academicMasterDegreeDTOMap.values()); + return Result.OK(responseBody); + } + + /** + * 获取一个专业研究方向下的 考试范围 + * @param id + * @return + */ + @ApiOperation(value = "获取一个专业研究方向下的考试范围") + @GetMapping(value = "/getSchoolGraduateDegreeDetail") + public Result getSchoolGraduateDegreeDetail(@RequestParam String id){ + SchoolGraduateDegreeDTO schoolGraduateDegreeDTO = new SchoolGraduateDegreeDTO(); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(YxSchoolGraduateDegree::getId,id); + YxSchoolGraduateDegree schoolGraduateDegree = yxSchoolMasterDegreeService.getOne(lambdaQueryWrapper); + BeanUtils.copyProperties(schoolGraduateDegree,schoolGraduateDegreeDTO); + String majorName = schoolGraduateDegree.getMajorName(); + if (StringUtils.isNotBlank(majorName)) { + String[] split = majorName.replace("）", ")").split("\\)"); + schoolGraduateDegreeDTO.setMajorNameLimit(split[split.length>1?1:0]); + } + String researchDirection = schoolGraduateDegree.getResearchDirection(); + if (StringUtils.isNotBlank(researchDirection)) { + String[] split = researchDirection.replace("）", ")").split("\\)"); + schoolGraduateDegreeDTO.setResearchDirectionLimit(split[split.length>1?1:0]); + } + lambdaQueryWrapper.clear(); + //根据 门类名称 学科代码 学科领域 学位性质 专业名称 研究方向，查询相似的数据 + lambdaQueryWrapper.eq(YxSchoolGraduateDegree::getSchoolId,schoolGraduateDegree.getSchoolId()); + lambdaQueryWrapper.eq(YxSchoolGraduateDegree::getMajorName,majorName); + lambdaQueryWrapper.eq(YxSchoolGraduateDegree::getSubjectCode,schoolGraduateDegree.getSubjectCode()); + lambdaQueryWrapper.eq(YxSchoolGraduateDegree::getDisciplineField,schoolGraduateDegree.getDisciplineField()); + lambdaQueryWrapper.eq(YxSchoolGraduateDegree::getDegreeNature,schoolGraduateDegree.getDegreeNature()); + lambdaQueryWrapper.eq(YxSchoolGraduateDegree::getResearchDirection,schoolGraduateDegree.getResearchDirection()); + List list = yxSchoolMasterDegreeService.list(lambdaQueryWrapper); + if (CollectionUtils.isNotEmpty(list)) { + String teacher = list.stream().map(YxSchoolGraduateDegree::getTeacher).filter(StringUtils::isNotBlank).collect(Collectors.joining(" ")); + schoolGraduateDegreeDTO.setTeacher(teacher); + } + + + schoolGraduateDegreeDTO.setSchoolGraduateDegreeList(list); + return Result.OK(schoolGraduateDegreeDTO); + } +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/dto/SchoolGraduateDegreeDTO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/dto/SchoolGraduateDegreeDTO.java new file mode 100644 index 0000000..e660dbe --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/dto/SchoolGraduateDegreeDTO.java @@ -0,0 +1,66 @@ +package org.jeecg.modules.mini.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecg.modules.yx.entity.YxSchoolGraduateDegree; +import org.jeecgframework.poi.excel.annotation.Excel; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description 院校研究生信息返回对象 + * @Author ZhouWenTao + * @Date 2024/3/11 14:40 + */ +@Data +@ApiModel(value = "院校研究生信息返回对象") +public class SchoolGraduateDegreeDTO implements Serializable { + //private List masterDegreeList; + @ApiModelProperty(value = "学校id") + private String schoolId; + @ApiModelProperty(value = "学校名称") + private String schoolName; + /**学科代码*/ + @Excel(name = "学科代码", width = 15) + @ApiModelProperty(value = "学科代码") + private java.lang.String subjectCode; + /**学科领域*/ + @Excel(name = "学科领域", width = 15) + @ApiModelProperty(value = "学科领域") + private java.lang.String disciplineField; + /**学位性质*/ + @Excel(name = "学位性质", width = 15) + @ApiModelProperty(value = "学位性质") + private java.lang.String degreeNature; + /**专业编码*/ + @Excel(name = "专业编码", width = 15) + @ApiModelProperty(value = "专业编码") + private java.lang.String majorCode; + /**专业名称*/ + @Excel(name = "专业名称", width = 15) + @ApiModelProperty(value = "专业名称") + private java.lang.String majorName; + @ApiModelProperty(value = "专业名称(不带编号)") + private String majorNameLimit; + /**研究方向*/ + @Excel(name = "研究方向", width = 15) + @ApiModelProperty(value = "研究方向") + private java.lang.String researchDirection; + private java.lang.String researchDirectionLimit; + /**院系所*/ + @Excel(name = "院系所", width = 15) + @ApiModelProperty(value = "院系所") + private java.lang.String departmentsAndFaculties; + /**指导老师*/ + @Excel(name = "指导老师", width = 15) + @ApiModelProperty(value = "指导老师") + private java.lang.String teacher; + /**拟招人数*/ + @Excel(name = "拟招人数", width = 15) + @ApiModelProperty(value = "拟招人数") + private java.lang.String intendedEnrollment; + + public List schoolGraduateDegreeList; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolMasterDegreeController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolGraduateDegreeController.java similarity index 66% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolMasterDegreeController.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolGraduateDegreeController.java index 0a6b45f..3227986 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolMasterDegreeController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolGraduateDegreeController.java @@ -1,24 +1,15 @@ package org.jeecg.modules.yx.controller; import java.io.*; -import java.math.BigDecimal; import java.util.*; -import java.util.stream.Collectors; -import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.yx.dto.LiNianShuJuDTO; -import org.jeecg.modules.yx.dto.SchoolMajorImport3; import org.jeecg.modules.yx.entity.*; -import org.jeecg.modules.yx.service.IYxSchoolMasterDegreeService; +import org.jeecg.modules.yx.service.IYxSchoolGraduateDegreeService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -27,17 +18,11 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.modules.yx.service.IYxSchoolService; import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecg.common.system.base.controller.JeecgController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; @@ -51,11 +36,11 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; */ @Api(tags = "院校硕士研究生信息") @RestController -@RequestMapping("/yx/yxSchoolMasterDegree") +@RequestMapping("/yx/yxSchoolGraduateDegree") @Slf4j -public class YxSchoolMasterDegreeController extends JeecgController { +public class YxSchoolGraduateDegreeController extends JeecgController { @Autowired - private IYxSchoolMasterDegreeService yxSchoolMasterDegreeService; + private IYxSchoolGraduateDegreeService yxSchoolMasterDegreeService; @Autowired private IYxSchoolService yxSchoolService; @@ -65,13 +50,13 @@ public class YxSchoolMasterDegreeController extends JeecgController> queryPageList(YxSchoolMasterDegree yxSchoolMasterDegree, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(yxSchoolMasterDegree, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = yxSchoolMasterDegreeService.page(page, queryWrapper); + public Result> queryPageList(YxSchoolGraduateDegree yxSchoolGraduateDegree, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(yxSchoolGraduateDegree, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = yxSchoolMasterDegreeService.page(page, queryWrapper); return Result.OK(pageList); } @@ -82,8 +67,8 @@ public class YxSchoolMasterDegreeController extends JeecgController add(@RequestBody YxSchoolMasterDegree yxSchoolMasterDegree) { - yxSchoolMasterDegreeService.save(yxSchoolMasterDegree); + public Result add(@RequestBody YxSchoolGraduateDegree yxSchoolGraduateDegree) { + yxSchoolMasterDegreeService.save(yxSchoolGraduateDegree); return Result.OK("添加成功！"); } @@ -94,8 +79,8 @@ public class YxSchoolMasterDegreeController extends JeecgController edit(@RequestBody YxSchoolMasterDegree yxSchoolMasterDegree) { - yxSchoolMasterDegreeService.updateById(yxSchoolMasterDegree); + public Result edit(@RequestBody YxSchoolGraduateDegree yxSchoolGraduateDegree) { + yxSchoolMasterDegreeService.updateById(yxSchoolGraduateDegree); return Result.OK("编辑成功!"); } @@ -129,12 +114,12 @@ public class YxSchoolMasterDegreeController extends JeecgController queryById(@RequestParam(name = "id", required = true) String id) { - YxSchoolMasterDegree yxSchoolMasterDegree = yxSchoolMasterDegreeService.getById(id); - if (yxSchoolMasterDegree == null) { + public Result queryById(@RequestParam(name = "id", required = true) String id) { + YxSchoolGraduateDegree yxSchoolGraduateDegree = yxSchoolMasterDegreeService.getById(id); + if (yxSchoolGraduateDegree == null) { return Result.error("未找到对应数据"); } - return Result.OK(yxSchoolMasterDegree); + return Result.OK(yxSchoolGraduateDegree); } /** @@ -142,8 +127,8 @@ public class YxSchoolMasterDegreeController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, YxSchoolMasterDegree.class); + return super.importExcel(request, response, YxSchoolGraduateDegree.class); } /** @@ -161,7 +146,9 @@ public class YxSchoolMasterDegreeController extends JeecgController importExcel1(HttpServletRequest request, HttpServletResponse response) { // 获取上传文件对象 - File file = new File("C:\\Users\\Denim\\Desktop\\硕士研究生.xlsx"); + //File file = new File("C:\\Users\\Denim\\Desktop\\艺体志愿宝数据\\硕博点\\硕士研究生.xlsx"); + //File file = new File("C:\\Users\\Denim\\Desktop\\艺体志愿宝数据\\硕博点\\2024艺术类研究生招生目录.xlsx"); + File file = new File("C:\\Users\\Denim\\Desktop\\艺体志愿宝数据\\硕博点\\2024体育硕士招生目录.xlsx"); FileInputStream fileInputStream = null; ImportParams params = new ImportParams(); params.setTitleRows(0); @@ -170,7 +157,7 @@ public class YxSchoolMasterDegreeController extends JeecgController list = ExcelImportUtil.importExcel(fileInputStream, YxSchoolMasterDegree.class, params); + List list = ExcelImportUtil.importExcel(fileInputStream, YxSchoolGraduateDegree.class, params); Set schoolNameList = new HashSet<>(); List yxSchoolList = yxSchoolService.list(); @@ -186,8 +173,8 @@ public class YxSchoolMasterDegreeController extends JeecgController { + @Autowired + private IYxSchoolResearchTeachingService yxSchoolResearchTeachingService; + + /** + * 分页列表查询 + * + * @param yxSchoolResearchTeaching + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "学校科研教学信息表-分页列表查询") + @ApiOperation(value="学校科研教学信息表-分页列表查询", notes="学校科研教学信息表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(YxSchoolResearchTeaching yxSchoolResearchTeaching, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(yxSchoolResearchTeaching, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = yxSchoolResearchTeachingService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param yxSchoolResearchTeaching + * @return + */ + @AutoLog(value = "学校科研教学信息表-添加") + @ApiOperation(value="学校科研教学信息表-添加", notes="学校科研教学信息表-添加") + @RequiresPermissions("yx:yx_school_research_teaching:add") + @PostMapping(value = "/add") + public Result add(@RequestBody YxSchoolResearchTeaching yxSchoolResearchTeaching) { + yxSchoolResearchTeachingService.save(yxSchoolResearchTeaching); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param yxSchoolResearchTeaching + * @return + */ + @AutoLog(value = "学校科研教学信息表-编辑") + @ApiOperation(value="学校科研教学信息表-编辑", notes="学校科研教学信息表-编辑") + @RequiresPermissions("yx:yx_school_research_teaching:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody YxSchoolResearchTeaching yxSchoolResearchTeaching) { + yxSchoolResearchTeachingService.updateById(yxSchoolResearchTeaching); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "学校科研教学信息表-通过id删除") + @ApiOperation(value="学校科研教学信息表-通过id删除", notes="学校科研教学信息表-通过id删除") + @RequiresPermissions("yx:yx_school_research_teaching:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + yxSchoolResearchTeachingService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "学校科研教学信息表-批量删除") + @ApiOperation(value="学校科研教学信息表-批量删除", notes="学校科研教学信息表-批量删除") + @RequiresPermissions("yx:yx_school_research_teaching:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.yxSchoolResearchTeachingService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "学校科研教学信息表-通过id查询") + @ApiOperation(value="学校科研教学信息表-通过id查询", notes="学校科研教学信息表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + YxSchoolResearchTeaching yxSchoolResearchTeaching = yxSchoolResearchTeachingService.getById(id); + if(yxSchoolResearchTeaching==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(yxSchoolResearchTeaching); + } + + /** + * 导出excel + * + * @param request + * @param yxSchoolResearchTeaching + */ + @RequiresPermissions("yx:yx_school_research_teaching:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, YxSchoolResearchTeaching yxSchoolResearchTeaching) { + return super.exportXls(request, yxSchoolResearchTeaching, YxSchoolResearchTeaching.class, "学校科研教学信息表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("yx:yx_school_research_teaching:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, YxSchoolResearchTeaching.class); + } + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolMasterDegree.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolGraduateDegree.java similarity index 94% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolMasterDegree.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolGraduateDegree.java index 5aa0bea..bf7a1b9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolMasterDegree.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolGraduateDegree.java @@ -1,18 +1,14 @@ package org.jeecg.modules.yx.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecg.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; @@ -25,11 +21,11 @@ import lombok.experimental.Accessors; * @Version: V1.0 */ @Data -@TableName("yx_school_master_degree") +@TableName("yx_school_graduate_degree") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="yx_school_master_degree对象", description="院校硕士研究生信息") -public class YxSchoolMasterDegree implements Serializable { +@ApiModel(value="yx_school_graduate_degree对象", description="院校研究生信息") +public class YxSchoolGraduateDegree implements Serializable { private static final long serialVersionUID = 1L; /**主键*/ diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolResearchTeaching.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolResearchTeaching.java new file mode 100644 index 0000000..8f50158 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolResearchTeaching.java @@ -0,0 +1,71 @@ +package org.jeecg.modules.yx.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 学校科研教学信息表 + * @Author: jeecg-boot + * @Date: 2024-03-11 + * @Version: V1.0 + */ +@Data +@TableName("yx_school_research_teaching") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="yx_school_research_teaching对象", description="学校科研教学信息表") +public class YxSchoolResearchTeaching implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**院校id*/ + @Excel(name = "院校id", width = 15) + @ApiModelProperty(value = "院校id") + private java.lang.String schoolId; + /**博士点*/ + @Excel(name = "博士点", width = 15) + @ApiModelProperty(value = "博士点") + private java.lang.Integer doctoralPoint=0; + /**学硕点*/ + @Excel(name = "学硕点", width = 15) + @ApiModelProperty(value = "学硕点") + private java.lang.Integer academicMasterDegreePoint=0; + /**专硕点*/ + @Excel(name = "专硕点", width = 15) + @ApiModelProperty(value = "专硕点") + private java.lang.Integer professionalMasterDegreePoint=0; + /**保研率*/ + @Excel(name = "保研率", width = 15) + @ApiModelProperty(value = "保研率") + private java.lang.String byl; + /**研究生院*/ + @Excel(name = "研究生院", width = 15) + @ApiModelProperty(value = "研究生院") + private java.lang.Integer yjsy; + /**自划线*/ + @Excel(name = "自划线", width = 15) + @ApiModelProperty(value = "自划线") + private java.lang.Integer zhx; + /**保研资格*/ + @Excel(name = "保研资格", width = 15) + @ApiModelProperty(value = "保研资格") + private java.lang.Integer byzg; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxSchoolMasterDegreeMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxSchoolGraduateDegreeMapper.java similarity index 50% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxSchoolMasterDegreeMapper.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxSchoolGraduateDegreeMapper.java index 217a94e..f32f3c5 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxSchoolMasterDegreeMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxSchoolGraduateDegreeMapper.java @@ -1,9 +1,6 @@ package org.jeecg.modules.yx.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.yx.entity.YxSchoolMasterDegree; +import org.jeecg.modules.yx.entity.YxSchoolGraduateDegree; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** @@ -12,6 +9,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @Date: 2024-03-03 * @Version: V1.0 */ -public interface YxSchoolMasterDegreeMapper extends BaseMapper { +public interface YxSchoolGraduateDegreeMapper extends BaseMapper { } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxSchoolResearchTeachingMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxSchoolResearchTeachingMapper.java new file mode 100644 index 0000000..691386d --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxSchoolResearchTeachingMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.yx.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.yx.entity.YxSchoolResearchTeaching; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 学校科研教学信息表 + * @Author: jeecg-boot + * @Date: 2024-03-11 + * @Version: V1.0 + */ +public interface YxSchoolResearchTeachingMapper extends BaseMapper { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMasterDegreeMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolGraduateDegreeMapper.xml similarity index 62% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMasterDegreeMapper.xml rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolGraduateDegreeMapper.xml index 1608961..056a4e2 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMasterDegreeMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolGraduateDegreeMapper.xml @@ -1,5 +1,5 @@ - + - \ No newline at end of file + diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolResearchTeachingMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolResearchTeachingMapper.xml new file mode 100644 index 0000000..78dc338 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolResearchTeachingMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolMasterDegreeService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolGraduateDegreeService.java similarity index 59% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolMasterDegreeService.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolGraduateDegreeService.java index 1f356e3..5a0b7a8 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolMasterDegreeService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolGraduateDegreeService.java @@ -1,6 +1,6 @@ package org.jeecg.modules.yx.service; -import org.jeecg.modules.yx.entity.YxSchoolMasterDegree; +import org.jeecg.modules.yx.entity.YxSchoolGraduateDegree; import com.baomidou.mybatisplus.extension.service.IService; /** @@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.extension.service.IService; * @Date: 2024-03-03 * @Version: V1.0 */ -public interface IYxSchoolMasterDegreeService extends IService { +public interface IYxSchoolGraduateDegreeService extends IService { } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolResearchTeachingService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolResearchTeachingService.java new file mode 100644 index 0000000..61a3f8e --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolResearchTeachingService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.yx.service; + +import org.jeecg.modules.yx.entity.YxSchoolResearchTeaching; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 学校科研教学信息表 + * @Author: jeecg-boot + * @Date: 2024-03-11 + * @Version: V1.0 + */ +public interface IYxSchoolResearchTeachingService extends IService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolGraduateDegreeServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolGraduateDegreeServiceImpl.java new file mode 100644 index 0000000..afa1736 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolGraduateDegreeServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.yx.service.impl; + +import org.jeecg.modules.yx.entity.YxSchoolGraduateDegree; +import org.jeecg.modules.yx.mapper.YxSchoolGraduateDegreeMapper; +import org.jeecg.modules.yx.service.IYxSchoolGraduateDegreeService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 院校硕士研究生信息 + * @Author: jeecg-boot + * @Date: 2024-03-03 + * @Version: V1.0 + */ +@Service +public class YxSchoolGraduateDegreeServiceImpl extends ServiceImpl implements IYxSchoolGraduateDegreeService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolMasterDegreeServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolMasterDegreeServiceImpl.java deleted file mode 100644 index 5ad35f3..0000000 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolMasterDegreeServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.jeecg.modules.yx.service.impl; - -import org.jeecg.modules.yx.entity.YxSchoolMasterDegree; -import org.jeecg.modules.yx.mapper.YxSchoolMasterDegreeMapper; -import org.jeecg.modules.yx.service.IYxSchoolMasterDegreeService; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: 院校硕士研究生信息 - * @Author: jeecg-boot - * @Date: 2024-03-03 - * @Version: V1.0 - */ -@Service -public class YxSchoolMasterDegreeServiceImpl extends ServiceImpl implements IYxSchoolMasterDegreeService { - -} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolResearchTeachingServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolResearchTeachingServiceImpl.java new file mode 100644 index 0000000..2814b3a --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolResearchTeachingServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.yx.service.impl; + +import org.jeecg.modules.yx.entity.YxSchoolResearchTeaching; +import org.jeecg.modules.yx.mapper.YxSchoolResearchTeachingMapper; +import org.jeecg.modules.yx.service.IYxSchoolResearchTeachingService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 学校科研教学信息表 + * @Author: jeecg-boot + * @Date: 2024-03-11 + * @Version: V1.0 + */ +@Service +public class YxSchoolResearchTeachingServiceImpl extends ServiceImpl implements IYxSchoolResearchTeachingService { + +}