Skip to content

志
志愿填报
Commit d99c69e6 authored by 刘帅's avatar 刘帅
Browse files
Options

1.问题修复

parent a27fa5cb
Show whitespace changes
Inline Side-by-side
Showing with 57 additions and 57 deletions
ruoyi-admin/src/main/resources/application-druid.yml
View file @ d99c69e6
...@@ -7,7 +7,7 @@ spring: ...@@ -7,7 +7,7 @@ spring:
# 主库数据源 # 主库数据源
master: master:
# 本地数据源 # 本地数据源
# url: jdbc:mysql://localhost:3306/yikaozhiyuan_20250605?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true # url: jdbc:mysql://localhost:3306/yikaozhiyuan_20250603?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
# username: root # username: root
# password: 123456 # password: 123456
# 正式数据源 # 正式数据源
......
ruoyi-system/src/main/java/com/ruoyi/mall/service/impl/MallSchoolAcceptServiceImpl.java
View file @ d99c69e6
...@@ -1043,34 +1043,34 @@ public class MallSchoolAcceptServiceImpl implements IMallSchoolAcceptService { ...@@ -1043,34 +1043,34 @@ public class MallSchoolAcceptServiceImpl implements IMallSchoolAcceptService {
//addSchoolAcceptRecord( schoolAcceptRecordList,mallSchoolAccept,cultureLowest,majorLowest); //addSchoolAcceptRecord( schoolAcceptRecordList,mallSchoolAccept,cultureLowest,majorLowest);
// 生成新招生计划 // 生成新招生计划
MallAcceptPlan mallAcceptPlan = new MallAcceptPlan(); // MallAcceptPlan mallAcceptPlan = new MallAcceptPlan();
mallAcceptPlan.setSchoolId(school.getSchoolId()); // mallAcceptPlan.setSchoolId(school.getSchoolId());
mallAcceptPlan.setBatchId(mallBatch.getBatchId()); // mallAcceptPlan.setBatchId(mallBatch.getBatchId());
mallAcceptPlan.setLinkId(linkId); // mallAcceptPlan.setLinkId(linkId);
mallAcceptPlan.setPlanYear(acceptYear); // mallAcceptPlan.setPlanYear(acceptYear);
mallAcceptPlan.setSubjectType(subjectType.equals("0") ? 0 : 1); // mallAcceptPlan.setSubjectType(subjectType.equals("0") ? 0 : 1);
mallAcceptPlan.setAcceptNum(acceptNum); // mallAcceptPlan.setAcceptNum(acceptNum);
mallAcceptPlan.setSchoolPrice(schoolPrice); // mallAcceptPlan.setSchoolPrice(schoolPrice);
mallAcceptPlan.setAcceptRuleId(acceptRuleId); // mallAcceptPlan.setAcceptRuleId(acceptRuleId);
mallAcceptPlan.setLittleScoreLimit(littleScoreLimit); // mallAcceptPlan.setLittleScoreLimit(littleScoreLimit);
mallAcceptPlan.setCreateAt(DateUtils.getTime()); // mallAcceptPlan.setCreateAt(DateUtils.getTime());
mallAcceptPlan.setDelFlag("0"); // mallAcceptPlan.setDelFlag("0");
mallAcceptPlanMapper.insertMallAcceptPlan(mallAcceptPlan); // mallAcceptPlanMapper.insertMallAcceptPlan(mallAcceptPlan);
//
// 生成记录 // // 生成记录
MallSchoolAcceptRecord record = new MallSchoolAcceptRecord(); // MallSchoolAcceptRecord record = new MallSchoolAcceptRecord();
record.setSchoolId(school.getSchoolId()); // record.setSchoolId(school.getSchoolId());
record.setBatchId(mallBatch.getBatchId()); // record.setBatchId(mallBatch.getBatchId());
record.setAcceptNum(acceptNum); // record.setAcceptNum(acceptNum);
record.setAcceptYear(acceptYear); // record.setAcceptYear(acceptYear);
record.setLowestScore(acceptLowest); // record.setLowestScore(acceptLowest);
record.setCultureLowest(cultureLowest); // record.setCultureLowest(cultureLowest);
record.setMajorLowest(majorLowest); // record.setMajorLowest(majorLowest);
record.setAcceptRuleId(acceptRuleId); // record.setAcceptRuleId(acceptRuleId);
record.setSubjectType(subjectType); // record.setSubjectType(subjectType);
record.setCreateAt(DateUtils.getTime()); // record.setCreateAt(DateUtils.getTime());
record.setDelFlag("0"); // record.setDelFlag("0");
mallSchoolAcceptRecordMapper.insertMallSchoolAcceptRecord(record); // mallSchoolAcceptRecordMapper.insertMallSchoolAcceptRecord(record);
a++; a++;
}else{ }else{
b++; b++;
...@@ -1086,32 +1086,32 @@ public class MallSchoolAcceptServiceImpl implements IMallSchoolAcceptService { ...@@ -1086,32 +1086,32 @@ public class MallSchoolAcceptServiceImpl implements IMallSchoolAcceptService {
mallSchoolAcceptMapper.updateMallSchoolAccept(schoolAccept); mallSchoolAcceptMapper.updateMallSchoolAccept(schoolAccept);
// 修改招生计划 // 修改招生计划
List<MallAcceptPlan> mallAcceptPlanList = mallAcceptPlanMapper.selectPlan(school.getSchoolId(), mallBatch.getBatchId(), acceptYear, Integer.valueOf(subjectType), linkId); // List<MallAcceptPlan> mallAcceptPlanList = mallAcceptPlanMapper.selectPlan(school.getSchoolId(), mallBatch.getBatchId(), acceptYear, Integer.valueOf(subjectType), linkId);
if (!mallAcceptPlanList.isEmpty()){ // if (!mallAcceptPlanList.isEmpty()){
MallAcceptPlan plan = mallAcceptPlanList.get(0); // MallAcceptPlan plan = mallAcceptPlanList.get(0);
plan.setAcceptNum(acceptNum); // plan.setAcceptNum(acceptNum);
plan.setSchoolPrice(schoolPrice); // plan.setSchoolPrice(schoolPrice);
plan.setAcceptRuleId(acceptRuleId); // plan.setAcceptRuleId(acceptRuleId);
plan.setLittleScoreLimit(littleScoreLimit); // plan.setLittleScoreLimit(littleScoreLimit);
plan.setUpdateAt(DateUtils.getTime()); // plan.setUpdateAt(DateUtils.getTime());
plan.setDelFlag("0"); // plan.setDelFlag("0");
mallAcceptPlanMapper.updateMallAcceptPlan(plan); // mallAcceptPlanMapper.updateMallAcceptPlan(plan);
} // }
//
// 生成记录 // // 生成记录
MallSchoolAcceptRecord record = new MallSchoolAcceptRecord(); // MallSchoolAcceptRecord record = new MallSchoolAcceptRecord();
record.setSchoolId(school.getSchoolId()); // record.setSchoolId(school.getSchoolId());
record.setBatchId(mallBatch.getBatchId()); // record.setBatchId(mallBatch.getBatchId());
record.setAcceptNum(acceptNum); // record.setAcceptNum(acceptNum);
record.setAcceptYear(acceptYear); // record.setAcceptYear(acceptYear);
record.setLowestScore(acceptLowest); // record.setLowestScore(acceptLowest);
record.setCultureLowest(cultureLowest); // record.setCultureLowest(cultureLowest);
record.setMajorLowest(majorLowest); // record.setMajorLowest(majorLowest);
record.setAcceptRuleId(acceptRuleId); // record.setAcceptRuleId(acceptRuleId);
record.setSubjectType(subjectType); // record.setSubjectType(subjectType);
record.setCreateAt(DateUtils.getTime()); // record.setCreateAt(DateUtils.getTime());
record.setDelFlag("0"); // record.setDelFlag("0");
mallSchoolAcceptRecordMapper.insertMallSchoolAcceptRecord(record); // mallSchoolAcceptRecordMapper.insertMallSchoolAcceptRecord(record);
} }
successNum++; successNum++;
......
ruoyi-system/src/main/java/com/ruoyi/mall/service/impl/MemberReportIntelligenceServiceImpl.java
View file @ d99c69e6
...@@ -456,7 +456,7 @@ public class MemberReportIntelligenceServiceImpl implements IMemberReportIntelli ...@@ -456,7 +456,7 @@ public class MemberReportIntelligenceServiceImpl implements IMemberReportIntelli
int d = kbd.size(); int d = kbd.size();
//Collections.shuffle(jwt); //Collections.shuffle(jwt);
int remain = 35-finalCollect.size(); int remain = 64-finalCollect.size();
if(remain >= d){ if(remain >= d){
finalCollect.addAll(kbd); finalCollect.addAll(kbd);
......
ruoyi-system/src/main/resources/mapper/mall/ReportIntelligenceMapper.xml
View file @ d99c69e6
...@@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from tb_report_intelligence tri from tb_report_intelligence tri
LEFT JOIN mall_school ms on ms.school_id = tri.school_id and ms.del_flag = '0' LEFT JOIN mall_school ms on ms.school_id = tri.school_id and ms.del_flag = '0'
LEFT JOIN mall_link_major_school mlms on mlms.link_id = tri.major_id and mlms.school_id = tri.school_id and mlms.del_flag = '0' LEFT JOIN mall_link_major_school mlms on mlms.link_id = tri.major_id and mlms.school_id = tri.school_id and mlms.del_flag = '0'
LEFT JOIN mall_school_accept msa on msa.link_id = mlms.link_id and msa.is_reference = 1 LEFT JOIN mall_school_accept msa on msa.link_id = mlms.link_id AND msa.school_id = mlms.school_id and msa.is_reference = 1
left join mall_member_user mmu on mmu.id = tri.user_id left join mall_member_user mmu on mmu.id = tri.user_id
<where> <where>
<if test="itemId != null "> and tri.item_id = #{itemId}</if> <if test="itemId != null "> and tri.item_id = #{itemId}</if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment