yitisheng
/
yitisheng-new-api
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updates

This commit is contained in:
zhouwentao 2024-03-12 13:22:43 +08:00
parent b0bf4f9e80
commit 63edb4b06e
19 changed files with 237 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniArticleController.java
View File

@ -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<YxSchoolMajor> updateSchoolMajorList=new ArrayList<>();
List<YxSchoolMajor> 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<String,YxSchoolResearchTeaching> maps= new LinkedHashMap<>();
if (false) {
Map<String, YxSchoolResearchTeaching> maps = new LinkedHashMap<>();
YxSchoolResearchTeaching yxSchoolResearchTeaching = null;
List<YxSchoolGraduateDegree> 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<YxSchoolResearchTeaching> values = maps.values();
yxSchoolResearchTeachingService.saveBatch(values);
return Result.OK();
}
if (false) {
yxSchoolResearchTeachingService.test();
}
//分页
Integer pageNum = queryArticleVO.getPageNum();
Integer pageSize = queryArticleVO.getPageSize();

5
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniSchoolController.java
View File

@ -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 = "搜索学校")

35
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniSchoolGraduateDegreeController.java
View File

@ -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<String, SchoolGraduateDegreeDTO> 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<YxSchoolGraduateDegree> 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<YxSchoolGraduateDegree> pageList = yxSchoolMasterDegreeService.page(new Page<>(queryRecommendMajorVO.getPageNum(), queryRecommendMajorVO.getPageSize()), lambdaQueryWrapper);
return Result.OK(pageList);
}
}

23
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/dto/MiniSchoolDTO.java
View File

@ -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;
}

62
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/service/MiniSchoolService.java Normal file
View File

@ -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<String> 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;
}
}

51
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolGraduateDegreeController.java
View File

