diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 7022564f09255848f49cdd08cd36932c90bb0e43..1fa38436344fef60950f035262079481a3ecde74 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -7,7 +7,7 @@ spring: # 主库数据源 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 # password: 123456 # 正式数据源 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 845f015e03ac4355153ac7cdd9cc546627b6007c..37847e06949aa997b61e9c2befc398da54d8c493 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 @@ -1043,34 +1043,34 @@ public class MallSchoolAcceptServiceImpl implements IMallSchoolAcceptService { //addSchoolAcceptRecord( schoolAcceptRecordList,mallSchoolAccept,cultureLowest,majorLowest); // 生成新招生计划 - MallAcceptPlan mallAcceptPlan = new MallAcceptPlan(); - mallAcceptPlan.setSchoolId(school.getSchoolId()); - mallAcceptPlan.setBatchId(mallBatch.getBatchId()); - mallAcceptPlan.setLinkId(linkId); - mallAcceptPlan.setPlanYear(acceptYear); - mallAcceptPlan.setSubjectType(subjectType.equals("0") ? 0 : 1); - mallAcceptPlan.setAcceptNum(acceptNum); - mallAcceptPlan.setSchoolPrice(schoolPrice); - mallAcceptPlan.setAcceptRuleId(acceptRuleId); - mallAcceptPlan.setLittleScoreLimit(littleScoreLimit); - mallAcceptPlan.setCreateAt(DateUtils.getTime()); - mallAcceptPlan.setDelFlag("0"); - mallAcceptPlanMapper.insertMallAcceptPlan(mallAcceptPlan); - - // 生成记录 - MallSchoolAcceptRecord record = new MallSchoolAcceptRecord(); - record.setSchoolId(school.getSchoolId()); - record.setBatchId(mallBatch.getBatchId()); - record.setAcceptNum(acceptNum); - record.setAcceptYear(acceptYear); - record.setLowestScore(acceptLowest); - record.setCultureLowest(cultureLowest); - record.setMajorLowest(majorLowest); - record.setAcceptRuleId(acceptRuleId); - record.setSubjectType(subjectType); - record.setCreateAt(DateUtils.getTime()); - record.setDelFlag("0"); - mallSchoolAcceptRecordMapper.insertMallSchoolAcceptRecord(record); +// MallAcceptPlan mallAcceptPlan = new MallAcceptPlan(); +// mallAcceptPlan.setSchoolId(school.getSchoolId()); +// mallAcceptPlan.setBatchId(mallBatch.getBatchId()); +// mallAcceptPlan.setLinkId(linkId); +// mallAcceptPlan.setPlanYear(acceptYear); +// mallAcceptPlan.setSubjectType(subjectType.equals("0") ? 0 : 1); +// mallAcceptPlan.setAcceptNum(acceptNum); +// mallAcceptPlan.setSchoolPrice(schoolPrice); +// mallAcceptPlan.setAcceptRuleId(acceptRuleId); +// mallAcceptPlan.setLittleScoreLimit(littleScoreLimit); +// mallAcceptPlan.setCreateAt(DateUtils.getTime()); +// mallAcceptPlan.setDelFlag("0"); +// mallAcceptPlanMapper.insertMallAcceptPlan(mallAcceptPlan); +// +// // 生成记录 +// MallSchoolAcceptRecord record = new MallSchoolAcceptRecord(); +// record.setSchoolId(school.getSchoolId()); +// record.setBatchId(mallBatch.getBatchId()); +// record.setAcceptNum(acceptNum); +// record.setAcceptYear(acceptYear); +// record.setLowestScore(acceptLowest); +// record.setCultureLowest(cultureLowest); +// record.setMajorLowest(majorLowest); +// record.setAcceptRuleId(acceptRuleId); +// record.setSubjectType(subjectType); +// record.setCreateAt(DateUtils.getTime()); +// record.setDelFlag("0"); +// mallSchoolAcceptRecordMapper.insertMallSchoolAcceptRecord(record); a++; }else{ b++; @@ -1086,32 +1086,32 @@ public class MallSchoolAcceptServiceImpl implements IMallSchoolAcceptService { mallSchoolAcceptMapper.updateMallSchoolAccept(schoolAccept); // 修改招生计划 - 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); - plan.setLittleScoreLimit(littleScoreLimit); - plan.setUpdateAt(DateUtils.getTime()); - plan.setDelFlag("0"); - mallAcceptPlanMapper.updateMallAcceptPlan(plan); - } - - // 生成记录 - MallSchoolAcceptRecord record = new MallSchoolAcceptRecord(); - record.setSchoolId(school.getSchoolId()); - record.setBatchId(mallBatch.getBatchId()); - record.setAcceptNum(acceptNum); - record.setAcceptYear(acceptYear); - record.setLowestScore(acceptLowest); - record.setCultureLowest(cultureLowest); - record.setMajorLowest(majorLowest); - record.setAcceptRuleId(acceptRuleId); - record.setSubjectType(subjectType); - record.setCreateAt(DateUtils.getTime()); - record.setDelFlag("0"); - mallSchoolAcceptRecordMapper.insertMallSchoolAcceptRecord(record); +// 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); +// plan.setLittleScoreLimit(littleScoreLimit); +// plan.setUpdateAt(DateUtils.getTime()); +// plan.setDelFlag("0"); +// mallAcceptPlanMapper.updateMallAcceptPlan(plan); +// } +// +// // 生成记录 +// MallSchoolAcceptRecord record = new MallSchoolAcceptRecord(); +// record.setSchoolId(school.getSchoolId()); +// record.setBatchId(mallBatch.getBatchId()); +// record.setAcceptNum(acceptNum); +// record.setAcceptYear(acceptYear); +// record.setLowestScore(acceptLowest); +// record.setCultureLowest(cultureLowest); +// record.setMajorLowest(majorLowest); +// record.setAcceptRuleId(acceptRuleId); +// record.setSubjectType(subjectType); +// record.setCreateAt(DateUtils.getTime()); +// record.setDelFlag("0"); +// mallSchoolAcceptRecordMapper.insertMallSchoolAcceptRecord(record); } successNum++; diff --git a/ruoyi-system/src/main/java/com/ruoyi/mall/service/impl/MemberReportIntelligenceServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/mall/service/impl/MemberReportIntelligenceServiceImpl.java index 5a803c04d7d19e4590a3495ca8b5b5487f21a161..1b049a1c42a7beb03598e907ae9a2bc32e5bfd93 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/mall/service/impl/MemberReportIntelligenceServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/mall/service/impl/MemberReportIntelligenceServiceImpl.java @@ -456,7 +456,7 @@ public class MemberReportIntelligenceServiceImpl implements IMemberReportIntelli int d = kbd.size(); //Collections.shuffle(jwt); - int remain = 35-finalCollect.size(); + int remain = 64-finalCollect.size(); if(remain >= d){ finalCollect.addAll(kbd); diff --git a/ruoyi-system/src/main/resources/mapper/mall/ReportIntelligenceMapper.xml b/ruoyi-system/src/main/resources/mapper/mall/ReportIntelligenceMapper.xml index 036756ec7288218e336f69c03cde1ebbaaacc0ba..341fae29a097c1d686adfad02790f4be59c5d829 100644 --- a/ruoyi-system/src/main/resources/mapper/mall/ReportIntelligenceMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/mall/ReportIntelligenceMapper.xml @@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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_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 and tri.item_id = #{itemId}