From 63edb4b06e858157bcaa6ee6a61603f75faa3b4d Mon Sep 17 00:00:00 2001 From: zhouwentao <1577701412@qq.com> Date: Tue, 12 Mar 2024 13:22:43 +0800 Subject: [PATCH] updates --- .../controller/MiniArticleController.java | 38 +++++++----- .../mini/controller/MiniSchoolController.java | 5 +- .../MiniSchoolGraduateDegreeController.java | 35 ++++++++++- .../jeecg/modules/mini/dto/MiniSchoolDTO.java | 23 +++---- .../mini/service/MiniSchoolService.java | 62 +++++++++++++++++++ .../YxSchoolGraduateDegreeController.java | 51 ++++++++++----- .../yx/controller/YxScoreController.java | 13 ++-- .../controller/YxScoreSegmentController.java | 1 - .../modules/yx/mapper/YxSchoolMapper.java | 7 +++ .../YxSchoolResearchTeachingMapper.java | 3 + .../yx/mapper/xml/YxSchoolMajorMapper.xml | 2 +- .../modules/yx/mapper/xml/YxSchoolMapper.xml | 18 ++++++ .../xml/YxSchoolResearchTeachingMapper.xml | 21 ++++++- .../IYxSchoolGraduateDegreeService.java | 1 + .../IYxSchoolResearchTeachingService.java | 2 +- .../modules/yx/service/IYxSchoolService.java | 1 - .../yx/service/impl/YxMajorServiceImpl.java | 4 ++ .../YxSchoolResearchTeachingServiceImpl.java | 9 +++ .../yx/service/impl/YxSchoolServiceImpl.java | 58 ----------------- 19 files changed, 237 insertions(+), 117 deletions(-) create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/service/MiniSchoolService.java 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 69ded1d..027c0d6 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 @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.gson.Gson; @@ -67,6 +68,7 @@ public class MiniArticleController { private IYxSchoolGraduateDegreeService yxSchoolGraduateDegreeService; @Autowired private IYxSchoolResearchTeachingService yxSchoolResearchTeachingService; + @ApiOperation(value = "文章列表") @GetMapping(value = "/page") public Result articlePage(QueryArticleVO queryArticleVO) { @@ -83,12 +85,12 @@ public class MiniArticleController { String limitation = null; int i = 0; int i1 = 0; - List updateSchoolMajorList=new ArrayList<>(); + List updateSchoolMajorList = new ArrayList<>(); for (YxSchoolMajor yxSchoolMajor : list) { detail = yxSchoolMajor.getDetail(); - detail = detail.replace("；", ",").replace("，", ",").replace("。",","); + detail = detail.replace("；", ",").replace("，", ",").replace("。", ","); //过滤 - detail = detail.replace(" ","").replace("录取要求详见学校招生章程及艺术类招生简章", "").replace("要求可获得本校本科文凭的同时，还可获法国 RNCP6级证书(等同于法国普通大学学士学位)(不以出国为前提)。", ""); + detail = detail.replace(" ", "").replace("录取要求详见学校招生章程及艺术类招生简章", "").replace("要求可获得本校本科文凭的同时，还可获法国 RNCP6级证书(等同于法国普通大学学士学位)(不以出国为前提)。", ""); limitation = null; for (String s : tiquList) { if (detail.contains(s)) { @@ -101,30 +103,32 @@ public class MiniArticleController { //去除最后一位,符号 if (StringUtils.isNotBlank(limitation)) { i1 = limitation.lastIndexOf(","); - if (limitation.length()-1 ==i1) { - limitation = limitation.substring(0,i1); + if (limitation.length() - 1 == i1) { + limitation = limitation.substring(0, i1); } yxSchoolMajor.setLimitation(limitation); updateSchoolMajorList.add(yxSchoolMajor); } } - yxSchoolMajorService.updateBatchById(updateSchoolMajorList,100); + yxSchoolMajorService.updateBatchById(updateSchoolMajorList, 100); return Result.OK(); } - if(false){ - Map maps= new LinkedHashMap<>(); + 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;//学位性质 （专硕/学硕） + String disciplineField = null; for (YxSchoolGraduateDegree yxSchoolGraduateDegree : schoolGraduateDegreeList) { schoolId = yxSchoolGraduateDegree.getSchoolId(); graduateSchool = yxSchoolGraduateDegree.getGraduateSchool(); selfMarking = yxSchoolGraduateDegree.getSelfMarking(); - yxSchoolResearchTeaching = maps.getOrDefault(schoolId,new YxSchoolResearchTeaching()); + disciplineField = yxSchoolGraduateDegree.getDisciplineField(); + yxSchoolResearchTeaching = maps.getOrDefault(schoolId, new YxSchoolResearchTeaching()); yxSchoolResearchTeaching.setSchoolId(yxSchoolGraduateDegree.getSchoolId()); degreeNature = yxSchoolGraduateDegree.getDegreeNature(); //保存研究生院 @@ -136,18 +140,22 @@ public class MiniArticleController { yxSchoolResearchTeaching.setZhx(1); } - if ("专硕".equals(degreeNature)) { - yxSchoolResearchTeaching.setProfessionalMasterDegreePoint(yxSchoolResearchTeaching.getProfessionalMasterDegreePoint()+1); - }else{//学硕 - yxSchoolResearchTeaching.setAcademicMasterDegreePoint(yxSchoolResearchTeaching.getAcademicMasterDegreePoint()+1); - } - maps.put(schoolId,yxSchoolResearchTeaching); +// 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(); } + if (false) { + yxSchoolResearchTeachingService.test(); + } + //分页 Integer pageNum = queryArticleVO.getPageNum(); Integer pageSize = queryArticleVO.getPageSize(); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniSchoolController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniSchoolController.java index e775749..031bca5 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniSchoolController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniSchoolController.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.art.vo.QueryRecommendMajorVO; +import org.jeecg.modules.mini.service.MiniSchoolService; import org.jeecg.modules.yx.service.IYxSchoolService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -23,12 +24,14 @@ import org.springframework.web.bind.annotation.RestController; public class MiniSchoolController { @Autowired private IYxSchoolService yxSchoolService; + @Autowired + private MiniSchoolService miniSchoolService; @ApiOperation(value = "学校详情") @GetMapping("/schoolInfo") public Result schoolInfo(QueryRecommendMajorVO queryRecommendMajorVO){ String schoolCode = queryRecommendMajorVO.getSchoolCode(); - return Result.OK(yxSchoolService.getMiniSchoolInfoBySchoolCode(schoolCode)); + return Result.OK(miniSchoolService.getMiniSchoolInfoBySchoolCode(schoolCode)); } @ApiOperation(value = "搜索学校") 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 index d6d38cc..bb177ac 100644 --- 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 @@ -2,12 +2,14 @@ package org.jeecg.modules.mini.controller; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.art.vo.QueryRecommendMajorVO; import org.jeecg.modules.mini.dto.SchoolGraduateDegreeDTO; import org.jeecg.modules.yx.entity.YxSchoolGraduateDegree; import org.jeecg.modules.yx.service.IYxSchoolGraduateDegreeService; @@ -59,10 +61,13 @@ public class MiniSchoolGraduateDegreeController { Map academicMasterDegreeDTOMap = new LinkedHashMap<>(); SchoolGraduateDegreeDTO schoolGraduateDegreeDTO = null; String key = null; + boolean existsFlag= false; for (YxSchoolGraduateDegree yxSchoolGraduateDegree : list) { degreenature = yxSchoolGraduateDegree.getDegreeNature(); disciplineField = yxSchoolGraduateDegree.getDisciplineField(); - key = degreenature + "_" + disciplineField + "_" + yxSchoolGraduateDegree.getMajorName(); + //根据专业名称分组 + key = degreenature + "_" + disciplineField + "_"; + //+ yxSchoolGraduateDegree.getMajorName() if ("专硕".equals(degreenature)) {//专硕 schoolGraduateDegreeDTO = professionalMasterDegreeDTOMap.get(key); } else {//学硕 @@ -78,7 +83,16 @@ public class MiniSchoolGraduateDegreeController { schoolGraduateDegreeDTO.setDisciplineField(disciplineField); schoolGraduateDegreeDTO.setSchoolGraduateDegreeList(new ArrayList<>()); } - schoolGraduateDegreeDTO.getSchoolGraduateDegreeList().add(yxSchoolGraduateDegree); + //根据研究方向 分组（子级) + for (YxSchoolGraduateDegree schoolGraduateDegree : schoolGraduateDegreeDTO.getSchoolGraduateDegreeList()) { + existsFlag = schoolGraduateDegree.getResearchDirection().equals(yxSchoolGraduateDegree.getResearchDirection()); + if(existsFlag){ + break; + } + } + if (!existsFlag) { + schoolGraduateDegreeDTO.getSchoolGraduateDegreeList().add(yxSchoolGraduateDegree); + } if ("专硕".equals(degreenature)) {//专硕 professionalMasterDegreeDTOMap.put(key,schoolGraduateDegreeDTO); } else {//学硕 @@ -133,4 +147,21 @@ public class MiniSchoolGraduateDegreeController { schoolGraduateDegreeDTO.setSchoolGraduateDegreeList(list); return Result.OK(schoolGraduateDegreeDTO); } + + @ApiOperation(value = "获取院校的所有研究生专业") + @GetMapping("/majorGroupAll") + public Result schoolGraduateDegreeAllGroupByMajor(QueryRecommendMajorVO queryRecommendMajorVO){ + Integer pageNum = queryRecommendMajorVO.getPageNum(); + Integer pageSize = queryRecommendMajorVO.getPageSize(); + String schoolName = queryRecommendMajorVO.getSchoolName(); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotBlank(schoolName)) { + lambdaQueryWrapper.and(l->l.like(YxSchoolGraduateDegree::getSchoolName,schoolName).or().like(YxSchoolGraduateDegree::getMajorName,schoolName)); + } + + lambdaQueryWrapper.last("group by concat(school_id,major_name)"); + //lambdaQueryWrapper.groupBy(YxSchoolGraduateDegree::getSchoolId,YxSchoolGraduateDegree::getMajorName); + Page pageList = yxSchoolMasterDegreeService.page(new Page<>(queryRecommendMajorVO.getPageNum(), queryRecommendMajorVO.getPageSize()), lambdaQueryWrapper); + return Result.OK(pageList); + } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/dto/MiniSchoolDTO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/dto/MiniSchoolDTO.java index 9b0a7ff..1b2dc7e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/dto/MiniSchoolDTO.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/dto/MiniSchoolDTO.java @@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.jeecg.modules.art.dto.RecommendMajorDTO; import org.jeecg.modules.yx.entity.YxSchoolMajor; +import org.jeecg.modules.yx.entity.YxSchoolResearchTeaching; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; @@ -47,10 +48,11 @@ public class MiniSchoolDTO implements Serializable { @ApiModelProperty(value = "学校图标") private String schoolIcon; /**办学日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + /*@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") + private Date schoolOpenDate;*/ @ApiModelProperty(value = "办学日期") - private Date schoolOpenDate; + private String schoolOpenDate; @ApiModelProperty(value = "学校类型（本科/专科）") private String schoolType; @@ -79,12 +81,6 @@ public class MiniSchoolDTO implements Serializable { /**院校类型*/ @ApiModelProperty(value = "院校类型") private String institutionType; - /**博士点*/ - @ApiModelProperty(value = "博士点") - private String doctoralPoint; - /**硕士点*/ - @ApiModelProperty(value = "硕士点") - private String masterPoint; /**学生人数*/ @ApiModelProperty(value = "学生人数") private String studentNum; @@ -130,12 +126,6 @@ public class MiniSchoolDTO implements Serializable { @Excel(name = "国重/省重", width = 15) @ApiModelProperty(value = "国重/省重") private String gzsz; - /** - * 保研率 - */ - @Excel(name = "保研率", width = 15) - @ApiModelProperty(value = "保研率") - private String byl; /** * 国家特色专业 */ @@ -206,4 +196,9 @@ public class MiniSchoolDTO implements Serializable { */ @ApiModelProperty(value = "最低分") private BigDecimal zdf; + /** + * 学校科研教学 + */ + @ApiModelProperty(value = "学校科研教学") + private YxSchoolResearchTeaching schoolResearchTeaching; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/service/MiniSchoolService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/service/MiniSchoolService.java new file mode 100644 index 0000000..0c05d6f --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/service/MiniSchoolService.java @@ -0,0 +1,62 @@ +package org.jeecg.modules.mini.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.apache.commons.lang3.StringUtils; +import org.jeecg.common.exception.JeecgBootException; +import org.jeecg.modules.mini.dto.MiniSchoolDTO; +import org.jeecg.modules.yx.mapper.YxSchoolMapper; +import org.jeecg.modules.yx.service.IYxArwuService; +import org.jeecg.modules.yx.service.IYxSchoolService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.LinkedHashSet; +import java.util.Set; + +/** + * @Description 小程序 学校Service + * @Author ZhouWenTao + * @Date 2024/3/12 10:54 + */ +@Service +public class MiniSchoolService { + @Resource + private YxSchoolMapper yxSchoolMapper; + + /** + * 小程序端-根据schoolCode获取详情信息 + * @param schoolCode + * @return + */ + public MiniSchoolDTO getMiniSchoolInfoBySchoolCode(String schoolCode) { + MiniSchoolDTO miniSchoolDTO = yxSchoolMapper.getMiniDtoBySchoolCode(schoolCode); + if (miniSchoolDTO == null) { + throw new JeecgBootException("未获取到院校信息，请联系管理员"); + } + Set tagsList = new LinkedHashSet<>(); + if (StringUtils.isNotBlank(miniSchoolDTO.getSchoolType())) { + tagsList.add(miniSchoolDTO.getSchoolType());//学校层次 + } + if (StringUtils.isNotBlank(miniSchoolDTO.getInstitutionType())) { + tagsList.add(miniSchoolDTO.getInstitutionType() + "类");//院校类型 + } + if (StringUtils.isNotBlank(miniSchoolDTO.getSchoolNature())) { + tagsList.add(miniSchoolDTO.getSchoolNature());//办学性质 + } + //判断 是否是 985,211 + if (miniSchoolDTO.getIs211().equals(1)) { + tagsList.add("211"); + } + if (miniSchoolDTO.getIs985().equals(1)) { + tagsList.add("985"); + } + if ("双一流".equals(miniSchoolDTO.getSfsyl())) { + tagsList.add("双一流"); + } + if (StringUtils.isNotBlank(miniSchoolDTO.getGzsz())) { + tagsList.add(miniSchoolDTO.getGzsz()); + } + miniSchoolDTO.setTagsList(tagsList); + return miniSchoolDTO; + } +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolGraduateDegreeController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolGraduateDegreeController.java index 3227986..abfb517 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolGraduateDegreeController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolGraduateDegreeController.java @@ -6,6 +6,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import org.apache.commons.collections.CollectionUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.modules.yx.entity.*; @@ -16,6 +18,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; +import org.jeecg.modules.yx.service.IYxSchoolResearchTeachingService; import org.jeecg.modules.yx.service.IYxSchoolService; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.entity.ImportParams; @@ -43,6 +46,8 @@ public class YxSchoolGraduateDegreeController extends JeecgController schoolIdSet = new HashSet<>(); try { fileInputStream = new FileInputStream(file); List list = ExcelImportUtil.importExcel(fileInputStream, YxSchoolGraduateDegree.class, params); Set schoolNameList = new HashSet<>(); - List yxSchoolList = yxSchoolService.list(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.select(YxSchool::getId,YxSchool::getSchoolName); + List yxSchoolList = yxSchoolService.list(queryWrapper); Map schoolMap = new LinkedHashMap<>(); for (YxSchool yxSchool : yxSchoolList) { schoolMap.put(yxSchool.getSchoolName(), yxSchool); } - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + String schoolName = null; String majorName = null; String sn = null; @@ -174,19 +184,20 @@ public class YxSchoolGraduateDegreeController extends JeecgController lambdaQueryWrapper = new LambdaUpdateWrapper<>(); + lambdaQueryWrapper.in(YxSchoolResearchTeaching::getSchoolId,schoolIdSet); + lambdaQueryWrapper.set(YxSchoolResearchTeaching::getByzg,1); + yxSchoolResearchTeachingService.update(lambdaQueryWrapper); + } + + //yxSchoolMasterDegreeService.saveBatch(list,100); } catch (FileNotFoundException fileNotFoundException) { log.error("文件不存在," + file.getAbsolutePath()); throw new RuntimeException(fileNotFoundException); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreController.java index ac51859..64cc2e8 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreController.java @@ -61,6 +61,7 @@ public class YxScoreController { String cognitioPolyclinic = yxUserScore.getCognitioPolyclinic();//文科/理科 BigDecimal culturalScore = yxUserScore.getCulturalScore(); BigDecimal professionalScore = yxUserScore.getProfessionalScore(); + BigDecimal oldProfessionalScore = yxUserScore.getProfessionalScore(); String professionalCategoryChildren = yxUserScore.getProfessionalCategoryChildren(); AssertUtils.notNull(professionalCategory, "请选择[专业类别]"); AssertUtils.notNull(cognitioPolyclinic, "请选择[选考科目]"); @@ -160,24 +161,24 @@ public class YxScoreController { scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, professionalScore, professionalCategory,null, yxUserScore.getProvince()); professionalScore = scoreSegment.getScore(); }else if("表演类".equals(professionalCategory)){ - BigDecimal xjysby = yxUserScore.getXjysby();//影视戏剧表演 - BigDecimal xjysdy = yxUserScore.getXjysdy();//影视戏剧导演 + BigDecimal xjysby = yxUserScore.getXjysby();//戏剧影视表演 + BigDecimal xjysdy = yxUserScore.getXjysdy();//戏剧影视导演 BigDecimal fzby = yxUserScore.getFzby();//服装表演 + oldProfessionalScore = xjysby.max(xjysdy).max(fzby); if (xjysby!=null && xjysby.compareTo(YxConstant.bigDecimal0) > 0) { - scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, xjysby, professionalCategory,"影视戏剧表演", yxUserScore.getProvince()); + scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, xjysby, professionalCategory,"戏剧影视表演", yxUserScore.getProvince()); xjysby = scoreSegment.getScore(); } if(xjysdy!=null && xjysdy.compareTo(YxConstant.bigDecimal0) > 0){ - //音乐表演器乐成绩 - scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, xjysdy, professionalCategory,"影视戏剧导演", yxUserScore.getProvince()); + scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, xjysdy, professionalCategory,"戏剧影视导演", yxUserScore.getProvince()); xjysdy = scoreSegment.getScore(); } if(fzby!=null && fzby.compareTo(YxConstant.bigDecimal0) > 0){ - //音乐教育成绩 scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, fzby, professionalCategory,"服装表演", yxUserScore.getProvince()); fzby = scoreSegment.getScore(); } professionalScore = xjysby.max(xjysdy).max(fzby); + yxUserScore.setProfessionalScore(oldProfessionalScore); } } String batch = "高职高专"; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreSegmentController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreSegmentController.java index 23f8801..a11bf79 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreSegmentController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreSegmentController.java @@ -281,7 +281,6 @@ public class YxScoreSegmentController extends JeecgController yxScoreSegmentLambdaQueryWrapper = new LambdaQueryWrapper<>(); yxScoreSegmentLambdaQueryWrapper.eq(YxScoreSegment::getYear,year); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxSchoolMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxSchoolMapper.java index 77c1676..606310d 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxSchoolMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxSchoolMapper.java @@ -42,4 +42,11 @@ public interface YxSchoolMapper extends BaseMapper { IPage miniSchoolSearchSm(@Param("page")Page page, @Param("qvo") QueryRecommendMajorVO queryRecommendMajorVO); YxSchoolDTO getBySchoolName(String schoolName); + + /** + * 小程序端-根据 schoolCode，关联yx_school_child 表获取Dto信息 + * @param schoolCode + * @return + */ + MiniSchoolDTO getMiniDtoBySchoolCode(@Param("schoolCode") String schoolCode); } 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 index 691386d..59c20d3 100644 --- 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 @@ -14,4 +14,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface YxSchoolResearchTeachingMapper extends BaseMapper { + List selectTest(); + + List selectTest2(); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMajorMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMajorMapper.xml index cabd9f7..7b370c4 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMajorMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMajorMapper.xml @@ -145,7 +145,7 @@ - AND s.main_subjects in + AND sm.main_subjects in #{b} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMapper.xml index d1c3aa7..1be517b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMapper.xml @@ -398,4 +398,22 @@ GROUP BY sc.school_code ORDER BY field( COALESCE(sm.batch,'null'), '提前批', '本科A段', '本科B段', '本科', '高职高专','null') + + 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 index 78dc338..e7ad6af 100644 --- 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 @@ -2,4 +2,23 @@ - \ No newline at end of file + + + + diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolGraduateDegreeService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolGraduateDegreeService.java index 5a0b7a8..25d49e6 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolGraduateDegreeService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolGraduateDegreeService.java @@ -1,5 +1,6 @@ package org.jeecg.modules.yx.service; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.jeecg.modules.yx.entity.YxSchoolGraduateDegree; import com.baomidou.mybatisplus.extension.service.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 index 61a3f8e..1e3613a 100644 --- 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 @@ -10,5 +10,5 @@ import com.baomidou.mybatisplus.extension.service.IService; * @Version: V1.0 */ public interface IYxSchoolResearchTeachingService extends IService { - + public void test(); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolService.java index e35ba64..551d3f8 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolService.java @@ -38,6 +38,5 @@ public interface IYxSchoolService extends IService { */ IPage miniSchoolSearch(QueryRecommendMajorVO queryRecommendMajorVO); - MiniSchoolDTO getMiniSchoolInfoBySchoolCode(String schoolCode); //小程序代码================================================= } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxMajorServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxMajorServiceImpl.java index 76e42bd..519b9af 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxMajorServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxMajorServiceImpl.java @@ -17,6 +17,7 @@ import org.jeecg.modules.yx.entity.YxHistoryMajorEnroll; import org.jeecg.modules.yx.entity.YxMajor; import org.jeecg.modules.yx.entity.YxSchoolMajor; import org.jeecg.modules.yx.mapper.YxMajorMapper; +import org.jeecg.modules.yx.mapper.YxSchoolMapper; import org.jeecg.modules.yx.service.IYxFirstLevelDisciplinesService; import org.jeecg.modules.yx.service.IYxHistoryMajorEnrollService; import org.jeecg.modules.yx.service.IYxMajorService; @@ -125,6 +126,9 @@ public class YxMajorServiceImpl extends ServiceImpl impl LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(YxSchoolMajor::getSchoolCode,queryRecommendMajorVO.getSchoolCode()); queryWrapper.eq(YxSchoolMajor::getCategory,queryRecommendMajorVO.getCognitioPolyclinic()); + if (StringUtils.isNotBlank(queryRecommendMajorVO.getProfessionalCategory())) { + queryWrapper.eq(YxSchoolMajor::getMajorType,queryRecommendMajorVO.getProfessionalCategory()); + } List yxSchoolMajorList = yxSchoolMajorService.list(queryWrapper); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); List historyMajorEnrollList=null; 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 index 2814b3a..3114640 100644 --- 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 @@ -7,6 +7,8 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.List; + /** * @Description: 学校科研教学信息表 * @Author: jeecg-boot @@ -16,4 +18,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class YxSchoolResearchTeachingServiceImpl extends ServiceImpl implements IYxSchoolResearchTeachingService { + @Override + public void test() { + //List yxSchoolResearchTeachings = baseMapper.selectTest(); + //updateBatchById(yxSchoolResearchTeachings); + List yxSchoolResearchTeachings2= baseMapper.selectTest2(); + updateBatchById(yxSchoolResearchTeachings2); + } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolServiceImpl.java index 83c3f91..7a07f2e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolServiceImpl.java @@ -144,64 +144,6 @@ public class YxSchoolServiceImpl extends ServiceImpl i return dtoPage; } - @Override - public MiniSchoolDTO getMiniSchoolInfoBySchoolCode(String schoolCode) { - YxSchoolChild schoolChild = yxSchoolChildService.getOne(new LambdaQueryWrapper().eq(YxSchoolChild::getSchoolCode, schoolCode)); - if (schoolChild == null) { - throw new JeecgBootException("未获取到院校信息，请联系管理员"); - } - String schoolId = schoolChild.getSchoolId(); - YxSchool yxSchool = super.getById(schoolId); - if (yxSchool == null) { - return null; - } - MiniSchoolDTO miniSchoolDTO = new MiniSchoolDTO(); - BeanUtils.copyProperties(yxSchool, miniSchoolDTO); - miniSchoolDTO.setSchoolCode(schoolCode); - - //软科排名 - YxArwu yxArwu = yxArwuService.getBySchoolId(schoolId); - if (yxArwu!=null) { - miniSchoolDTO.setArwuRanking(yxArwu.getRanking()); - } - - Set tagsList = new LinkedHashSet<>(); - if (StringUtils.isNotBlank(yxSchool.getSchoolType())) { - tagsList.add(yxSchool.getSchoolType());//学校层次 - } - if (StringUtils.isNotBlank(yxSchool.getInstitutionType())) { - tagsList.add(yxSchool.getInstitutionType() + "类");//院校类型 - } - if (StringUtils.isNotBlank(yxSchool.getSchoolNature())) { - tagsList.add(yxSchool.getSchoolNature());//办学性质 - } - //判断 是否是 985,211 - if (yxSchool.getIs211().equals(1)) { - tagsList.add("211"); - } - if (yxSchool.getIs985().equals(1)) { - tagsList.add("985"); - } - if ("双一流".equals(yxSchool.getSfsyl())) { - tagsList.add("双一流"); - } - /*if (StringUtils.isNotBlank(yxSchool.getSjyl())) { - Collections.addAll(tagsList, yxSchool.getSjyl().split(",")); - }*/ - if (StringUtils.isNotBlank(yxSchool.getGzsz())) { - tagsList.add(yxSchool.getGzsz()); - } - //世界一流 - /*String sjyl = yxSchool.getSjyl(); - if (StringUtils.isNotBlank(sjyl) && !sjyl.equals("0")) { - String[] split = sjyl.split(","); - tagsList.addAll(Arrays.asList(split)); - }*/ - miniSchoolDTO.setTagsList(tagsList); - return miniSchoolDTO; - } - - ///==========================PC端 @Override public IPage search(QueryRecommendMajorVO queryRecommendMajorVO) {