@ -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<YxSchoolGr
private IYxSchoolGraduateDegreeService yxSchoolMasterDegreeService;
@Autowired
private IYxSchoolService yxSchoolService;
@Autowired
private IYxSchoolResearchTeachingService yxSchoolResearchTeachingService;
/**
* 分页列表查询
@ -148,24 +153,29 @@ public class YxSchoolGraduateDegreeController extends JeecgController<YxSchoolGr
// 获取上传文件对象
//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");
//File file = new File("C:\\Users\\Denim\\Desktop\\艺体志愿宝数据\\硕博点\\2024体育硕士招生目录.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);
params.setNeedSave(true);
int index = 0;
Set<String> schoolIdSet = new HashSet<>();
try {
fileInputStream = new FileInputStream(file);
List<YxSchoolGraduateDegree> list = ExcelImportUtil.importExcel(fileInputStream, YxSchoolGraduateDegree.class, params);
Set<String> schoolNameList = new HashSet<>();
List<YxSchool> yxSchoolList = yxSchoolService.list();
LambdaQueryWrapper<YxSchool> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.select(YxSchool::getId,YxSchool::getSchoolName);
List<YxSchool> yxSchoolList = yxSchoolService.list(queryWrapper);
Map<String, YxSchool> schoolMap = new LinkedHashMap<>();
for (YxSchool yxSchool : yxSchoolList) {
schoolMap.put(yxSchool.getSchoolName(), yxSchool);
}
LambdaQueryWrapper<YxSchool> queryWrapper = new LambdaQueryWrapper<>();
String schoolName = null;
String majorName = null;
String sn = null;
@ -174,19 +184,20 @@ public class YxSchoolGraduateDegreeController extends JeecgController<YxSchoolGr
int mrLast = 0;
YxSchool yxSchool = null;
for (YxSchoolGraduateDegree yxSchoolGraduateDegree : list) {
majorName = yxSchoolGraduateDegree.getMajorName();
majorName = majorName.replace("(","（").replace(")","）");
mrLast = majorName.indexOf("）");
//majorName = yxSchoolGraduateDegree.getMajorName();
//majorName = majorName.replace("(","（").replace(")","）");
//mrLast = majorName.indexOf("）");
//专业名称
if (mrLast!=-1) {
mn = majorName.substring(mrLast+1);
}
yxSchoolGraduateDegree.setMajorCode(yxSchoolGraduateDegree.getMajorName().substring(1,7));
yxSchoolGraduateDegree.setMajorName(mn);
// if (mrLast!=-1) {
// mn = majorName.substring(mrLast+1);
// }
//yxSchoolGraduateDegree.setMajorCode(yxSchoolGraduateDegree.getMajorName().substring(1,7));
//yxSchoolGraduateDegree.setMajorName(mn);
schoolName = yxSchoolGraduateDegree.getSchoolName();
schoolName = schoolName.replace("(","（").replace(")","）");
khLast = schoolName.indexOf("）");
sn = schoolName;
if (khLast != -1) {
sn = schoolName.substring(khLast + 1);
}
@ -195,15 +206,23 @@ public class YxSchoolGraduateDegreeController extends JeecgController<YxSchoolGr
schoolNameList.add(sn);
continue;
}
yxSchoolGraduateDegree.setSchoolMasterCode(schoolName.substring(1,6));
yxSchoolGraduateDegree.setSchoolName(sn);
yxSchoolGraduateDegree.setSchoolId(yxSchool.getId());
//yxSchoolGraduateDegree.setSchoolMasterCode(schoolName.substring(1,6));
//yxSchoolGraduateDegree.setSchoolName(sn);
//yxSchoolGraduateDegree.setSchoolId(yxSchool.getId());
schoolIdSet.add(yxSchool.getId());
}
System.out.println("缺少院校编码");
for (String s : schoolNameList) {
System.out.println(s);
}
yxSchoolMasterDegreeService.saveBatch(list,100);
if (CollectionUtils.isNotEmpty(schoolIdSet)) {
LambdaUpdateWrapper<YxSchoolResearchTeaching> 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);

13
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreController.java
View File

@ -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 = "高职高专";

1
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreSegmentController.java
View File

@ -281,7 +281,6 @@ public class YxScoreSegmentController extends JeecgController<YxScoreSegment, IY
String year = "2023";
String professionalCategory = "表演类";
String professionalCategoryChild=null;
//professionalCategoryChild = "影视戏剧导演";
String province = "河南";
LambdaQueryWrapper<YxScoreSegment> yxScoreSegmentLambdaQueryWrapper = new LambdaQueryWrapper<>();
yxScoreSegmentLambdaQueryWrapper.eq(YxScoreSegment::getYear,year);

7
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxSchoolMapper.java
View File

@ -42,4 +42,11 @@ public interface YxSchoolMapper extends BaseMapper<YxSchool> {
IPage<MiniSchoolDTO> miniSchoolSearchSm(@Param("page")Page<Object> page, @Param("qvo") QueryRecommendMajorVO queryRecommendMajorVO);
YxSchoolDTO getBySchoolName(String schoolName);
/**
* 小程序端-根据 schoolCode，关联yx_school_child 表获取Dto信息
* @param schoolCode
* @return
*/
MiniSchoolDTO getMiniDtoBySchoolCode(@Param("schoolCode") String schoolCode);
}

3
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxSchoolResearchTeachingMapper.java
View File

@ -14,4 +14,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface YxSchoolResearchTeachingMapper extends BaseMapper<YxSchoolResearchTeaching> {
List<YxSchoolResearchTeaching> selectTest();
List<YxSchoolResearchTeaching> selectTest2();
}

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMajorMapper.xml
View File

@ -145,7 +145,7 @@
<!--音乐类 子项专业查询 end-->
<!--表演类 子项专业查询 start-->
<if test="queryvo.professionalCategory!=null and queryvo.professionalCategory=='表演类' and queryvo.pCategoryChildrenList!=null and queryvo.pCategoryChildrenList.size>0">
AND s.main_subjects in
AND sm.main_subjects in
<foreach collection="queryvo.pCategoryChildrenList" index="index" item="b" open="(" separator="," close=")">
#{b}
</foreach>

18
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMapper.xml
View File

@ -398,4 +398,22 @@
GROUP BY sc.school_code
ORDER BY field( COALESCE(sm.batch,'null'), '提前批', '本科A段', '本科B段', '本科', '高职高专','null')
</select>
<select id="getMiniDtoBySchoolCode" resultType="org.jeecg.modules.mini.dto.MiniSchoolDTO">
SELECT s.*,
sc.school_code,
arwu.ranking AS arwuRanking,
srt.doctoral_point AS "schoolResearchTeaching.doctoralPoint",
srt.academic_master_degree_point AS "schoolResearchTeaching.academicMasterDegreePoint",
srt.professional_master_degree_point AS "schoolResearchTeaching.professionalMasterDegreePoint",
srt.byl AS "schoolResearchTeaching.byl",
srt.yjsy AS "schoolResearchTeaching.yjsy",
srt.zhx AS "schoolResearchTeaching.zhx",
srt.byzg AS "schoolResearchTeaching.byzg"
FROM yx_school_child sc
LEFT JOIN yx_school s ON sc.school_id = s.id
LEFT JOIN yx_arwu arwu ON arwu.school_id = s.id
LEFT JOIN yx_school_research_teaching srt ON srt.school_id = s.id
WHERE sc.school_code = #{schoolCode}
</select>
</mapper>

