diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 63e317275127da17d14e4da2a7009a71de3ba0b4..7022564f09255848f49cdd08cd36932c90bb0e43 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -7,9 +7,9 @@ spring: # 主库数据源 master: # 本地数据源 -# url: jdbc:mysql://rm-hp3340490n5mw72tcto.mysql.huhehaote.rds.aliyuncs.com:3306/yikaozhiyuan_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true -# username: yikaozhiyuan -# password: KxappNYy7dQUzuterEncvBt@Pf +# url: jdbc:mysql://localhost:3306/yikaozhiyuan_20250605?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true +# username: root +# password: 123456 # 正式数据源 url: jdbc:mysql://bj-cynosdbmysql-grp-oppabofo.sql.tencentcdb.com:29687/yikaozhiyuan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true username: root diff --git a/ruoyi-system/src/main/java/com/ruoyi/mall/mapper/MallAcceptPlanMapper.java b/ruoyi-system/src/main/java/com/ruoyi/mall/mapper/MallAcceptPlanMapper.java index d217964a0fdbbf6f7e88bd9d0ee4ffa9194d93b9..83eb2c2ca1a3831eb0675b7aebd5fe905d5678fa 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/mall/mapper/MallAcceptPlanMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/mall/mapper/MallAcceptPlanMapper.java @@ -48,7 +48,7 @@ public interface MallAcceptPlanMapper public String selectMaxYear(); - public MallAcceptPlan selectPlan(@Param("schoolId")Long schoolId, + public List selectPlan(@Param("schoolId")Long schoolId, @Param("batchId")Long batchId, @Param("planYear")String planYear, @Param("subjectType")Integer subjectType, diff --git a/ruoyi-system/src/main/java/com/ruoyi/mall/mapper/MallAcceptRuleMapper.java b/ruoyi-system/src/main/java/com/ruoyi/mall/mapper/MallAcceptRuleMapper.java index ebf0b32d235c31e237bc9023d02ad9520e8d4bbb..a7ae27660cfa07eceb64d7d2a3554ef9c927a747 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/mall/mapper/MallAcceptRuleMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/mall/mapper/MallAcceptRuleMapper.java @@ -30,6 +30,13 @@ public interface MallAcceptRuleMapper */ public MallAcceptRule selectMallAcceptRuleByAcceptRuleStr(@Param("ruleStr")String ruleStr); + /** + * 录取字符串查询 + * @param ruleStr 字符串 + * @return + */ + public List selectMallAcceptRuleByAcceptRuleStr2(@Param("ruleStr")String ruleStr); + /** * 录取原则 * @return diff --git a/ruoyi-system/src/main/java/com/ruoyi/mall/mapper/MallSchoolAcceptMapper.java b/ruoyi-system/src/main/java/com/ruoyi/mall/mapper/MallSchoolAcceptMapper.java index 639a4d11c8b9b878d5b6eb05da531f849d2254b7..f48f6d71cb795ce009c7bfcc1666c490e3c105ee 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/mall/mapper/MallSchoolAcceptMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/mall/mapper/MallSchoolAcceptMapper.java @@ -32,7 +32,7 @@ public interface MallSchoolAcceptMapper * @return */ - public MallSchoolAccept selectBySchoolIdAndLinkId(@Param("schoolId")Long schoolId, + public List selectBySchoolIdAndLinkId(@Param("schoolId")Long schoolId, @Param("batchId")Long batchId, @Param("linkId")Long linkId, @Param("acceptYear")String acceptYear, diff --git a/ruoyi-system/src/main/java/com/ruoyi/mall/service/impl/MallSchoolAcceptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/mall/service/impl/MallSchoolAcceptServiceImpl.java index 6270bb626646f61eac01e99843af3b5df739042e..845f015e03ac4355153ac7cdd9cc546627b6007c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/mall/service/impl/MallSchoolAcceptServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/mall/service/impl/MallSchoolAcceptServiceImpl.java @@ -840,55 +840,54 @@ public class MallSchoolAcceptServiceImpl implements IMallSchoolAcceptService { String ruleStr = replaceOther(newAcceptBO.getRuleStr()); // 录取原则 BigDecimal reference = newAcceptBO.getReference(); // 参考分 - String acceptYear = "2024"; // 年份 + String acceptYear = newAcceptBO.getAcceptYear(); // 年份 String subjectType = newAcceptBO.getSubjectType().contains("文") ? "0" : "1"; // 学科 if (StringUtils.isBlank(batchName)){ //return "第" + index + "行缺少批次名称"; - sb.append("第" + index + "行缺少批次名称;"); - errorDataBO.setMsg("第" + index + "行缺少批次名称"); + sb.append("第【" +index + "】行学校【"+schoolName+"】缺少批次名称;").append(System.lineSeparator()); + errorDataBO.setMsg("第" +index + "行学校【"+schoolName+"】行缺少批次名称"); errorList.add(errorDataBO); continue; } if (StringUtils.isBlank(schoolName)){ //return "第" + index + "行缺少学校名称数据"; - sb.append("第" + index + "行缺少学校名称数据;"); - errorDataBO.setMsg("第" + index + "行缺少学校名称数据"); + sb.append("第【" +index + "】行学校【"+schoolName+"】缺少学校名称数据;").append(System.lineSeparator()); + errorDataBO.setMsg("第" +index + "行学校【"+schoolName+"】行缺少学校名称数据"); errorList.add(errorDataBO); continue; } if (StringUtils.isBlank(majorNameStr)){ //return "第" + index + "行缺少专业名称"; - sb.append("第" + index + "行缺少专业名称"); - errorDataBO.setMsg("第" + index + "行缺少专业名称"); + sb.append("第【" +index + "】行学校【"+schoolName+"】缺少专业名称").append(System.lineSeparator()); + errorDataBO.setMsg("第" +index + "行学校【"+schoolName+"】行缺少专业名称"); errorList.add(errorDataBO); continue; } if (StringUtils.isBlank(ruleStr)){ //return "第" + index + "行缺少录取原则"; - sb.append("第" + index + "行缺少录取原则;"); - errorDataBO.setMsg("第" + index + "行缺少录取原则"); - errorList.add(errorDataBO); - continue; - } - if (ObjectUtils.isEmpty(reference)){ - //return "第" + index + "行缺少参考分"; - sb.append("第" + index + "行缺少参考分;"); - errorDataBO.setMsg("第" + index + "行缺少参考分"); + sb.append("第【" +index + "】行学校【"+schoolName+"】缺少录取原则;").append(System.lineSeparator()); + errorDataBO.setMsg("第" +index + "行学校【"+schoolName+"】行缺少录取原则"); errorList.add(errorDataBO); continue; } +// if (ObjectUtils.isEmpty(reference)){ +// sb.append("第【" +index + "】行学校【"+schoolName+"】缺少参考分;").append(System.lineSeparator()); +// errorDataBO.setMsg("第" +index + "行学校【"+schoolName+"】行缺少参考分"); +// errorList.add(errorDataBO); +// continue; +// } if (StringUtils.isBlank(acceptYear)){ - sb.append("第" + index + "行缺少年份;"); - errorDataBO.setMsg("第" + index + "行缺少年份;"); + sb.append("第【" +index + "】行学校【"+schoolName+"】缺少年份;").append(System.lineSeparator()); + errorDataBO.setMsg("第" +index + "行学校【"+schoolName+"】行缺少年份;"); errorList.add(errorDataBO); continue; } if (StringUtils.isBlank(subjectType)){ - sb.append("第" + index + "行缺少学科分类;") ; - errorDataBO.setMsg("第" + index + "行缺少学科分类;"); + sb.append("第【" +index + "】行学校【"+schoolName+"】缺少学科分类;").append(System.lineSeparator()); + errorDataBO.setMsg("第" +index + "行学校【"+schoolName+"】行缺少学科分类;"); errorList.add(errorDataBO); continue; } @@ -906,10 +905,10 @@ public class MallSchoolAcceptServiceImpl implements IMallSchoolAcceptService { //return "第" + index + "行批次不存在,请先添加批次或批次名称不正确"; } // 查询学校 - List collect = schoolList.stream().filter(item -> item.getSchoolName().equals(replaceOther(newAcceptBO.getSchoolName()))).collect(Collectors.toList()); + List collect = schoolList.stream().filter(item -> replaceOther(item.getSchoolName()).equals(schoolName)).collect(Collectors.toList()); if (ObjectUtils.isEmpty(collect)){ - sb.append("第" + index + "学校不存在或学校名称错误:"+ schoolName + ";"); - errorDataBO.setMsg("第" + index + "学校不存在或学校名称错误:"); + sb.append("第【" +index + "】行学校【"+schoolName+"】不存在或学校名称错误").append(System.lineSeparator()); + errorDataBO.setMsg("第" +index + "行学校【"+schoolName+"】不存在或学校名称错误:"); errorList.add(errorDataBO); continue; //return "第" + index + "学校不存在或学校名称错误:"+ schoolName; @@ -928,8 +927,8 @@ public class MallSchoolAcceptServiceImpl implements IMallSchoolAcceptService { BigDecimal cultureLowest = BigDecimal.ZERO ; // 文化分数线 if (ObjectUtils.isEmpty(newAcceptBO.getCultureLowest())){ - sb.append("第" +index + "行缺少文化分数线;"); - errorDataBO.setMsg("第" +index + "缺少文化分数线"); + sb.append("第【" +index + "】行学校【"+schoolName+"】缺少文化分数线;").append(System.lineSeparator()); + errorDataBO.setMsg("第" +index + "行学校【"+schoolName+"】缺少文化分数线"); errorList.add(errorDataBO); continue; //return "缺少文化分数线" + index; @@ -940,8 +939,8 @@ public class MallSchoolAcceptServiceImpl implements IMallSchoolAcceptService { BigDecimal majorLowest = new BigDecimal("0") ; // 专业分数线 if (ObjectUtils.isEmpty(newAcceptBO.getMajorLowest())){ //majorLowest = new BigDecimal("216"); - sb.append("第" +index + "行缺少联考分数线;"); - errorDataBO.setMsg("第" +index + "缺少联考分数线"); + sb.append("第【" +index + "】行学校【"+schoolName+"】缺少联考分数线;").append(System.lineSeparator()); + errorDataBO.setMsg("第" +index + "行学校【"+schoolName+"】缺少联考分数线"); errorList.add(errorDataBO); continue; //return "缺少文化分数线" + index; @@ -981,8 +980,8 @@ public class MallSchoolAcceptServiceImpl implements IMallSchoolAcceptService { // twoIds.append(collect2.get(0).getMajorId()).append(","); //} if (ObjectUtils.isEmpty(linkMajorSchool)){ - sb.append("第" + index + "专业未录入;"); - errorDataBO.setMsg("第" +index + "专业未录入或名称错误"); + sb.append("第【" +index + "】行学校【"+schoolName+"】【"+majorNameStr+"】专业未录入;").append(System.lineSeparator()); + errorDataBO.setMsg("第" +index + "行学校【"+schoolName+"】专业未录入或名称错误"); errorList.add(errorDataBO); continue; //return "专业未录入" + index + "-" + schoolName + "-" + majorNameStr; @@ -1009,20 +1008,20 @@ public class MallSchoolAcceptServiceImpl implements IMallSchoolAcceptService { } // 查询录取原则 - MallAcceptRule acceptRule = mallAcceptRuleMapper.selectMallAcceptRuleByAcceptRuleStr(ruleStr); + List acceptRule = mallAcceptRuleMapper.selectMallAcceptRuleByAcceptRuleStr2(ruleStr); Long acceptRuleId = 0L; - if (ObjectUtils.isEmpty(acceptRule)){ - sb.append("第" + index + "录取原则不存在或录入错误;"); - errorDataBO.setMsg("第" +index + "录取原则不存在或录入错误"); + if (acceptRule.isEmpty()){ + sb.append("第【" +index + "】行学校【"+schoolName+"】录取原则【"+ruleStr+"】不存在或录入错误;").append(System.lineSeparator()); + errorDataBO.setMsg("第" +index + "行学校【"+schoolName+"】录取原则不存在或录入错误"); errorList.add(errorDataBO); continue; }else{ - acceptRuleId = acceptRule.getAcceptRuleId(); + acceptRuleId = acceptRule.get(0).getAcceptRuleId(); } // 查询是否已导入数据 - MallSchoolAccept schoolAccept = mallSchoolAcceptMapper.selectBySchoolIdAndLinkId(school.getSchoolId(), mallBatch.getBatchId(), linkId, acceptYear, subjectType); - if (ObjectUtils.isEmpty(schoolAccept)){ + List schoolAcceptList = mallSchoolAcceptMapper.selectBySchoolIdAndLinkId(school.getSchoolId(), mallBatch.getBatchId(), linkId, acceptYear, subjectType); + if (schoolAcceptList.isEmpty()){ // 生成新专业录取数据 MallSchoolAccept mallSchoolAccept = new MallSchoolAccept(); mallSchoolAccept.setSchoolId(school.getSchoolId()); @@ -1076,6 +1075,7 @@ public class MallSchoolAcceptServiceImpl implements IMallSchoolAcceptService { }else{ b++; // 修改数据 + MallSchoolAccept schoolAccept = schoolAcceptList.get(0); // 生成新专业录取数据 schoolAccept.setAcceptNum(acceptNum); schoolAccept.setAcceptLowest(acceptLowest); @@ -1086,9 +1086,9 @@ public class MallSchoolAcceptServiceImpl implements IMallSchoolAcceptService { mallSchoolAcceptMapper.updateMallSchoolAccept(schoolAccept); // 修改招生计划 - MallAcceptPlan plan = mallAcceptPlanMapper.selectPlan(school.getSchoolId(), mallBatch.getBatchId(), acceptYear, Integer.valueOf(subjectType), linkId); - if (ObjectUtils.isNotEmpty(plan)){ - + List mallAcceptPlanList = mallAcceptPlanMapper.selectPlan(school.getSchoolId(), mallBatch.getBatchId(), acceptYear, Integer.valueOf(subjectType), linkId); + if (!mallAcceptPlanList.isEmpty()){ + MallAcceptPlan plan = mallAcceptPlanList.get(0); plan.setAcceptNum(acceptNum); plan.setSchoolPrice(schoolPrice); plan.setAcceptRuleId(acceptRuleId); @@ -1279,8 +1279,8 @@ public class MallSchoolAcceptServiceImpl implements IMallSchoolAcceptService { MallAcceptRule acceptRule = mallAcceptRuleMapper.selectRuleStr(ruleStr); // 查询是否已导入数据 - MallSchoolAccept schoolAccept = mallSchoolAcceptMapper.selectBySchoolIdAndLinkId(schoolId, 4L, linkId, acceptYear, subjectType); - if (ObjectUtils.isEmpty(schoolAccept)){ + List schoolAcceptList = mallSchoolAcceptMapper.selectBySchoolIdAndLinkId(schoolId, 4L, linkId, acceptYear, subjectType); + if (schoolAcceptList.isEmpty()){ // 生成新专业录取数据 MallSchoolAccept mallSchoolAccept = new MallSchoolAccept(); mallSchoolAccept.setSchoolId(schoolId); diff --git a/ruoyi-system/src/main/resources/mapper/mall/MallAcceptPlanMapper.xml b/ruoyi-system/src/main/resources/mapper/mall/MallAcceptPlanMapper.xml index 776b43e9afa598a73ed548b348a73942dd5ddb53..202cafc650dd4d2c3c5dcdb5734d0a6dcae1fc88 100644 --- a/ruoyi-system/src/main/resources/mapper/mall/MallAcceptPlanMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/mall/MallAcceptPlanMapper.xml @@ -149,7 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select accept_plan_id acceptPlanId, school_id schoolId, batch_id batchId, @@ -169,6 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and plan_year = #{planYear} and subject_type = #{subjectType} and link_id = #{linkId} and del_flag = '0' + order by create_at desc + + - select msa.school_accept_id schoolAcceptId, msa.school_id schoolId, msa.major_id majorId, @@ -120,6 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and link_id = #{linkId} and accept_year = #{acceptYear} and subject_type = #{subjectType} + order by create_at desc diff --git a/ruoyi-ui/src/views/mall/mallSchoolAccept/index.vue b/ruoyi-ui/src/views/mall/mallSchoolAccept/index.vue index 103d6b55301135d95806a1a8fb879ef42df68580..0e71b430e0ec7c7e6c3a2a71c4008ad6eb2bb36a 100644 --- a/ruoyi-ui/src/views/mall/mallSchoolAccept/index.vue +++ b/ruoyi-ui/src/views/mall/mallSchoolAccept/index.vue @@ -139,7 +139,7 @@ - + - + - +