From 37e1284e0fa453e423847c4ae3fce78074d7383e Mon Sep 17 00:00:00 2001 From: zhouwentao <1577701412@qq.com> Date: Tue, 19 Mar 2024 22:44:53 +0800 Subject: [PATCH] updates --- .../ArtRecommendMajorController.java | 31 ----------- .../modules/art/dto/RecommendMajorDTO.java | 2 + .../controller/MiniArticleController.java | 34 +++++++++++- .../mini/controller/MiniMajorController.java | 41 +++++++++++++-- .../jeecg/modules/yx/constant/YxConstant.java | 1 + .../YxHistoryMajorEnrollController.java | 44 +++++++++++++--- .../YxHistoryScoreControlLineController.java | 43 ++++++++++++++- .../controller/YxSchoolMajorController.java | 52 +++++++++++++++++-- .../modules/yx/entity/YxCalculationMajor.java | 4 ++ .../yx/entity/YxHistoryMajorEnroll.java | 36 ++++++------- .../modules/yx/entity/YxSchoolMajor.java | 4 ++ .../jeecg/modules/yx/entity/YxVipCard.java | 10 ++-- .../mapper/xml/YxCalculationMajorMapper.xml | 6 +-- .../yx/mapper/xml/YxSchoolMajorMapper.xml | 1 + .../yx/service/impl/BiaoyanService.java | 29 ++++++++--- .../modules/yx/service/impl/BoYinService.java | 35 ++++++++++--- .../modules/yx/service/impl/MusicService.java | 33 +++++++++--- .../modules/yx/service/impl/WuDaoService.java | 28 ++++++++-- .../impl/YxSchoolMajorServiceImpl.java | 2 + .../yx/service/impl/YxVipCardServiceImpl.java | 10 +++- .../org/jeecg/modules/yx/util/ScoreUtil.java | 2 + .../src/main/resources/text.txt | 21 -------- 22 files changed, 348 insertions(+), 121 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/controller/ArtRecommendMajorController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/controller/ArtRecommendMajorController.java index 728d2e7..4d77e34 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/controller/ArtRecommendMajorController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/controller/ArtRecommendMajorController.java @@ -52,37 +52,6 @@ public class ArtRecommendMajorController { @Resource private RedisUtil redisUtil; - @ApiOperation(value = "获取可报专业总数") - @GetMapping("/rulesEnrollrobabilityMenuList") - public Result rulesEnrollrobabilityMenuList(QueryRecommendMajorVO queryRecommendMajorVO) { - String key = "rulesEnrollrobabilityMenuList:professionalCategory_" + queryRecommendMajorVO.getProfessionalCategory(); - String json = null; - List dataList = new ArrayList<>(); - Map data = null; - if (redisUtil.hasKey(key)) { - json = (String) redisUtil.get(key); - dataList = JSONArray.parseArray(json, Map.class); - } else { - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.select(YxSchoolMajor::getRulesEnrollProbability); - lambdaQueryWrapper.eq(YxSchoolMajor::getMajorType, queryRecommendMajorVO.getProfessionalCategory()); - lambdaQueryWrapper.last("order by field(rules_enroll_probability,'','文过专排','专过文排')"); - lambdaQueryWrapper.isNotNull(YxSchoolMajor::getRulesEnrollProbability); - lambdaQueryWrapper.groupBy(YxSchoolMajor::getRulesEnrollProbability); - List yxSchoolMajorList = yxSchoolMajorService.list(lambdaQueryWrapper); - for (YxSchoolMajor yxSchoolMajor : yxSchoolMajorList) { - data = new LinkedHashMap<>(); - data.put("label", yxSchoolMajor.getRulesEnrollProbability()); - data.put("value", yxSchoolMajor.getRulesEnrollProbability()); - dataList.add(data); - } - json = JSONObject.toJSONString(dataList); - redisUtil.set(key, json, 3600); - } - - return Result.OK(dataList); - } - @ApiOperation(value = "获取可报专业总数") @GetMapping("/recommendMajorCount") public Result recommendMajorCount(QueryRecommendMajorVO queryRecommendMajorVO) { diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/RecommendMajorDTO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/RecommendMajorDTO.java index a04a5bb..3201e79 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/RecommendMajorDTO.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/RecommendMajorDTO.java @@ -73,6 +73,8 @@ public class RecommendMajorDTO implements Serializable { private Integer planNum=0; @ApiModelProperty(value = "学费金额") private BigDecimal studyCost; + @ApiModelProperty(value = "录取方式缩写") + private String rulesEnrollProbabilitySx; @ApiModelProperty(value = "录取方式") private String rulesEnrollProbability; @ApiModelProperty(value = "录取概率计算规则运算符") 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 f0fc9b5..7c66be9 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 @@ -12,6 +12,7 @@ import com.google.gson.reflect.TypeToken; 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.lang3.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.RedisUtil; @@ -157,7 +158,38 @@ public class MiniArticleController { yxSchoolResearchTeachingService.test(); } - if(true){ + if(false){ + String json = "{\"文*1+专*1\":\"文1专1\",\"文*0.133+专*0.333\":\"文1专1\",\"文*0.04+专*0.175\":\"文3专7\",\"文*0.04+专*0.233\":\"文3专7\",\"文*0.4+专*2.333\":\"文3专7\",\"文*0.04+专*0.35\":\"文3专7\",\"文*0.3+专*0.7\":\"文3专7\",\"文*0.3+专*1.75\":\"文3专7\",\"文*0.3+专*2.625\":\"文3专7\",\"文*0.3+专*1\":\"文3专10\",\"文*0.4+专*1\":\"文4专10\",\"文*0.4+专*0.6\":\"文4专6\",\"文*0.4+专*0.9\":\"文4专6\",\"文*0.4+专*1.125\":\"文4专6\",\"文*0.4+专*1.5\":\"文4专6\",\"文*0.4+专*2.25\":\"文4专6\",\"文*0.053+专*0.15\":\"文4专6\",\"文*0.053+专*0.2\":\"文4专6\",\"文*0.053+专*0.3\":\"文4专6\",\"文*0.4+专*1.5\":\"文4专6\",\"文*0.11673+专*0.133\":\"文4专6\",\"文*0.10969+专*0.133\":\"文4专6\",\"文*0.4+专*1.5\":\"文4专6\",\"文*0.08+专*0.2\":\"文4专6\",\"文*0.8+专*1.2\":\"文4专6\",\"文*0.08+专*0.4\":\"文4专6\",\"文*1.2+专*0.8\":\"文4专6\",\"文*0.5+专*1\":\"文5专10\",\"文*0.5+专*1.25\":\"文5专5\",\"文*0.5+专*1.875\":\"文5专5\",\"文*0.067+专*0.167\":\"文5专5\",\"文*0.067+专*0.125\":\"文5专5\",\"文*0.067+专*0.25\":\"文5专5\",\"文*0.667+专*0.125\":\"文5专5\",\"文*0.667+专*2.5\":\"文5专5\",\"文*0.667+专*0.25\":\"文5专5\",\"文*0.5+专*0.5\":\"文5专5\",\"文*0.6+专*1\":\"文6专10\",\"文*0.076+专*0.3\":\"文6专4\",\"文*0.6+专*0.75\":\"文6专4\",\"文*0.8+专*1.333\":\"文6专4\",\"文*0.08+专*0.133\":\"文6专4\",\"文*0.6+专*0.4\":\"文6专4\",\"文*0.08+专*0.1\":\"文6专4\",\"文*0.8+专*1\":\"文6专4\",\"文*0.7+专*0.75\":\"文7专3\",\"文*0.093+专*0.1\":\"文7专3\",\"文*0.7+专*0.563\":\"文7专3\",\"文*0.933+专*0.75\":\"文7专3\",\"文*0.7+专*0.3\":\"文7专3\"}"; + JSONObject types = JSONObject.parseObject(json); + List list = yxSchoolMajorService.list(new LambdaQueryWrapper().isNull(YxSchoolMajor::getRulesEnrollProbabilitySx)); + String rulesEnrollProbability = null; + String type = null; + Set notTypes=new HashSet<>(); + List updates=new ArrayList<>(); + for (YxSchoolMajor yxSchoolMajor : list) { + rulesEnrollProbability = yxSchoolMajor.getRulesEnrollProbability(); + if (StringUtils.isNotBlank(rulesEnrollProbability)) { + if (rulesEnrollProbability.contains("过") || rulesEnrollProbability.equals("文+专")) { + continue; + } + type = types.getString(rulesEnrollProbability); + if (type == null) { + notTypes.add(rulesEnrollProbability); + continue; + } + yxSchoolMajor.setRulesEnrollProbabilitySx(type); + updates.add(yxSchoolMajor); + } + } + if (CollectionUtils.isNotEmpty(updates)) { + yxSchoolMajorService.updateBatchById(updates); + } + for (String notType : notTypes) { + System.out.println(notType); + } + } + + if(false){ LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); //lambdaQueryWrapper.isNull(YxArticle::getSchoolId); lambdaQueryWrapper.eq(YxArticle::getSchoolId,""); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniMajorController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniMajorController.java index 934860c..bcafd58 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniMajorController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniMajorController.java @@ -1,10 +1,13 @@ package org.jeecg.modules.mini.controller; +import com.alibaba.fastjson.JSONArray; +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.jeecg.common.api.vo.Result; +import org.jeecg.common.util.RedisUtil; import org.jeecg.modules.art.dto.ArtRecommendMajorBaseDTO; import org.jeecg.modules.art.vo.QueryRecommendMajorVO; import org.jeecg.modules.yx.entity.YxHistoryMajorEnroll; @@ -19,8 +22,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -41,7 +43,8 @@ public class MiniMajorController { private IYxCalculationMajorService yxCalculationMajorService; @Autowired private IYxHistoryMajorEnrollService yxHistoryMajorEnrollService; - + @Autowired + private RedisUtil redisUtil; @ApiOperation(value = "小程序端-智能推荐") @GetMapping("/recommendMajor/aiAuto") @@ -113,4 +116,36 @@ public class MiniMajorController { public Result schoolMajorList(QueryRecommendMajorVO queryRecommendMajorVO){ return Result.OK(yxMajorService.schoolMajorList(queryRecommendMajorVO)); } + + + @ApiOperation(value = "录取方式类型") + @GetMapping("/rulesEnrollrobabilityMenuList") + public Result rulesEnrollrobabilityMenuList(QueryRecommendMajorVO queryRecommendMajorVO) { + String key = "mini:major:rulesEnrollrobabilityMenuList:professionalCategory_" + queryRecommendMajorVO.getProfessionalCategory(); + String json = null; + List dataList = new ArrayList<>(); + Map data = null; + if (redisUtil.hasKey(key)) { + json = (String) redisUtil.get(key); + dataList = JSONArray.parseArray(json, Map.class); + } else { + String str = null; + if (queryRecommendMajorVO.getProfessionalCategory().equals("音乐类")) { + str="[\"文过专排主科\",\"文过专排\",\"专过文排\",\"文1专1\",\"文3专7\",\"文3专10\",\"文4专10\",\"文4专6\",\"文5专10\",\"文5专5\",\"文6专10\",\"文6专4\",\"文7专3\"]"; + }else{ + str="[\"文过专排\",\"专过文排\",\"文1专1\",\"文3专7\",\"文3专10\",\"文4专10\",\"文4专6\",\"文5专10\",\"文5专5\",\"文6专10\",\"文6专4\",\"文7专3\"]"; + } + JSONArray objects = JSONArray.parseArray(str); + List javaList = objects.toJavaList(String.class); + for (String s : javaList) { + data = new LinkedHashMap<>(); + data.put("label",s); + data.put("value",s); + dataList.add(data); + } + json = JSONObject.toJSONString(dataList); + //redisUtil.set(key, json, 3600); + } + return Result.OK(dataList); + } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/constant/YxConstant.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/constant/YxConstant.java index a377393..b4fd575 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/constant/YxConstant.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/constant/YxConstant.java @@ -71,4 +71,5 @@ public class YxConstant { public static String oldCalculationMajorName = "yx_calculation_major"; public static String newCalculationMajorName = "yx_calculation_major"; public static BigDecimal bigDecimal10 = new BigDecimal("10"); + public static BigDecimal bigDecimal025 = new BigDecimal("0.25"); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryMajorEnrollController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryMajorEnrollController.java index 5ff3ea1..b27dd20 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryMajorEnrollController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryMajorEnrollController.java @@ -20,10 +20,7 @@ import org.jeecg.common.util.AssertUtils; import org.jeecg.modules.yx.dto.LiNianShuJuBenDTO; import org.jeecg.modules.yx.dto.LiNianShuJuDTO; import org.jeecg.modules.yx.dto.LiNianShuJuZhuanDTO; -import org.jeecg.modules.yx.entity.YxFirstLevelDisciplines; -import org.jeecg.modules.yx.entity.YxHistoryMajorEnroll; -import org.jeecg.modules.yx.entity.YxHistoryScoreControlLine; -import org.jeecg.modules.yx.entity.YxMajor; +import org.jeecg.modules.yx.entity.*; import org.jeecg.modules.yx.service.IYxHistoryMajorEnrollService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -117,16 +114,51 @@ public class YxHistoryMajorEnrollController extends JeecgController edit(@RequestBody YxHistoryMajorEnroll yxHistoryMajorEnroll) { + String id = yxHistoryMajorEnroll.getId(); String majorCode = yxHistoryMajorEnroll.getMajorCode(); + String majorName = yxHistoryMajorEnroll.getMajorName(); String schoolCode = yxHistoryMajorEnroll.getSchoolCode(); - AssertUtils.notEmpty(schoolCode, "请选择[学校]!"); - AssertUtils.notEmpty(majorCode, "请选择[专业]!"); + AssertUtils.notEmpty(schoolCode, "请输入[学校代码]!"); + AssertUtils.notEmpty(majorCode, "请输入[专业代码]!"); + AssertUtils.notEmpty(majorName, "请输入[专业名称]!"); AssertUtils.notNull(yxHistoryMajorEnroll.getYear(), "请输入[年份]!"); AssertUtils.notTrue(yxHistoryMajorEnrollService.exist(yxHistoryMajorEnroll), String.format("专业-[%s]-已经录入", majorCode)); yxHistoryMajorEnrollService.updateById(yxHistoryMajorEnroll); return Result.OK("编辑成功!"); } + /** + * 批量保存 + */ + @AutoLog(value = "历年录取数据表-批量保存") + @ApiOperation(value="历年录取数据表-批量保存", notes="历年录取数据表-批量保存") + @RequiresPermissions("yx:yx_history_major_enroll:edit") + @RequestMapping(value = "/saveBatch", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result saveBatch(@RequestBody List yxHistoryMajorEnrollList) { + String id=null; + String majorCode = null; + String majorName = null; + String schoolCode = null; + String enrollmentCode = null; + int i=0; + for (YxHistoryMajorEnroll yxHistoryMajorEnroll : yxHistoryMajorEnrollList) { + i++; + id = yxHistoryMajorEnroll.getId(); + majorCode = yxHistoryMajorEnroll.getMajorCode(); + majorName = yxHistoryMajorEnroll.getMajorName(); + schoolCode = yxHistoryMajorEnroll.getSchoolCode(); + enrollmentCode = yxHistoryMajorEnroll.getEnrollmentCode(); + AssertUtils.notEmpty(schoolCode, String.format("第%s行,请输入[学校代码]!",i)); + AssertUtils.notEmpty(majorCode, String.format("第%s行,请输入[专业代码]!",i)); + AssertUtils.notEmpty(majorName, String.format("第%s行,请输入[专业名称]!",i)); + AssertUtils.notEmpty(enrollmentCode, String.format("第%s行,请输入[招生代码]!",i)); + } + if (CollectionUtils.isNotEmpty(yxHistoryMajorEnrollList)) { + yxHistoryMajorEnrollService.saveOrUpdateBatch(yxHistoryMajorEnrollList); + } + return Result.OK("保存成功!"); + } + /** * 通过id删除 * diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryScoreControlLineController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryScoreControlLineController.java index a762802..1dcd2f5 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryScoreControlLineController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryScoreControlLineController.java @@ -6,10 +6,16 @@ import javax.servlet.http.HttpServletResponse; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import org.apache.commons.collections.CollectionUtils; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.AssertUtils; import org.jeecg.common.util.RedisUtil; import org.jeecg.modules.yx.constant.YxConstant; +import org.jeecg.modules.yx.entity.YxHistoryMajorEnroll; import org.jeecg.modules.yx.entity.YxHistoryScoreControlLine; +import org.jeecg.modules.yx.entity.YxSchoolMajor; import org.jeecg.modules.yx.service.IYxHistoryScoreControlLineService; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -59,8 +65,11 @@ public class YxHistoryScoreControlLineController extends JeecgController page = new Page(pageNo, pageSize); - IPage pageList = yxHistoryScoreControlLineService.pageList(page,yxHistoryScoreControlLine); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(yxHistoryScoreControlLine, req.getParameterMap()); + Page page = new Page<>(pageNo, pageSize); + IPage pageList = yxHistoryScoreControlLineService.page(page, queryWrapper); + /*Page page = new Page(pageNo, pageSize); + IPage pageList = yxHistoryScoreControlLineService.pageList(page,yxHistoryScoreControlLine);*/ return Result.OK(pageList); } @@ -152,6 +161,36 @@ public class YxHistoryScoreControlLineController extends JeecgController saveBatch(@RequestBody List yxHistoryScoreControlLineList) { + String id=null; + String year = null; + String professionalCategory = null; + String schoolCode = null; + String enrollmentCode = null; + int i=0; + for (YxHistoryScoreControlLine record : yxHistoryScoreControlLineList) { + i++; + id = record.getId(); + year = record.getYear(); + professionalCategory = record.getProfessionalCategory(); + AssertUtils.notEmpty(year, String.format("第%s行,请输入[年份]!",i)); + AssertUtils.notEmpty(professionalCategory, String.format("第%s行,请输入[专业类别]!",i)); + } + if (CollectionUtils.isNotEmpty(yxHistoryScoreControlLineList)) { + yxHistoryScoreControlLineService.saveOrUpdateBatch(yxHistoryScoreControlLineList); + } + return Result.OK("保存成功!"); + } + + + /** * 通过id删除 * diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolMajorController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolMajorController.java index 67d409a..2ab85d0 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolMajorController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolMajorController.java @@ -83,6 +83,7 @@ public class YxSchoolMajorController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(yxSchoolMajor, req.getParameterMap()); Page page = new Page(pageNo, pageSize); + queryWrapper.orderByDesc("create_time","update_time"); IPage pageList = yxSchoolMajorService.page(page, queryWrapper); return Result.OK(pageList); @@ -133,16 +134,57 @@ public class YxSchoolMajorController extends JeecgController edit(@RequestBody YxSchoolMajor yxSchoolMajor) { String id = yxSchoolMajor.getId(); String majorCode = yxSchoolMajor.getMajorCode(); + String majorName = yxSchoolMajor.getMajorName(); String schoolCode = yxSchoolMajor.getSchoolCode(); - AssertUtils.notEmpty(schoolCode, "请选择[学校]!"); - AssertUtils.notEmpty(majorCode, "请选择[专业]!"); - AssertUtils.notNull(yxSchoolMajor.getTuition(), "请输入[学费]!"); - AssertUtils.notTrue(yxSchoolMajorService.exist(yxSchoolMajor), String.format("专业-[%s]-已经录入", majorCode)); - + AssertUtils.notEmpty(schoolCode, "请输入[学校代码]!"); + AssertUtils.notEmpty(majorCode, "请输入[专业代码]!"); + AssertUtils.notEmpty(majorName, "请输入[专业名称]!"); + AssertUtils.notEmpty(yxSchoolMajor.getEnrollmentCode(), "请输入[招生代码]!"); + //AssertUtils.notNull(yxSchoolMajor.getTuition(), "请输入[学费]!"); + //AssertUtils.notTrue(yxSchoolMajorService.exist(yxSchoolMajor), String.format("专业-[%s]-已经录入", majorCode)); + if (StringUtils.isBlank(id)) { + yxSchoolMajorService.save(yxSchoolMajor); + } yxSchoolMajorService.updateById(yxSchoolMajor); return Result.OK("编辑成功!"); } + + /** + * 保存全部 + * + * @param yxSchoolMajorList + * @return + */ + @AutoLog(value = "学校专业关联表-保存全部") + @ApiOperation(value = "学校专业关联表-保存全部", notes = "学校专业关联表-保存全部") + @RequiresPermissions("yx:yx_school_major:edit") + @RequestMapping(value = "/saveBatch", method = {RequestMethod.PUT, RequestMethod.POST}) + public Result saveBatch(@RequestBody List yxSchoolMajorList) { + String id=null; + String majorCode = null; + String majorName = null; + String schoolCode = null; + String enrollmentCode = null; + int i=0; + for (YxSchoolMajor yxSchoolMajor : yxSchoolMajorList) { + i++; + id = yxSchoolMajor.getId(); + majorCode = yxSchoolMajor.getMajorCode(); + majorName = yxSchoolMajor.getMajorName(); + schoolCode = yxSchoolMajor.getSchoolCode(); + enrollmentCode = yxSchoolMajor.getEnrollmentCode(); + AssertUtils.notEmpty(schoolCode, String.format("第%s行,请输入[学校代码]!",i)); + AssertUtils.notEmpty(majorCode, String.format("第%s行,请输入[专业代码]!",i)); + AssertUtils.notEmpty(majorName, String.format("第%s行,请输入[专业名称]!",i)); + AssertUtils.notEmpty(enrollmentCode, String.format("第%s行,请输入[招生代码]!",i)); + } + yxSchoolMajorService.saveOrUpdateBatch(yxSchoolMajorList); + //AssertUtils.notNull(yxSchoolMajor.getTuition(), "请输入[学费]!"); + //AssertUtils.notTrue(yxSchoolMajorService.exist(yxSchoolMajor), String.format("专业-[%s]-已经录入", majorCode)); + return Result.OK("保存成功!"); + } + /** * 通过id删除 * diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxCalculationMajor.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxCalculationMajor.java index a8c2a74..43dcc98 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxCalculationMajor.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxCalculationMajor.java @@ -68,6 +68,10 @@ public class YxCalculationMajor implements Serializable { @Excel(name = "科类(文科/理科)", width = 15) @ApiModelProperty(value = "科类(文科/理科)") private java.lang.String category; + /**录取方式缩写*/ + @Excel(name = "录取方式缩写", width = 15) + @ApiModelProperty(value = "录取方式缩写") + private String rulesEnrollProbabilitySx; /**录取方式*/ @Excel(name = "录取方式", width = 15) @ApiModelProperty(value = "录取方式") diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxHistoryMajorEnroll.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxHistoryMajorEnroll.java index 6781475..5c628b8 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxHistoryMajorEnroll.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxHistoryMajorEnroll.java @@ -40,25 +40,33 @@ public class YxHistoryMajorEnroll implements Serializable { @Excel(name = "学校代码", width = 15) @ApiModelProperty(value = "学校代码") private java.lang.String schoolCode; - /**院校代码*/ - @Excel(name = "院校代码", width = 15) + //@Excel(name = "院校代码", width = 15) @ApiModelProperty(value = "院校代码") private java.lang.String institutionCode; - /**学校名称*/ @Excel(name = "学校名称", width = 15) @ApiModelProperty(value = "学校名称") private java.lang.String schoolName; - + /**批次*/ + @Excel(name = "批次", width = 15) + @ApiModelProperty(value = "批次") + private java.lang.String batch; + /**招生代码*/ + @Excel(name = "招生代码", width = 15) + @ApiModelProperty(value = "招生代码") + private java.lang.String enrollmentCode; /**专业代码*/ - @Excel(name = "专业代码", width = 15) @ApiModelProperty(value = "专业代码") private java.lang.String majorCode; /**专业名称*/ @Excel(name = "专业名称", width = 15) @ApiModelProperty(value = "专业名称") private java.lang.String majorName; + /**专业类型*/ + @Excel(name = "专业类型", width = 15) + @ApiModelProperty(value = "专业类型") + private String majorType; /**年份*/ @Excel(name = "年份", width = 15) @ApiModelProperty(value = "年份") @@ -76,7 +84,7 @@ public class YxHistoryMajorEnroll implements Serializable { @ApiModelProperty(value = "录取概率计算规则运算符") private java.lang.String probabilityOperator; /**省控线*/ - @Excel(name = "省控线", width = 15) + //@Excel(name = "省控线", width = 15) @ApiModelProperty(value = "省控线") private java.math.BigDecimal controlLine; /**录取线*/ @@ -92,12 +100,12 @@ public class YxHistoryMajorEnroll implements Serializable { @ApiModelProperty(value = "录取数") private java.lang.Integer admissionNum; - @Excel(name = "一志愿录取数", width = 15) + //@Excel(name = "一志愿录取数", width = 15) @ApiModelProperty(value = "一志愿录取数") private java.lang.Integer oneVolunteerAdmissionNum; /**最低分数差*/ - @Excel(name = "最低分数差", width = 15) + //@Excel(name = "最低分数差", width = 15) @ApiModelProperty(value = "最低分数差") private java.math.BigDecimal scoreLineDifference; /**备注*/ @@ -123,20 +131,10 @@ public class YxHistoryMajorEnroll implements Serializable { /**所属部门*/ @ApiModelProperty(value = "所属部门") private java.lang.String sysOrgCode; - /**批次*/ - @Excel(name = "批次", width = 15) - @ApiModelProperty(value = "批次") - private java.lang.String batch; - /**招生代码*/ - @Excel(name = "招生代码", width = 15) - @ApiModelProperty(value = "招生代码") - private java.lang.String enrollmentCode; /**实际投递人数*/ @ApiModelProperty(value = "实际投递人数") private Integer actualPitcherNum; - /**专业类型*/ - @ApiModelProperty(value = "专业类型") - private String majorType; + /**专业类型子级*/ @ApiModelProperty(value = "专业类型子级") private String majorTypeChild; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolMajor.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolMajor.java index 04be61d..e4bbbcd 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolMajor.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolMajor.java @@ -64,6 +64,10 @@ public class YxSchoolMajor implements Serializable { @Excel(name = "科类(文科/理科)", width = 15) @ApiModelProperty(value = "科类(文科/理科)") private java.lang.String category; + /**录取方式缩写*/ + @Excel(name = "录取方式缩写", width = 15) + @ApiModelProperty(value = "录取方式缩写") + private String rulesEnrollProbabilitySx; /**录取概率规则*/ @Excel(name = "录取方式", width = 15) @ApiModelProperty(value = "录取方式") diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxVipCard.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxVipCard.java index 475bdd2..e185489 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxVipCard.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxVipCard.java @@ -45,11 +45,15 @@ public class YxVipCard implements Serializable { @ApiModelProperty(value = "对应产品编号") @Dict(dictTable = "yx_vip_sku",dicCode = "sku_code",dicText = "sku_name") private java.lang.String skuCode; - /**有效日期*/ - @Excel(name = "有效日期", width = 15, format = "yyyy-MM-dd") + /**有效日期*/ + @Excel(name = "有效时长(天)", width = 15) + @ApiModelProperty(value = "有效时长(天)") + private Integer validTime; + /**有效期至*/ + @Excel(name = "有效期至", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "有效日期") + @ApiModelProperty(value = "有效期至") private java.util.Date validDate; /**使用时间*/ @Excel(name = "使用时间", width = 15, format = "yyyy-MM-dd HH:mm:ss") diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxCalculationMajorMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxCalculationMajorMapper.xml index 0d16c17..57c2857 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxCalculationMajorMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxCalculationMajorMapper.xml @@ -5,7 +5,7 @@ INSERT INTO ${tableName} (id, score_id, school_code, major_code, major_name, enrollment_code, tuition, detail, category, rules_enroll_probability, batch, student_old_converted_score, student_converted_score, enroll_probability, probability_operator, create_time, major_type, major_type_child, plan_num, main_subjects, - limitation, other_score_limitation) + limitation, other_score_limitation,rules_enroll_probability_sx) VALUES ( @@ -13,7 +13,7 @@ #{item.enrollmentCode}, #{item.tuition}, #{item.detail}, #{item.category}, #{item.rulesEnrollProbability}, #{item.batch}, #{item.studentOldConvertedScore}, #{item.studentConvertedScore}, #{item.enrollProbability}, #{item.probabilityOperator}, #{item.createTime}, #{item.majorType}, #{item.majorTypeChild}, #{item.planNum}, - #{item.mainSubjects}, #{item.limitation}, #{item.otherScoreLimitation} + #{item.mainSubjects}, #{item.limitation}, #{item.otherScoreLimitation},#{item.rulesEnrollProbabilitySx} ) @@ -91,7 +91,7 @@ - AND cm.rules_enroll_probability = #{queryvo.rulesEnrollProbability} + AND cm.rules_enroll_probability_sx = #{queryvo.rulesEnrollProbability} 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 4f2bd50..7c2a632 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 @@ -30,6 +30,7 @@ sm.chinese_score_limitation, sm.cultural_score_limitation, sm.rules_enroll_probability as rulesEnrollProbability, + sm.rules_enroll_probability_sx as rulesEnrollProbabilitySx, sm.probability_operator as probabilityOperator, sm.cultural_control_line as culturalControlLine, sm.special_control_line as specialControlLine, diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BiaoyanService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BiaoyanService.java index fb5bde9..c8a9508 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BiaoyanService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BiaoyanService.java @@ -143,10 +143,22 @@ public class BiaoyanService { recommendMajorDTO.setEnrollProbability(YxConstant.bigDecimal0); continue; } - //使用主考科目成绩，将当期成绩按照专业录取分数方式折算 - recommendMajorDTO.setStudentConvertedScore(ScoreUtil.convertIntoScore(rulesEnrollProbability, activeCurrentUserScore.getCulturalScore(), professionalScore2, recommendMajorDTO.getFirstLevelDiscipline(), probabilityOperator)); - studentScore = ScoreUtil.convertIntoScore(rulesEnrollProbability, activeCurrentUserScore.getCulturalScore(), professionalScore3, recommendMajorDTO.getFirstLevelDiscipline(), probabilityOperator); - recommendMajorDTO.setStudentScore(studentScore); + if ("高职高专".equals(recommendMajorDTO.getBatch())) { + //展示分数 专业分用用 0.167 + recommendMajorDTO.setStudentScore(ScoreUtil.convertIntoScore(rulesEnrollProbability, activeCurrentUserScore.getCulturalScore(), professionalScore2, recommendMajorDTO.getFirstLevelDiscipline(), probabilityOperator)); + //内部算分 专业分用 0.25 + rulesEnrollProbability = "文*0.067+专*0.25"; + probabilityOperator = "文*0.067+专*0.25"; + //使用主考科目成绩，将当期成绩按照专业录取分数方式折算 + studentScore = ScoreUtil.convertIntoScore(rulesEnrollProbability, activeCurrentUserScore.getCulturalScore(), professionalScore3, recommendMajorDTO.getFirstLevelDiscipline(), probabilityOperator); + recommendMajorDTO.setStudentConvertedScore(studentScore); + }else{ + //使用主考科目成绩，将当期成绩按照专业录取分数方式折算 + studentScore = ScoreUtil.convertIntoScore(rulesEnrollProbability, activeCurrentUserScore.getCulturalScore(), professionalScore3, recommendMajorDTO.getFirstLevelDiscipline(), probabilityOperator); + recommendMajorDTO.setStudentConvertedScore(studentScore); + recommendMajorDTO.setStudentScore(ScoreUtil.convertIntoScore(rulesEnrollProbability, activeCurrentUserScore.getCulturalScore(), professionalScore2, recommendMajorDTO.getFirstLevelDiscipline(), probabilityOperator)); + } + if (rulesEnrollProbability.equals("文过专排主科")) { if (culturalScore.compareTo(culturalControlLine) < 0) { //小于文化分省控线 @@ -176,8 +188,13 @@ public class BiaoyanService { } enrollProbability = ScoreUtil.commonCheckEnrollProbabilityBeilv(enrollProbability); recommendMajorDTO.setEnrollProbability(enrollProbability); - recommendMajorDTO.setRulesEnrollProbability(ScoreUtil.replaceLastZeroChar(rulesEnrollProbability)); - recommendMajorDTO.setProbabilityOperator(ScoreUtil.replaceLastZeroChar(probabilityOperator)); + if("高职高专".equals(recommendMajorDTO.getBatch())){ + recommendMajorDTO.setRulesEnrollProbability("文*0.067+专*0.167"); + recommendMajorDTO.setProbabilityOperator("文*0.067+专*0.167"); + }else{ + recommendMajorDTO.setRulesEnrollProbability(ScoreUtil.replaceLastZeroChar(rulesEnrollProbability)); + recommendMajorDTO.setProbabilityOperator(ScoreUtil.replaceLastZeroChar(probabilityOperator)); + } //============================================== } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BoYinService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BoYinService.java index 5dd2078..9258f9e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BoYinService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BoYinService.java @@ -40,6 +40,7 @@ public class BoYinService { * 播音类的 分数计算方式 */ public void boYinRecommendMajorListSetEnrollProbability(List recommendMajorList, YxUserScore activeCurrentUserScore) { + int index = 0; try { //专业类别 String professionalCategory = activeCurrentUserScore.getProfessionalCategory(); @@ -72,10 +73,11 @@ public class BoYinService { by = scoreSegment.getScore(); } } - int index = 0; + if (CollectionUtils.isNotEmpty(recommendMajorList)) { //遍历专业列表 for (RecommendMajorDTO recommendMajorDTO : recommendMajorList) { + index ++; rulesEnrollProbability = recommendMajorDTO.getRulesEnrollProbability(); //取出往年的分数信息, 算出 三年平均差值 historyMajorEnrollList = recommendMajorDTO.getHistoryMajorEnrollList(); @@ -116,10 +118,23 @@ public class BoYinService { continue; } - //将当期成绩按照专业录取分数方式折算 - studentScore = ScoreUtil.convertIntoScore(rulesEnrollProbability, culturalScore, by, recommendMajorDTO.getFirstLevelDiscipline(), probabilityOperator); - recommendMajorDTO.setStudentConvertedScore(ScoreUtil.convertIntoScore(rulesEnrollProbability, culturalScore, professionalScore, recommendMajorDTO.getFirstLevelDiscipline(), probabilityOperator)); - recommendMajorDTO.setStudentScore(studentScore); + if ("高职高专".equals(recommendMajorDTO.getBatch())) { + //展示分数 专业分用 0.167 + recommendMajorDTO.setStudentScore(ScoreUtil.convertIntoScore(rulesEnrollProbability, activeCurrentUserScore.getCulturalScore(), professionalScore, recommendMajorDTO.getFirstLevelDiscipline(), probabilityOperator)); + //内部算分 专业分用 1.25 + rulesEnrollProbability = "文*0.067+专*0.125"; + probabilityOperator = "文*0.067+专*0.125"; + //使用主考科目成绩，将当期成绩按照专业录取分数方式折算 + studentScore = ScoreUtil.convertIntoScore(rulesEnrollProbability, activeCurrentUserScore.getCulturalScore(), by, recommendMajorDTO.getFirstLevelDiscipline(), probabilityOperator); + recommendMajorDTO.setStudentConvertedScore(studentScore); + }else{ + studentScore = ScoreUtil.convertIntoScore(rulesEnrollProbability, culturalScore, professionalScore, recommendMajorDTO.getFirstLevelDiscipline(), probabilityOperator); + //将当期成绩按照专业录取分数方式折算 + recommendMajorDTO.setStudentScore(ScoreUtil.convertIntoScore(rulesEnrollProbability, culturalScore, by, recommendMajorDTO.getFirstLevelDiscipline(), probabilityOperator)); + recommendMajorDTO.setStudentConvertedScore(studentScore); + } + + //判断录取方式 if (rulesEnrollProbability.equals("文过专排主科")) { if (culturalScore.compareTo(culturalControlLine) < 0) { @@ -151,12 +166,18 @@ public class BoYinService { //录取方式计算 enrollProbability = ScoreUtil.commonCheckEnrollProbabilityBeilv(enrollProbability); recommendMajorDTO.setEnrollProbability(enrollProbability); - recommendMajorDTO.setRulesEnrollProbability(ScoreUtil.replaceLastZeroChar(rulesEnrollProbability)); - recommendMajorDTO.setProbabilityOperator(ScoreUtil.replaceLastZeroChar(probabilityOperator)); + if("高职高专".equals(recommendMajorDTO.getBatch())){ + recommendMajorDTO.setRulesEnrollProbability("文*0.067+专*0.167"); + recommendMajorDTO.setProbabilityOperator("文*0.067+专*0.167"); + }else{ + recommendMajorDTO.setRulesEnrollProbability(ScoreUtil.replaceLastZeroChar(rulesEnrollProbability)); + recommendMajorDTO.setProbabilityOperator(ScoreUtil.replaceLastZeroChar(probabilityOperator)); + } //============================================== } } } catch (Exception e) { + System.out.println(index); e.printStackTrace(); } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/MusicService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/MusicService.java index cd5784e..6459cf0 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/MusicService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/MusicService.java @@ -12,6 +12,7 @@ import org.jeecg.modules.yx.entity.YxUserScore; import org.jeecg.modules.yx.service.IYxHistoryScoreControlLineService; import org.jeecg.modules.yx.service.IYxScoreSegmentService; import org.jeecg.modules.yx.util.ScoreUtil; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -100,6 +101,7 @@ public class MusicService { } } } + BigDecimal yyScoreNow = yybysy.max(yybyqy).max(yyjy); int index = 0; if (CollectionUtils.isNotEmpty(recommendMajorList)) { //遍历专业列表 @@ -186,7 +188,7 @@ public class MusicService { } } else { professionalScore2 = yyScore; - professionalScore3 = yyScore; + professionalScore3 = yyScoreNow; } //判断其他录取要求 if (!ScoreUtil.otherScoreJudge(professionalScore, activeCurrentUserScore, recommendMajorDTO)) { @@ -199,12 +201,22 @@ public class MusicService { continue; } + if ("高职高专".equals(recommendMajorDTO.getBatch())) { + //展示分数 专业分用用 0.167 + recommendMajorDTO.setStudentScore(ScoreUtil.convertIntoScore(rulesEnrollProbability, activeCurrentUserScore.getCulturalScore(), professionalScore2, recommendMajorDTO.getFirstLevelDiscipline(), probabilityOperator)); + //内部算分 专业分用 0.25 + rulesEnrollProbability = "文*0.067+专*0.25"; + probabilityOperator = "文*0.067+专*0.25"; + //使用主考科目成绩，将当期成绩按照专业录取分数方式折算 + studentScore = ScoreUtil.convertIntoScore(rulesEnrollProbability, activeCurrentUserScore.getCulturalScore(), professionalScore3, recommendMajorDTO.getFirstLevelDiscipline(), probabilityOperator); + recommendMajorDTO.setStudentConvertedScore(studentScore); + }else{ + //使用主考科目成绩，将当期成绩按照专业录取分数方式折算 + studentScore = ScoreUtil.convertIntoScore(rulesEnrollProbability, activeCurrentUserScore.getCulturalScore(), professionalScore3, recommendMajorDTO.getFirstLevelDiscipline(), probabilityOperator); + recommendMajorDTO.setStudentConvertedScore(studentScore); + recommendMajorDTO.setStudentScore(ScoreUtil.convertIntoScore(rulesEnrollProbability, activeCurrentUserScore.getCulturalScore(), professionalScore2, recommendMajorDTO.getFirstLevelDiscipline(), probabilityOperator)); + } - //使用主考科目成绩，将当期成绩按照专业录取分数方式折算 - studentScore = ScoreUtil.convertIntoScore(rulesEnrollProbability, activeCurrentUserScore.getCulturalScore(), professionalScore3, recommendMajorDTO.getFirstLevelDiscipline(), probabilityOperator); - //recommendMajorDTO.setStudentConvertedScore(ScoreUtil.convertIntoScore(rulesEnrollProbability, activeCurrentUserScore.getCulturalScore(), professionalScore2, recommendMajorDTO.getFirstLevelDiscipline(), probabilityOperator)); - recommendMajorDTO.setStudentConvertedScore(studentScore); - recommendMajorDTO.setStudentScore(professionalScore2); if ("文过专排主科".equals(rulesEnrollProbability)) { if (culturalScore.compareTo(culturalControlLine) < 0) { //小于文化分省控线 @@ -237,8 +249,13 @@ public class MusicService { //调整录取倍率 enrollProbability = ScoreUtil.commonCheckEnrollProbabilityBeilv(enrollProbability); recommendMajorDTO.setEnrollProbability(enrollProbability); - recommendMajorDTO.setRulesEnrollProbability(ScoreUtil.replaceLastZeroChar(rulesEnrollProbability)); - recommendMajorDTO.setProbabilityOperator(ScoreUtil.replaceLastZeroChar(probabilityOperator)); + if("高职高专".equals(recommendMajorDTO.getBatch())){ + recommendMajorDTO.setRulesEnrollProbability("文*0.067+专*0.167"); + recommendMajorDTO.setProbabilityOperator("文*0.067+专*0.167"); + }else{ + recommendMajorDTO.setRulesEnrollProbability(ScoreUtil.replaceLastZeroChar(rulesEnrollProbability)); + recommendMajorDTO.setProbabilityOperator(ScoreUtil.replaceLastZeroChar(probabilityOperator)); + } //============================================== } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/WuDaoService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/WuDaoService.java index 4bce80e..735456c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/WuDaoService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/WuDaoService.java @@ -130,9 +130,22 @@ public class WuDaoService { continue; } - studentScore = ScoreUtil.convertIntoScore(rulesEnrollProbability, culturalScore, professionalScore3, recommendMajorDTO.getFirstLevelDiscipline(), probabilityOperator); - recommendMajorDTO.setStudentConvertedScore(ScoreUtil.convertIntoScore(rulesEnrollProbability, culturalScore, professionalScore, recommendMajorDTO.getFirstLevelDiscipline(), probabilityOperator)); - recommendMajorDTO.setStudentScore(studentScore); + if ("高职高专".equals(recommendMajorDTO.getBatch())) { + //展示分数 专业分用用 0.167 + recommendMajorDTO.setStudentScore(ScoreUtil.convertIntoScore(rulesEnrollProbability, activeCurrentUserScore.getCulturalScore(), professionalScore, recommendMajorDTO.getFirstLevelDiscipline(), probabilityOperator)); + //内部算分 专业分用 0.25 + rulesEnrollProbability = "文*0.067+专*0.25"; + probabilityOperator = "文*0.067+专*0.25"; + //使用主考科目成绩，将当期成绩按照专业录取分数方式折算 + studentScore = ScoreUtil.convertIntoScore(rulesEnrollProbability, activeCurrentUserScore.getCulturalScore(), professionalScore3, recommendMajorDTO.getFirstLevelDiscipline(), probabilityOperator); + recommendMajorDTO.setStudentConvertedScore(studentScore); + }else{ + //使用主考科目成绩，将当期成绩按照专业录取分数方式折算 + recommendMajorDTO.setStudentScore(ScoreUtil.convertIntoScore(rulesEnrollProbability, activeCurrentUserScore.getCulturalScore(), professionalScore, recommendMajorDTO.getFirstLevelDiscipline(), probabilityOperator)); + studentScore = ScoreUtil.convertIntoScore(rulesEnrollProbability, activeCurrentUserScore.getCulturalScore(), professionalScore3, recommendMajorDTO.getFirstLevelDiscipline(), probabilityOperator); + recommendMajorDTO.setStudentConvertedScore(studentScore); + } + //判断录取方式，分数是否过省控线 if ("文过专排主科".equals(rulesEnrollProbability)) { if (culturalScore.compareTo(culturalControlLine) < 0) { @@ -167,8 +180,13 @@ public class WuDaoService { } enrollProbability = ScoreUtil.commonCheckEnrollProbabilityBeilv(enrollProbability); recommendMajorDTO.setEnrollProbability(enrollProbability); - recommendMajorDTO.setRulesEnrollProbability(ScoreUtil.replaceLastZeroChar(rulesEnrollProbability)); - recommendMajorDTO.setProbabilityOperator(ScoreUtil.replaceLastZeroChar(probabilityOperator)); + if("高职高专".equals(recommendMajorDTO.getBatch())){ + recommendMajorDTO.setRulesEnrollProbability("文*0.067+专*0.167"); + recommendMajorDTO.setProbabilityOperator("文*0.067+专*0.167"); + }else{ + recommendMajorDTO.setRulesEnrollProbability(ScoreUtil.replaceLastZeroChar(rulesEnrollProbability)); + recommendMajorDTO.setProbabilityOperator(ScoreUtil.replaceLastZeroChar(probabilityOperator)); + } //============================================== } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolMajorServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolMajorServiceImpl.java index a68786d..4e36a96 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolMajorServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolMajorServiceImpl.java @@ -99,6 +99,8 @@ public class YxSchoolMajorServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); if (StringUtils.isNotBlank(schoolCode)) { queryWrapper.eq(YxSchoolMajor::getSchoolCode, schoolCode); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVipCardServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVipCardServiceImpl.java index e05660b..02778ae 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVipCardServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVipCardServiceImpl.java @@ -14,7 +14,9 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import javax.annotation.Resource; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Calendar; import java.util.Date; import java.util.List; @@ -51,7 +53,13 @@ public class YxVipCardServiceImpl extends ServiceImpl 0 && historyThreeYearDiff.compareTo(YxConstant.bigDecimal0)<=0){ //当前年分差不为0，去年分差为0：默认去年的分差为1 enrollProbability = nowYearDiff.multiply(YxConstant.bigDecimal075).multiply(YxConstant.bigDecimal100); + }else if(nowYearDiff.compareTo(YxConstant.bigDecimal0) < 0 && historyThreeYearDiff.compareTo(YxConstant.bigDecimal0)<=0){ + enrollProbability = YxConstant.bigDecimal0; } else { //当前年分差不为0，去年分差也不为0：（当前年分差/去年分差）*0.75 enrollProbability = nowYearDiff.divide(historyThreeYearDiff, 4, RoundingMode.HALF_UP).multiply(YxConstant.bigDecimal100); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/text.txt b/jeecg-module-system/jeecg-system-biz/src/main/resources/text.txt index aba0dc0..e69de29 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/text.txt +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/text.txt @@ -1,21 +0,0 @@ -INSERT INTO `yitisheng-test`.`yx_history_major_enroll` (`id`, `school_code`, `school_name`, `institution_code`, `major_code`, `major_name`, `major_type`, `enrollment_code`, `category`, `year`, `enroll_num`, `score_line_difference`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `detail`, `rules_enroll_probability`, `control_line`, `admission_line`, `probability_operator`, `batch`, `one_volunteer_admission_num`, `admission_num`, `actual_pitcher_num`, `check_master`, `major_type_child`) VALUES ('600010001', '6001', '郑州大学河南音乐学院河南音乐学院', '6001', '130205', '舞蹈学（国标舞）', '舞蹈类', '07', '文科', '2022', 8, 0.00, 'admin', '2024-01-20 15:44:20', NULL, NULL, 'A01', NULL, '文过专排', 157.0000, 172.0000, NULL, '提前批', 0, 8, 0, '0', '国际标准舞类'); -INSERT INTO `yitisheng-test`.`yx_history_major_enroll` (`id`, `school_code`, `school_name`, `institution_code`, `major_code`, `major_name`, `major_type`, `enrollment_code`, `category`, `year`, `enroll_num`, `score_line_difference`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `detail`, `rules_enroll_probability`, `control_line`, `admission_line`, `probability_operator`, `batch`, `one_volunteer_admission_num`, `admission_num`, `actual_pitcher_num`, `check_master`, `major_type_child`) VALUES ('600010002', '6001', '郑州大学河南音乐学院河南音乐学院', '6001', '130205', '舞蹈学（国标舞）', '舞蹈类', '07', '文科', '2021', 24, 0.00, 'admin', '2024-01-20 15:44:20', NULL, NULL, 'A01', NULL, '文过专排', 155.0000, 168.0000, NULL, '提前批', 0, 24, 0, '0', '国际标准舞类'); -INSERT INTO `yitisheng-test`.`yx_history_major_enroll` (`id`, `school_code`, `school_name`, `institution_code`, `major_code`, `major_name`, `major_type`, `enrollment_code`, `category`, `year`, `enroll_num`, `score_line_difference`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `detail`, `rules_enroll_probability`, `control_line`, `admission_line`, `probability_operator`, `batch`, `one_volunteer_admission_num`, `admission_num`, `actual_pitcher_num`, `check_master`, `major_type_child`) VALUES ('600010003', '6001', '郑州大学河南音乐学院河南音乐学院', '6001', '130205', '舞蹈学（国标舞）', '舞蹈类', '07', '文科', '2020', 24, 0.00, 'admin', '2024-01-20 15:44:20', NULL, NULL, 'A01', NULL, '文过专排', 147.0000, 165.0000, NULL, '提前批', 0, 24, 0, '0', '国际标准舞类'); -INSERT INTO `yitisheng-test`.`yx_history_major_enroll` (`id`, `school_code`, `school_name`, `institution_code`, `major_code`, `major_name`, `major_type`, `enrollment_code`, `category`, `year`, `enroll_num`, `score_line_difference`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `detail`, `rules_enroll_probability`, `control_line`, `admission_line`, `probability_operator`, `batch`, `one_volunteer_admission_num`, `admission_num`, `actual_pitcher_num`, `check_master`, `major_type_child`) VALUES ('600010004', '6001', '郑州大学河南音乐学院河南音乐学院', '6001', '130205', '舞蹈学（艺术舞蹈）', '舞蹈类', '06', '文科', '2022', 8, 0.00, 'admin', '2024-01-20 16:01:23', NULL, NULL, 'A01', NULL, '文过专排', 161.0000, 184.0000, NULL, '提前批', 8, 8, 0, '0', '艺术舞蹈类'); -INSERT INTO `yitisheng-test`.`yx_history_major_enroll` (`id`, `school_code`, `school_name`, `institution_code`, `major_code`, `major_name`, `major_type`, `enrollment_code`, `category`, `year`, `enroll_num`, `score_line_difference`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `detail`, `rules_enroll_probability`, `control_line`, `admission_line`, `probability_operator`, `batch`, `one_volunteer_admission_num`, `admission_num`, `actual_pitcher_num`, `check_master`, `major_type_child`) VALUES ('600010005', '6001', '郑州大学河南音乐学院河南音乐学院', '6001', '130205', '舞蹈学（艺术舞蹈）', '舞蹈类', '06', '文科', '2021', 10, 0.00, 'admin', '2024-01-20 16:01:23', NULL, NULL, 'A01', NULL, '文过专排', 155.0000, 177.0000, NULL, '提前批', 10, 10, 0, '0', '艺术舞蹈类'); -INSERT INTO `yitisheng-test`.`yx_history_major_enroll` (`id`, `school_code`, `school_name`, `institution_code`, `major_code`, `major_name`, `major_type`, `enrollment_code`, `category`, `year`, `enroll_num`, `score_line_difference`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `detail`, `rules_enroll_probability`, `control_line`, `admission_line`, `probability_operator`, `batch`, `one_volunteer_admission_num`, `admission_num`, `actual_pitcher_num`, `check_master`, `major_type_child`) VALUES ('600010006', '6001', '郑州大学河南音乐学院河南音乐学院', '6001', '130205', '舞蹈学（艺术舞蹈）', '舞蹈类', '06', '文科', '2020', 10, 0.00, 'admin', '2024-01-20 16:01:23', NULL, NULL, 'A01', NULL, '文过专排', 157.0000, 183.0000, NULL, '提前批', 10, 10, 0, '0', '艺术舞蹈类'); -INSERT INTO `yitisheng-test`.`yx_history_major_enroll` (`id`, `school_code`, `school_name`, `institution_code`, `major_code`, `major_name`, `major_type`, `enrollment_code`, `category`, `year`, `enroll_num`, `score_line_difference`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `detail`, `rules_enroll_probability`, `control_line`, `admission_line`, `probability_operator`, `batch`, `one_volunteer_admission_num`, `admission_num`, `actual_pitcher_num`, `check_master`, `major_type_child`) VALUES ('600010007', '6001', '郑州大学河南音乐学院河南音乐学院', '6001', '130201', '音乐表演（声乐）', '音乐类', '03', '文科', '2022', 9, 0.00, 'admin', '2024-01-20 16:03:19', NULL, NULL, 'A01', NULL, '文过专排主科', 159.0000, 112.0000, NULL, '提前批', 9, 9, 0, '0', NULL); -INSERT INTO `yitisheng-test`.`yx_history_major_enroll` (`id`, `school_code`, `school_name`, `institution_code`, `major_code`, `major_name`, `major_type`, `enrollment_code`, `category`, `year`, `enroll_num`, `score_line_difference`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `detail`, `rules_enroll_probability`, `control_line`, `admission_line`, `probability_operator`, `batch`, `one_volunteer_admission_num`, `admission_num`, `actual_pitcher_num`, `check_master`, `major_type_child`) VALUES ('600010008', '6001', '郑州大学河南音乐学院河南音乐学院', '6001', '130201', '音乐表演（器乐）', '音乐类', '04', '文科', '2022', 17, 0.00, 'admin', '2024-01-20 16:03:19', NULL, NULL, 'A01', NULL, '文过专排主科', 159.0000, 114.0000, NULL, '提前批', 17, 17, 0, '0', NULL); -INSERT INTO `yitisheng-test`.`yx_history_major_enroll` (`id`, `school_code`, `school_name`, `institution_code`, `major_code`, `major_name`, `major_type`, `enrollment_code`, `category`, `year`, `enroll_num`, `score_line_difference`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `detail`, `rules_enroll_probability`, `control_line`, `admission_line`, `probability_operator`, `batch`, `one_volunteer_admission_num`, `admission_num`, `actual_pitcher_num`, `check_master`, `major_type_child`) VALUES ('600010009', '6001', '郑州大学河南音乐学院河南音乐学院', '6001', '130202', '音乐学', '音乐类', '05', '文科', '2022', 32, 0.00, 'admin', '2024-01-20 16:03:19', NULL, NULL, 'A01', NULL, '文0.0670专0.2500', 63.0660, 75.0000, '文*0.0670+专*0.2500', '提前批', 32, 32, 0, '0', NULL); -INSERT INTO `yitisheng-test`.`yx_history_major_enroll` (`id`, `school_code`, `school_name`, `institution_code`, `major_code`, `major_name`, `major_type`, `enrollment_code`, `category`, `year`, `enroll_num`, `score_line_difference`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `detail`, `rules_enroll_probability`, `control_line`, `admission_line`, `probability_operator`, `batch`, `one_volunteer_admission_num`, `admission_num`, `actual_pitcher_num`, `check_master`, `major_type_child`) VALUES ('600010010', '6001', '郑州大学河南音乐学院河南音乐学院', '6001', '130201', '音乐表演（声乐）', '音乐类', '03', '文科', '2021', 9, 0.00, 'admin', '2024-01-20 16:03:19', NULL, NULL, 'A01', NULL, '文过专排主科', 145.0000, 104.0000, NULL, '提前批', 6, 9, 0, '0', NULL); -INSERT INTO `yitisheng-test`.`yx_history_major_enroll` (`id`, `school_code`, `school_name`, `institution_code`, `major_code`, `major_name`, `major_type`, `enrollment_code`, `category`, `year`, `enroll_num`, `score_line_difference`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `detail`, `rules_enroll_probability`, `control_line`, `admission_line`, `probability_operator`, `batch`, `one_volunteer_admission_num`, `admission_num`, `actual_pitcher_num`, `check_master`, `major_type_child`) VALUES ('600010011', '6001', '郑州大学河南音乐学院河南音乐学院', '6001', '130201', '音乐表演（器乐）', '音乐类', '04', '文科', '2021', 17, 0.00, 'admin', '2024-01-20 16:03:19', NULL, NULL, 'A01', NULL, '文过专排主科', 145.0000, 114.0000, NULL, '提前批', 17, 17, 0, '0', NULL); -INSERT INTO `yitisheng-test`.`yx_history_major_enroll` (`id`, `school_code`, `school_name`, `institution_code`, `major_code`, `major_name`, `major_type`, `enrollment_code`, `category`, `year`, `enroll_num`, `score_line_difference`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `detail`, `rules_enroll_probability`, `control_line`, `admission_line`, `probability_operator`, `batch`, `one_volunteer_admission_num`, `admission_num`, `actual_pitcher_num`, `check_master`, `major_type_child`) VALUES ('600010012', '6001', '郑州大学河南音乐学院河南音乐学院', '6001', '130202', '音乐学', '音乐类', '05', '文科', '2021', 28, 0.00, 'admin', '2024-01-20 16:03:19', NULL, NULL, 'A01', NULL, '文0.0670专0.2500', 59.7000, 78.1000, '文*0.0670+专*0.2500', '提前批', 28, 28, 0, '0', NULL); -INSERT INTO `yitisheng-test`.`yx_history_major_enroll` (`id`, `school_code`, `school_name`, `institution_code`, `major_code`, `major_name`, `major_type`, `enrollment_code`, `category`, `year`, `enroll_num`, `score_line_difference`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `detail`, `rules_enroll_probability`, `control_line`, `admission_line`, `probability_operator`, `batch`, `one_volunteer_admission_num`, `admission_num`, `actual_pitcher_num`, `check_master`, `major_type_child`) VALUES ('600010013', '6001', '郑州大学河南音乐学院河南音乐学院', '6001', '130201', '音乐表演（器乐）', '音乐类', '03', '文科', '2020', 17, 0.00, 'admin', '2024-01-20 16:03:19', NULL, NULL, 'A01', NULL, '文过专排主科', 140.0000, 113.0000, NULL, '提前批', 17, 17, 0, '0', NULL); -INSERT INTO `yitisheng-test`.`yx_history_major_enroll` (`id`, `school_code`, `school_name`, `institution_code`, `major_code`, `major_name`, `major_type`, `enrollment_code`, `category`, `year`, `enroll_num`, `score_line_difference`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `detail`, `rules_enroll_probability`, `control_line`, `admission_line`, `probability_operator`, `batch`, `one_volunteer_admission_num`, `admission_num`, `actual_pitcher_num`, `check_master`, `major_type_child`) VALUES ('600010014', '6001', '郑州大学河南音乐学院河南音乐学院', '6001', '130201', '音乐表演（声乐）', '音乐类', '04', '文科', '2020', 9, 0.00, 'admin', '2024-01-20 16:03:19', NULL, NULL, 'A01', NULL, '文过专排主科', 140.0000, 112.0000, NULL, '提前批', 9, 9, 0, '0', NULL); -INSERT INTO `yitisheng-test`.`yx_history_major_enroll` (`id`, `school_code`, `school_name`, `institution_code`, `major_code`, `major_name`, `major_type`, `enrollment_code`, `category`, `year`, `enroll_num`, `score_line_difference`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `detail`, `rules_enroll_probability`, `control_line`, `admission_line`, `probability_operator`, `batch`, `one_volunteer_admission_num`, `admission_num`, `actual_pitcher_num`, `check_master`, `major_type_child`) VALUES ('600010015', '6001', '郑州大学河南音乐学院河南音乐学院', '6001', '130202', '音乐学', '音乐类', '05', '文科', '2020', 27, 0.00, 'admin', '2024-01-20 16:03:19', NULL, NULL, 'A01', NULL, '文0.0670专0.2500', 57.5790, 76.5000, '文*0.0670+专*0.2500', '提前批', 27, 27, 0, '0', NULL); -INSERT INTO `yitisheng-test`.`yx_history_major_enroll` (`id`, `school_code`, `school_name`, `institution_code`, `major_code`, `major_name`, `major_type`, `enrollment_code`, `category`, `year`, `enroll_num`, `score_line_difference`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `detail`, `rules_enroll_probability`, `control_line`, `admission_line`, `probability_operator`, `batch`, `one_volunteer_admission_num`, `admission_num`, `actual_pitcher_num`, `check_master`, `major_type_child`) VALUES ('600010016', '6001', '郑州大学河南音乐学院河南音乐学院', '6001', '130201', '音乐表演（声乐）', '音乐类', '01', '理科', '2022', 2, 0.00, 'admin', '2024-01-20 16:03:19', NULL, NULL, 'A01', NULL, '文过专排', 159.0000, 112.0000, NULL, '提前批', 2, 2, 0, '0', NULL); -INSERT INTO `yitisheng-test`.`yx_history_major_enroll` (`id`, `school_code`, `school_name`, `institution_code`, `major_code`, `major_name`, `major_type`, `enrollment_code`, `category`, `year`, `enroll_num`, `score_line_difference`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `detail`, `rules_enroll_probability`, `control_line`, `admission_line`, `probability_operator`, `batch`, `one_volunteer_admission_num`, `admission_num`, `actual_pitcher_num`, `check_master`, `major_type_child`) VALUES ('600010017', '6001', '郑州大学河南音乐学院河南音乐学院', '6001', '130201', '音乐表演（器乐）', '音乐类', '02', '理科', '2022', 2, 0.00, 'admin', '2024-01-20 16:03:19', NULL, NULL, 'A01', NULL, '文过专排', 159.0000, 114.0000, NULL, '提前批', 2, 2, 0, '0', NULL); -INSERT INTO `yitisheng-test`.`yx_history_major_enroll` (`id`, `school_code`, `school_name`, `institution_code`, `major_code`, `major_name`, `major_type`, `enrollment_code`, `category`, `year`, `enroll_num`, `score_line_difference`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `detail`, `rules_enroll_probability`, `control_line`, `admission_line`, `probability_operator`, `batch`, `one_volunteer_admission_num`, `admission_num`, `actual_pitcher_num`, `check_master`, `major_type_child`) VALUES ('600010018', '6001', '郑州大学河南音乐学院河南音乐学院', '6001', '130201', '音乐表演（声乐）', '音乐类', '01', '理科', '2021', 2, 0.00, 'admin', '2024-01-20 16:03:19', NULL, NULL, 'A01', NULL, '文过专排', 145.0000, 109.0000, NULL, '提前批', 2, 2, 0, '0', NULL); -INSERT INTO `yitisheng-test`.`yx_history_major_enroll` (`id`, `school_code`, `school_name`, `institution_code`, `major_code`, `major_name`, `major_type`, `enrollment_code`, `category`, `year`, `enroll_num`, `score_line_difference`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `detail`, `rules_enroll_probability`, `control_line`, `admission_line`, `probability_operator`, `batch`, `one_volunteer_admission_num`, `admission_num`, `actual_pitcher_num`, `check_master`, `major_type_child`) VALUES ('600010019', '6001', '郑州大学河南音乐学院河南音乐学院', '6001', '130201', '音乐表演（器乐）', '音乐类', '02', '理科', '2021', 2, 0.00, 'admin', '2024-01-20 16:03:19', NULL, NULL, 'A01', NULL, '文过专排', 145.0000, 114.0000, NULL, '提前批', 2, 2, 0, '0', NULL); -INSERT INTO `yitisheng-test`.`yx_history_major_enroll` (`id`, `school_code`, `school_name`, `institution_code`, `major_code`, `major_name`, `major_type`, `enrollment_code`, `category`, `year`, `enroll_num`, `score_line_difference`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `detail`, `rules_enroll_probability`, `control_line`, `admission_line`, `probability_operator`, `batch`, `one_volunteer_admission_num`, `admission_num`, `actual_pitcher_num`, `check_master`, `major_type_child`) VALUES ('600010020', '6001', '郑州大学河南音乐学院河南音乐学院', '6001', '130201', '音乐表演（声乐）', '音乐类', '01', '理科', '2020', 2, 0.00, 'admin', '2024-01-20 16:03:19', NULL, NULL, 'A01', NULL, '文过专排', 140.0000, 106.0000, NULL, '提前批', 2, 2, 0, '0', NULL); -INSERT INTO `yitisheng-test`.`yx_history_major_enroll` (`id`, `school_code`, `school_name`, `institution_code`, `major_code`, `major_name`, `major_type`, `enrollment_code`, `category`, `year`, `enroll_num`, `score_line_difference`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `detail`, `rules_enroll_probability`, `control_line`, `admission_line`, `probability_operator`, `batch`, `one_volunteer_admission_num`, `admission_num`, `actual_pitcher_num`, `check_master`, `major_type_child`) VALUES ('600010021', '6001', '郑州大学河南音乐学院河南音乐学院', '6001', '130201', '音乐表演（器乐）', '音乐类', '02', '理科', '2020', 2, 0.00, 'admin', '2024-01-20 16:03:19', NULL, NULL, 'A01', NULL, '文过专排', 140.0000, 114.0000, NULL, '提前批', 2, 2, 0, '0', NULL);