21
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolResearchTeachingMapper.xml
View File

@ -2,4 +2,23 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.yx.mapper.YxSchoolResearchTeachingMapper">
</mapper>
<select id="selectTest" resultType="org.jeecg.modules.yx.entity.YxSchoolResearchTeaching">
SELECT t.id,t.doctoral_point,t.academic_master_degree_point,t.byl,t.yjsy,t.zhx,t.byzg,
COUNT(DISTINCT CONCAT(y.major_name, '-', y.discipline_field)) AS professionalMasterDegreePoint
FROM yx_school_graduate_degree y
LEFT JOIN yx_school_research_teaching t ON t.school_id = y.school_id
WHERE y.degree_nature = '专硕'
GROUP BY y.school_id
HAVING COUNT(DISTINCT CONCAT(y.major_name, '-', y.discipline_field)) > 0
</select>
<select id="selectTest2" resultType="org.jeecg.modules.yx.entity.YxSchoolResearchTeaching">
SELECT t.id,t.doctoral_point,t.professional_master_degree_point,t.byl,t.yjsy,t.zhx,t.byzg,
COUNT(DISTINCT CONCAT(y.major_name, '-', y.discipline_field)) AS academic_master_degree_point
FROM yx_school_graduate_degree y
LEFT JOIN yx_school_research_teaching t ON t.school_id = y.school_id
WHERE y.degree_nature = '学硕'
GROUP BY y.school_id
HAVING COUNT(DISTINCT CONCAT(y.major_name, '-', y.discipline_field)) > 0
</select>
</mapper>

1
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolGraduateDegreeService.java
View File

@ -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;

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolResearchTeachingService.java
View File

@ -10,5 +10,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
* @Version: V1.0
*/
public interface IYxSchoolResearchTeachingService extends IService<YxSchoolResearchTeaching> {
public void test();
}

1
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolService.java
View File

@ -38,6 +38,5 @@ public interface IYxSchoolService extends IService<YxSchool> {
*/
IPage<MiniSchoolDTO> miniSchoolSearch(QueryRecommendMajorVO queryRecommendMajorVO);
MiniSchoolDTO getMiniSchoolInfoBySchoolCode(String schoolCode);
//小程序代码=================================================
}

4
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxMajorServiceImpl.java
View File

@ -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<YxMajorMapper, YxMajor> impl
LambdaQueryWrapper<YxSchoolMajor> 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<YxSchoolMajor> yxSchoolMajorList = yxSchoolMajorService.list(queryWrapper);
LambdaQueryWrapper<YxHistoryMajorEnroll> lambdaQueryWrapper = new LambdaQueryWrapper<>();
List<YxHistoryMajorEnroll> historyMajorEnrollList=null;

9
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolResearchTeachingServiceImpl.java
View File

@ -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<YxSchoolResearchTeachingMapper, YxSchoolResearchTeaching> implements IYxSchoolResearchTeachingService {
@Override
public void test() {
//List<YxSchoolResearchTeaching> yxSchoolResearchTeachings = baseMapper.selectTest();
//updateBatchById(yxSchoolResearchTeachings);
List<YxSchoolResearchTeaching> yxSchoolResearchTeachings2= baseMapper.selectTest2();
updateBatchById(yxSchoolResearchTeachings2);
}
}

58
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolServiceImpl.java
View File

@ -144,64 +144,6 @@ public class YxSchoolServiceImpl extends ServiceImpl<YxSchoolMapper, YxSchool> i
return dtoPage;
}
@Override
public MiniSchoolDTO getMiniSchoolInfoBySchoolCode(String schoolCode) {
YxSchoolChild schoolChild = yxSchoolChildService.getOne(new LambdaQueryWrapper<YxSchoolChild>().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<String> 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<ArtSchoolDTO> search(QueryRecommendMajorVO queryRecommendMajorVO) {