From 36025a6bc97ed35b7e90e5a5966cd82e7914ea9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=B8=85?= Date: Fri, 20 Jun 2025 11:06:36 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/api/ApiMemberController.java | 4 +- .../domain/Vo/SchoolMajorAcceptRecordVO.java | 114 ++++++++++-------- .../mapper/mall/MallSchoolAcceptMapper.xml | 4 +- .../mall/MallSchoolAcceptRecordMapper.xml | 1 - .../src/views/mall/mallMemberUser/index.vue | 3 +- 5 files changed, 73 insertions(+), 53 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ApiMemberController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ApiMemberController.java index addd85d..f934ad8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ApiMemberController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ApiMemberController.java @@ -506,8 +506,8 @@ public class ApiMemberController { if (params.containsKey("userId") && StringUtils.isNotBlank(params.get("userId").toString())) { long userId = Long.parseLong(params.get("userId").toString()); MallMemberUser mallMemberUser = memberUserService.selectMallMemberUserById(userId); - if (mallMemberUser != null && mallMemberUser.getIndexUserId() != 0 && mallMemberUser.getIndexUserId() != null) { - MallMemberUser topUser = memberUserService.selectMallMemberUserById(mallMemberUser.getIndexUserId()); + if (mallMemberUser != null && (mallMemberUser.getIntroUser() != null && mallMemberUser.getIntroUser() != 0) || (mallMemberUser.getIndexUserId() != null && mallMemberUser.getIndexUserId() > 0)) { + MallMemberUser topUser = memberUserService.selectMallMemberUserById(mallMemberUser.getIntroUser() != null ? mallMemberUser.getIntroUser() : mallMemberUser.getIndexUserId()); if (topUser != null && topUser.getIndexPrice().compareTo(new BigDecimal(0)) > 0) { userPrice = String.valueOf(topUser.getIndexPrice()); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/mall/domain/Vo/SchoolMajorAcceptRecordVO.java b/ruoyi-system/src/main/java/com/ruoyi/mall/domain/Vo/SchoolMajorAcceptRecordVO.java index c5e0c82..abeed3d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/mall/domain/Vo/SchoolMajorAcceptRecordVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/mall/domain/Vo/SchoolMajorAcceptRecordVO.java @@ -13,6 +13,9 @@ public class SchoolMajorAcceptRecordVO implements Serializable { /** 专业录取数据id */ private Long schoolAcceptId; + /** 专业代码 */ + private String majorCode; + /** 专业名称 */ private String majorName; @@ -49,54 +52,6 @@ public class SchoolMajorAcceptRecordVO implements Serializable { /** 录取率 */ private String acceptRate; - public String getAcceptRate() { - return acceptRate; - } - - public void setAcceptRate(String acceptRate) { - this.acceptRate = acceptRate; - } - - public Long getLinkId() { - return linkId; - } - - public void setLinkId(Long linkId) { - this.linkId = linkId; - } - - public Long getSchoolId() { - return schoolId; - } - - public void setSchoolId(Long schoolId) { - this.schoolId = schoolId; - } - - public BigDecimal getReference() { - return reference; - } - - public void setReference(BigDecimal reference) { - this.reference = reference; - } - - public Integer getIsReference() { - return isReference; - } - - public void setIsReference(Integer isReference) { - this.isReference = isReference; - } - - public String getMajorGroup() { - return majorGroup; - } - - public void setMajorGroup(String majorGroup) { - this.majorGroup = majorGroup; - } - public Long getSchoolAcceptId() { return schoolAcceptId; } @@ -105,6 +60,14 @@ public class SchoolMajorAcceptRecordVO implements Serializable { this.schoolAcceptId = schoolAcceptId; } + public String getMajorCode() { + return majorCode; + } + + public void setMajorCode(String majorCode) { + this.majorCode = majorCode; + } + public String getMajorName() { return majorName; } @@ -153,16 +116,71 @@ public class SchoolMajorAcceptRecordVO implements Serializable { this.acceptRuleStr = acceptRuleStr; } + public String getMajorGroup() { + return majorGroup; + } + + public void setMajorGroup(String majorGroup) { + this.majorGroup = majorGroup; + } + + public BigDecimal getReference() { + return reference; + } + + public void setReference(BigDecimal reference) { + this.reference = reference; + } + + public Integer getIsReference() { + return isReference; + } + + public void setIsReference(Integer isReference) { + this.isReference = isReference; + } + + public Long getSchoolId() { + return schoolId; + } + + public void setSchoolId(Long schoolId) { + this.schoolId = schoolId; + } + + public Long getLinkId() { + return linkId; + } + + public void setLinkId(Long linkId) { + this.linkId = linkId; + } + + public String getAcceptRate() { + return acceptRate; + } + + public void setAcceptRate(String acceptRate) { + this.acceptRate = acceptRate; + } + @Override public String toString() { return "SchoolMajorAcceptRecordVO{" + "schoolAcceptId=" + schoolAcceptId + + ", majorCode='" + majorCode + '\'' + ", majorName='" + majorName + '\'' + ", acceptNum=" + acceptNum + ", acceptLowest=" + acceptLowest + ", acceptYear='" + acceptYear + '\'' + ", acceptRuleId=" + acceptRuleId + ", acceptRuleStr='" + acceptRuleStr + '\'' + + ", majorGroup='" + majorGroup + '\'' + + ", reference=" + reference + + ", isReference=" + isReference + + ", schoolId=" + schoolId + + ", linkId=" + linkId + + ", acceptRate='" + acceptRate + '\'' + '}'; } } diff --git a/ruoyi-system/src/main/resources/mapper/mall/MallSchoolAcceptMapper.xml b/ruoyi-system/src/main/resources/mapper/mall/MallSchoolAcceptMapper.xml index 8e212ea..3984989 100644 --- a/ruoyi-system/src/main/resources/mapper/mall/MallSchoolAcceptMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/mall/MallSchoolAcceptMapper.xml @@ -43,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ms.school_name schoolName, mar.rule_str ruleStr, mb.batch_name batchName, + ml.major_code majorCode, ml.major_name majorName, msa.subject_type subjectType, msa.reference reference, @@ -265,8 +266,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where del_flag = '0' and is_reference = 1 - select msa.school_accept_id schoolAcceptId, + mlms.major_code majorCode, mlms.major_name majorName, msa.accept_num acceptNum, msa.accept_lowest acceptLowest, diff --git a/ruoyi-system/src/main/resources/mapper/mall/MallSchoolAcceptRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/mall/MallSchoolAcceptRecordMapper.xml index c7e1274..7b80930 100644 --- a/ruoyi-system/src/main/resources/mapper/mall/MallSchoolAcceptRecordMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/mall/MallSchoolAcceptRecordMapper.xml @@ -284,7 +284,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and del_flag = '0' and subject_type = #{subjectType} and accept_lowest is not null - and accept_year not in ('2024') order by accept_year desc, accept_lowest asc limit 1000) temp group by temp.acceptYear order by temp.acceptYear desc diff --git a/ruoyi-ui/src/views/mall/mallMemberUser/index.vue b/ruoyi-ui/src/views/mall/mallMemberUser/index.vue index d8cc245..cfd8806 100644 --- a/ruoyi-ui/src/views/mall/mallMemberUser/index.vue +++ b/ruoyi-ui/src/views/mall/mallMemberUser/index.vue @@ -364,7 +364,7 @@ - +
确 定
@@ -424,6 +424,7 @@ export default { title: "", // 是否显示弹出层 open: false, + memberUserId: undefined, // 查询参数 queryParams: { pageNum: 1, -- 2.22.0