志愿,视频，测评 基础服务代码移植不报错初步提交

ie-common/src/main/java/com/ruoyi/common/constant/Constants.java

@@ -170,4 +170,24 @@ public class Constants
      */
     public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml",
             "org.springframework", "org.apache", "com.ruoyi.common.utils.file", "com.ruoyi.common.config", "com.ruoyi.generator" };
+
+
+
+
+    //智隆叁加叁的oss与vod TODO 后续删除
+    public static final String ZLSJS_PREFIX = "zlsjs,";
+
+    //前端VIP卡长度
+    public static final Integer FRONT_CARD_LENGTH = 8;
+    //前端测试卡长度
+    public static final Integer FRONT_TEST_CARD_LENGTH = 6;
+    //前端卡密码长度
+    public static final Integer FRONT_CARD_PASSWORD_LENGTH = 6;
+
+    //电子卡短信类型
+    public static final Integer ECARD_SMSTYPE = 4;//对应dict_data中的dict_value=4
+
+    public static String EXPERIENCE_CARD_INVALID_VOLUNTARY = "体验卡%s在[ %s 至 %s ]不能使用模拟志愿填报功能，请联系客服购买VIP卡";
+    public static String SENIOR_THIRD_CARD_INVALID_VOLUNTARY = "非高三卡%s在[ %s 至 %s ]不能使用模拟志愿填报功能，请联系客服";
+
 }

ie-common/src/main/java/com/ruoyi/common/utils/CommonUtils.java

@@ -0,0 +1,20 @@
+package com.ruoyi.common.utils;
+
+import java.text.Collator;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+
+public class CommonUtils {
+
+    /**
+     * 使用中国汉字首字母排序，A-Z的顺序
+     * @param data
+     * @return
+     */
+    public static List<String> sortByChina(List<String> data){
+        Collator collator = Collator.getInstance(Locale.CHINA);
+        Collections.sort(data, collator);
+        return data;
+    }
+}

ie-common/src/main/java/com/ruoyi/common/utils/NumberUtils.java

@@ -0,0 +1,39 @@
+package com.ruoyi.common.utils;
+
+import java.util.Random;
+
+public class NumberUtils {
+
+    public static String getRandom(int len) {
+        int rs = (int) ((Math.random() * 9 + 1) * Math.pow(10, len - 1));
+        return String.valueOf(rs);
+    }
+
+    public static String getRandom1(int len) {
+        Random r = new Random();
+        StringBuilder rs = new StringBuilder();
+        for (int i = 0; i < len; i++) {
+            rs.append(r.nextInt(10));
+        }
+        return rs.toString();
+    }
+
+    public static boolean isNumeric(String str){
+        if(StringUtils.isNotEmpty(str)){
+            str = str.trim();
+        }
+        for(int i=str.length();--i>=0;){
+            int chr=str.charAt(i);
+            if(chr<48 || chr>57){
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public static void main(String[] args) {
+        System.out.println(getRandom1(8));
+        System.out.println(getRandom(8));
+    }
+
+}

ie-common/src/main/java/com/ruoyi/common/utils/StringUtils.java

@@ -1,11 +1,9 @@
 package com.ruoyi.common.utils;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import com.ruoyi.common.core.text.Convert;
 import org.springframework.util.AntPathMatcher;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.text.StrFormatter;
@@ -719,4 +717,94 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
         }
         return sb.toString();
     }
+
+
+
+    /**
+     * 取到字符串的数字，遇到非数字即终止 如，12341dfds3214-->12341
+     * @param str
+     * @return
+     */
+    public static String getNumeric(String str) {
+        str=str.trim();
+        String result=EMPTY;
+        if(str != null && !"".equals(str)){
+            for(int i=0;i<str.length();i++){
+                if(str.charAt(i)>=48 && str.charAt(i)<=57){
+                    result +=str.charAt(i);
+                }else {
+                    break;
+                }
+            }
+        }
+        return result;
+    }
+
+
+    /**
+     * 获取组合数据
+     * @param data
+     */
+    public static List<String> getAssemble(String data){
+        String[] datas = Convert.toStrArray(data);
+        List<String> list001 = Arrays.asList(datas);
+
+        List<String> resultList = new ArrayList<>();
+        if(datas.length==2){
+            resultList = list001.stream().flatMap(str -> list001.stream().map((str+",")::concat)).filter(str-> new HashSet<String>(Arrays.asList(str.split(","))).size()==datas.length).collect(Collectors.toList());
+        }else if(datas.length==3){
+            resultList = list001.stream().flatMap(str -> list001.stream().map((str+",")::concat))
+                    .flatMap(str -> list001.stream().map((str+",")::concat)).filter(str-> new HashSet<String>(Arrays.asList(str.split(","))).size()==datas.length).collect(Collectors.toList());
+        }
+
+        return resultList;
+    }
+
+    /**
+     * 历史,化学,生物转换为"生物,化学,历史"等六种组合结构
+     * @param course1
+     * @return
+     */
+    public static String reverseCourse(String course1){
+        String[] bb = Convert.toStrArray(course1);
+        Collections.reverse(Arrays.asList(bb));
+        return StringUtils.join(bb,",");
+    }
+
+    public static String getVoluntaryGroup(String collegeCode){
+        String group= StringUtils.EMPTY;
+        //湖南7位 湖北6位，截取后三位
+        //TODO 以后可能会有其他省份的学校，需要修改为一个字段专门存储组别
+        if(!StringUtils.isEmpty(collegeCode)&&collegeCode.length()>5){
+            int length = 3 ;
+            if (collegeCode.length()==7){
+                length = 3 ;//湖南
+                group = collegeCode.substring(collegeCode.length()-length);
+                group = "第"+ (NumberUtils.isNumeric(group) ? Integer.parseInt(group) : group) +"组" ;
+            }
+            if (collegeCode.length()==6){
+                length = 2 ;//湖北
+                group = collegeCode.substring(collegeCode.length()-length);
+                group = "第"+group+"组" ;
+            }
+        }
+
+        return group;
+    }
+
+    public static Boolean isNumber(String searchTerm) {
+        if (org.apache.commons.lang3.StringUtils.isBlank(searchTerm)) {
+            return false;
+        }
+        try {
+            Long.valueOf(searchTerm);
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+    public static void main(String[] args) {
+        System.out.println(reverseCourse("物理,化学,生物"));
+    }
+
 }

ie-system/pom.xml

@@ -22,6 +22,10 @@
             <groupId>com.ie</groupId>
             <artifactId>ie-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.aliyun</groupId>
             <artifactId>aliyun-java-sdk-core</artifactId>

ie-system/src/main/java/com/ruoyi/ie/domain/AEnrollScore.java

@@ -0,0 +1,442 @@
+package com.ruoyi.ie.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 院校考生考核成绩部分对象 a_enroll_score
+ * 
+ * @author voluntary
+ * @date 2023-11-26
+ */
+public class AEnrollScore extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 年度 */
+    @Excel(name = "年度")
+    private Integer year;
+
+    /** 院校id */
+    @Excel(name = "院校id")
+    private Long universityId;
+
+    /** 院校名称 */
+    @Excel(name = "院校名称")
+    private String universityName;
+
+    /** 录取公式 */
+    @Excel(name = "录取公式")
+    private String enrollFormula;
+
+    /** 显示公式 */
+    @Excel(name = "显示公式")
+    private String equalFormula;
+
+    /** 专业组 */
+    @Excel(name = "专业组")
+    private String majorGroups;
+
+    /** 专业类别 */
+    @Excel(name = "专业类别")
+    private String majorNames;
+
+    /** 专业方向 */
+    @Excel(name = "专业方向")
+    private String majorDirections;
+
+    /** 考生类别 */
+    @Excel(name = "考生类别")
+    private String examineeTypes;
+
+    /** 考核项类别 */
+    @Excel(name = "考核项类别")
+    private String itemCategory;
+
+    /** 考核项名称 */
+    @Excel(name = "考核项名称")
+    private String itemName;
+
+    /** 考核项分组提分 */
+    @Excel(name = "考核项分组提分")
+    private String itemGroup;
+
+    /** 考核项类型 */
+    @Excel(name = "考核项类型")
+    private String itemType;
+
+    /** 考核字段名 */
+    @Excel(name = "考核字段名")
+    private String itemField;
+
+    /** 值类型:Score,Boolean */
+    @Excel(name = "值类型:Score,Boolean")
+    private String valueType;
+
+    /** 值规则 */
+    @Excel(name = "值规则")
+    private String valueRule;
+
+    /** 矫正类型:0不支持,1固定分2固定比例 */
+    @Excel(name = "矫正类型:0不支持,1固定分2固定比例")
+    private Integer correctType;
+
+    /** 矫正参考值 */
+    @Excel(name = "矫正参考值")
+    private String correctValue;
+
+    /** 符合性条件 */
+    @Excel(name = "符合性条件")
+    private String valuePassRule;
+
+    /** 备选值 */
+    @Excel(name = "备选值")
+    private String valueOptional;
+
+    /** 总分 */
+    @Excel(name = "总分")
+    private Integer scoreTotal;
+
+    /** 描述未用 */
+    @Excel(name = "描述未用")
+    private String description;
+
+    /** 备注说明 */
+    @Excel(name = "备注说明")
+    private String comment;
+
+    /** 校验公式 */
+    @Excel(name = "校验公式")
+    private String regex;
+
+    /** 占位提示 */
+    @Excel(name = "占位提示")
+    private String placeholder;
+
+    /** 默认值 */
+    @Excel(name = "默认值")
+    private String defaultValue;
+
+    /** 提示 */
+    @Excel(name = "提示")
+    private String tips;
+
+    /** 键盘模式 */
+    @Excel(name = "键盘模式")
+    private String keyboardMode;
+
+    /** 是否有点 */
+    @Excel(name = "是否有点")
+    private Integer dotDisable;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setYear(Integer year) 
+    {
+        this.year = year;
+    }
+
+    public Integer getYear() 
+    {
+        return year;
+    }
+    public void setUniversityId(Long universityId) 
+    {
+        this.universityId = universityId;
+    }
+
+    public Long getUniversityId() 
+    {
+        return universityId;
+    }
+    public void setUniversityName(String universityName) 
+    {
+        this.universityName = universityName;
+    }
+
+    public String getUniversityName() 
+    {
+        return universityName;
+    }
+
+    public String getEqualFormula() {
+        return equalFormula;
+    }
+
+    public void setEqualFormula(String equalFormula) {
+        this.equalFormula = equalFormula;
+    }
+
+    public void setEnrollFormula(String enrollFormula)
+    {
+        this.enrollFormula = enrollFormula;
+    }
+
+    public String getEnrollFormula() 
+    {
+        return enrollFormula;
+    }
+    public void setMajorGroups(String majorGroups)
+    {
+        this.majorGroups = majorGroups;
+    }
+
+    public String getMajorGroups() 
+    {
+        return majorGroups;
+    }
+    public void setMajorNames(String majorNames) 
+    {
+        this.majorNames = majorNames;
+    }
+
+    public String getMajorNames() 
+    {
+        return majorNames;
+    }
+    public void setMajorDirections(String majorDirections) 
+    {
+        this.majorDirections = majorDirections;
+    }
+
+    public String getMajorDirections() 
+    {
+        return majorDirections;
+    }
+    public void setExamineeTypes(String examineeTypes) 
+    {
+        this.examineeTypes = examineeTypes;
+    }
+
+    public String getExamineeTypes() 
+    {
+        return examineeTypes;
+    }
+    public void setItemCategory(String itemCategory)
+    {
+        this.itemCategory = itemCategory;
+    }
+
+    public String getItemCategory() 
+    {
+        return itemCategory;
+    }
+    public void setItemName(String itemName) 
+    {
+        this.itemName = itemName;
+    }
+
+    public String getItemName() 
+    {
+        return itemName;
+    }
+    public void setItemGroup(String itemGroup) 
+    {
+        this.itemGroup = itemGroup;
+    }
+
+    public String getItemGroup() 
+    {
+        return itemGroup;
+    }
+    public void setItemType(String itemType) 
+    {
+        this.itemType = itemType;
+    }
+
+    public String getItemType() 
+    {
+        return itemType;
+    }
+    public void setItemField(String itemField) 
+    {
+        this.itemField = itemField;
+    }
+
+    public String getItemField() 
+    {
+        return itemField;
+    }
+    public void setValueType(String valueType) 
+    {
+        this.valueType = valueType;
+    }
+
+    public String getValueType() 
+    {
+        return valueType;
+    }
+    public void setValueRule(String valueRule) 
+    {
+        this.valueRule = valueRule;
+    }
+
+    public String getValueRule() 
+    {
+        return valueRule;
+    }
+    public void setCorrectType(Integer correctType)
+    {
+        this.correctType = correctType;
+    }
+
+    public Integer getCorrectType()
+    {
+        return correctType;
+    }
+    public void setCorrectValue(String correctValue) 
+    {
+        this.correctValue = correctValue;
+    }
+
+    public String getCorrectValue() 
+    {
+        return correctValue;
+    }
+    public void setValuePassRule(String valuePassRule) 
+    {
+        this.valuePassRule = valuePassRule;
+    }
+
+    public String getValuePassRule() 
+    {
+        return valuePassRule;
+    }
+    public void setValueOptional(String valueOptional) 
+    {
+        this.valueOptional = valueOptional;
+    }
+
+    public String getValueOptional() 
+    {
+        return valueOptional;
+    }
+    public void setScoreTotal(Integer scoreTotal)
+    {
+        this.scoreTotal = scoreTotal;
+    }
+
+    public Integer getScoreTotal()
+    {
+        return scoreTotal;
+    }
+    public void setDescription(String description)
+    {
+        this.description = description;
+    }
+
+    public String getDescription() 
+    {
+        return description;
+    }
+    public void setComment(String comment) 
+    {
+        this.comment = comment;
+    }
+
+    public String getComment() 
+    {
+        return comment;
+    }
+    public void setRegex(String regex) 
+    {
+        this.regex = regex;
+    }
+
+    public String getRegex() 
+    {
+        return regex;
+    }
+    public void setPlaceholder(String placeholder) 
+    {
+        this.placeholder = placeholder;
+    }
+
+    public String getPlaceholder() 
+    {
+        return placeholder;
+    }
+    public void setDefaultValue(String defaultValue) 
+    {
+        this.defaultValue = defaultValue;
+    }
+
+    public String getDefaultValue() 
+    {
+        return defaultValue;
+    }
+    public void setTips(String tips) 
+    {
+        this.tips = tips;
+    }
+
+    public String getTips() 
+    {
+        return tips;
+    }
+    public void setKeyboardMode(String keyboardMode) 
+    {
+        this.keyboardMode = keyboardMode;
+    }
+
+    public String getKeyboardMode() 
+    {
+        return keyboardMode;
+    }
+    public void setDotDisable(Integer dotDisable)
+    {
+        this.dotDisable = dotDisable;
+    }
+
+    public Integer getDotDisable()
+    {
+        return dotDisable;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("year", getYear())
+            .append("universityId", getUniversityId())
+            .append("universityName", getUniversityName())
+            .append("enrollFormula", getEnrollFormula())
+            .append("majorGroups", getMajorGroups())
+            .append("majorNames", getMajorNames())
+            .append("majorDirections", getMajorDirections())
+            .append("examineeTypes", getExamineeTypes())
+            .append("itemCategory", getItemCategory())
+            .append("itemName", getItemName())
+            .append("itemGroup", getItemGroup())
+            .append("itemType", getItemType())
+            .append("itemField", getItemField())
+            .append("valueType", getValueType())
+            .append("valueRule", getValueRule())
+            .append("correctType", getCorrectType())
+            .append("correctValue", getCorrectValue())
+            .append("valuePassRule", getValuePassRule())
+            .append("valueOptional", getValueOptional())
+            .append("scoreTotal", getScoreTotal())
+            .append("description", getDescription())
+            .append("comment", getComment())
+            .append("regex", getRegex())
+            .append("placeholder", getPlaceholder())
+            .append("defaultValue", getDefaultValue())
+            .append("tips", getTips())
+            .append("keyboardMode", getKeyboardMode())
+            .append("dotDisable", getDotDisable())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/ie/domain/AEnrollSkill.java

@@ -0,0 +1,261 @@
+package com.ruoyi.ie.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 院校考生技能考核办法对象 a_enroll_skill
+ * 
+ * @author voluntary
+ * @date 2023-11-26
+ */
+public class AEnrollSkill extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 年度 */
+    @Excel(name = "年度")
+    private Integer year;
+
+    /** 院校id */
+    @Excel(name = "院校id")
+    private Long universityId;
+
+    /** 院校名称 */
+    @Excel(name = "院校名称")
+    private String universityName;
+
+    /** 专业组 */
+    @Excel(name = "专业组")
+    private String majorGroup;
+
+    /** 专业类别 */
+    @Excel(name = "专业类别")
+    private String majorName;
+
+    /** 专业方向 */
+    @Excel(name = "专业方向")
+    private String majorDirection;
+
+    /** 总分 */
+    @Excel(name = "总分")
+    private Double scoreTotal;
+
+    /** 分组 */
+    @Excel(name = "分组")
+    private String itemGroup;
+
+    /** 考生类别 */
+    @Excel(name = "考生类别")
+    private String examineeType;
+
+    /** 考核项目类 */
+    @Excel(name = "考核项目类")
+    private String itemType;
+
+    /** 考核项目 */
+    @Excel(name = "考核项目")
+    private String itemName;
+
+    /** 值类型:Score,Boolean */
+    @Excel(name = "值类型:Score,Boolean")
+    private String valueType;
+
+    /** 值内容 */
+    @Excel(name = "值内容")
+    private String value;
+
+    /** 矫正类型:0不支持,1固定分2固定比例 */
+    @Excel(name = "矫正类型:0不支持,1固定分2固定比例")
+    private Integer correctType;
+
+    /** 矫正参考值 */
+    @Excel(name = "矫正参考值")
+    private String correctValue;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String comment;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setYear(Integer year) 
+    {
+        this.year = year;
+    }
+
+    public Integer getYear() 
+    {
+        return year;
+    }
+    public void setUniversityId(Long universityId) 
+    {
+        this.universityId = universityId;
+    }
+
+    public Long getUniversityId() 
+    {
+        return universityId;
+    }
+    public void setUniversityName(String universityName) 
+    {
+        this.universityName = universityName;
+    }
+
+    public String getUniversityName() 
+    {
+        return universityName;
+    }
+    public void setMajorGroup(String majorGroup) 
+    {
+        this.majorGroup = majorGroup;
+    }
+
+    public String getMajorGroup() 
+    {
+        return majorGroup;
+    }
+    public void setMajorName(String majorName) 
+    {
+        this.majorName = majorName;
+    }
+
+    public String getMajorName() 
+    {
+        return majorName;
+    }
+    public void setMajorDirection(String majorDirection) 
+    {
+        this.majorDirection = majorDirection;
+    }
+
+    public String getMajorDirection() 
+    {
+        return majorDirection;
+    }
+    public void setScoreTotal(Double scoreTotal) 
+    {
+        this.scoreTotal = scoreTotal;
+    }
+
+    public Double getScoreTotal() 
+    {
+        return scoreTotal;
+    }
+    public void setItemGroup(String itemGroup) 
+    {
+        this.itemGroup = itemGroup;
+    }
+
+    public String getItemGroup() 
+    {
+        return itemGroup;
+    }
+    public void setExamineeType(String examineeType) 
+    {
+        this.examineeType = examineeType;
+    }
+
+    public String getExamineeType() 
+    {
+        return examineeType;
+    }
+    public void setItemType(String itemType) 
+    {
+        this.itemType = itemType;
+    }
+
+    public String getItemType() 
+    {
+        return itemType;
+    }
+    public void setItemName(String itemName) 
+    {
+        this.itemName = itemName;
+    }
+
+    public String getItemName() 
+    {
+        return itemName;
+    }
+    public void setValueType(String valueType) 
+    {
+        this.valueType = valueType;
+    }
+
+    public String getValueType() 
+    {
+        return valueType;
+    }
+    public void setValue(String value) 
+    {
+        this.value = value;
+    }
+
+    public String getValue() 
+    {
+        return value;
+    }
+    public void setCorrectType(Integer correctType) 
+    {
+        this.correctType = correctType;
+    }
+
+    public Integer getCorrectType() 
+    {
+        return correctType;
+    }
+    public void setCorrectValue(String correctValue) 
+    {
+        this.correctValue = correctValue;
+    }
+
+    public String getCorrectValue() 
+    {
+        return correctValue;
+    }
+    public void setComment(String comment) 
+    {
+        this.comment = comment;
+    }
+
+    public String getComment() 
+    {
+        return comment;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("year", getYear())
+            .append("universityId", getUniversityId())
+            .append("universityName", getUniversityName())
+            .append("majorGroup", getMajorGroup())
+            .append("majorName", getMajorName())
+            .append("majorDirection", getMajorDirection())
+            .append("scoreTotal", getScoreTotal())
+            .append("itemGroup", getItemGroup())
+            .append("examineeType", getExamineeType())
+            .append("itemType", getItemType())
+            .append("itemName", getItemName())
+            .append("valueType", getValueType())
+            .append("value", getValue())
+            .append("correctType", getCorrectType())
+            .append("correctValue", getCorrectValue())
+            .append("comment", getComment())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/ie/domain/AEnrollSpecial.java

@@ -0,0 +1,426 @@
+package com.ruoyi.ie.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 院校考生专项考核对象 a_enroll_special
+ * 
+ * @author voluntary
+ * @date 2023-11-26
+ */
+public class AEnrollSpecial extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 年度 */
+    @Excel(name = "年度")
+    private Integer year;
+
+    /** 院校id */
+    @Excel(name = "院校id")
+    private Long universityId;
+
+    /** 院校名称 */
+    @Excel(name = "院校名称")
+    private String universityName;
+
+    /** 检查描述 */
+    @Excel(name = "检查描述")
+    private String enrollFormula;
+
+    /** 专业组 */
+    @Excel(name = "专业组")
+    private String majorGroup;
+
+    /** 专业类别 */
+    @Excel(name = "专业类别")
+    private String majorName;
+
+    /** 专业方向 */
+    @Excel(name = "专业方向")
+    private String majorDirection;
+
+    /** 性别 */
+    @Excel(name = "性别")
+    private String gender;
+
+    /** 考生类别 */
+    @Excel(name = "考生类别")
+    private String examineeType;
+
+    /** 考核项目类 */
+    @Excel(name = "考核项目类")
+    private String itemCategory;
+
+    /** 考核项目类 */
+    @Excel(name = "考核项组")
+    private String itemGroup;
+
+    /** 考核项目 */
+    @Excel(name = "考核项目")
+    private String itemName;
+
+    /** 考核项目类型 */
+    @Excel(name = "考核项目类型")
+    private String itemType;
+
+    /** 考核项目字段名 */
+    @Excel(name = "考核项目字段名")
+    private String itemField;
+
+    /** 值类型:Score,Boolean */
+    @Excel(name = "值类型:Score,Boolean")
+    private String valueType;
+
+    /** 值规则 */
+    @Excel(name = "值规则")
+    private String valueRule;
+
+    /** 矫正类型:0不支持,1固定分2固定比例 */
+    @Excel(name = "矫正类型:0不支持,1固定分2固定比例")
+    private Integer correctType;
+
+    /** 矫正参考值 */
+    @Excel(name = "矫正参考值")
+    private String correctValue;
+
+    /** 符合规则 */
+    @Excel(name = "符合规则")
+    private String valuePassRule;
+
+    /** 备选值 */
+    @Excel(name = "备选值")
+    private String valueOptional;
+
+    /** 描述未用 */
+    @Excel(name = "描述未用")
+    private String description;
+
+    /** 备注说明 */
+    @Excel(name = "备注说明")
+    private String comment;
+
+    /** 校验公式 */
+    @Excel(name = "校验公式")
+    private String regex;
+
+    /** 默认值 */
+    @Excel(name = "默认值")
+    private String defaultValue;
+
+    /** 占位提示 */
+    @Excel(name = "占位提示")
+    private String placeholder;
+
+    /** 提示 */
+    @Excel(name = "提示")
+    private String tips;
+
+    /** 键盘模式 */
+    @Excel(name = "键盘模式")
+    private String keyboardMode;
+
+    /** 是否有点 */
+    @Excel(name = "是否有点")
+    private Long dotDisable;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setYear(Integer year) 
+    {
+        this.year = year;
+    }
+
+    public Integer getYear() 
+    {
+        return year;
+    }
+    public void setUniversityId(Long universityId) 
+    {
+        this.universityId = universityId;
+    }
+
+    public Long getUniversityId() 
+    {
+        return universityId;
+    }
+    public void setUniversityName(String universityName) 
+    {
+        this.universityName = universityName;
+    }
+
+    public String getUniversityName() 
+    {
+        return universityName;
+    }
+    public void setEnrollFormula(String enrollFormula) 
+    {
+        this.enrollFormula = enrollFormula;
+    }
+
+    public String getEnrollFormula() 
+    {
+        return enrollFormula;
+    }
+    public void setMajorGroup(String majorGroup) 
+    {
+        this.majorGroup = majorGroup;
+    }
+
+    public String getMajorGroup() 
+    {
+        return majorGroup;
+    }
+    public void setMajorName(String majorName) 
+    {
+        this.majorName = majorName;
+    }
+
+    public String getMajorName() 
+    {
+        return majorName;
+    }
+    public void setMajorDirection(String majorDirection) 
+    {
+        this.majorDirection = majorDirection;
+    }
+
+    public String getMajorDirection() 
+    {
+        return majorDirection;
+    }
+    public void setGender(String gender) 
+    {
+        this.gender = gender;
+    }
+
+    public String getGender() 
+    {
+        return gender;
+    }
+    public void setExamineeType(String examineeType) 
+    {
+        this.examineeType = examineeType;
+    }
+
+    public String getExamineeType() 
+    {
+        return examineeType;
+    }
+    public void setItemCategory(String itemCategory) 
+    {
+        this.itemCategory = itemCategory;
+    }
+
+    public String getItemCategory() 
+    {
+        return itemCategory;
+    }
+    public void setItemGroup(String itemGroup) {
+        this.itemGroup = itemGroup;
+    }
+
+    public String getItemGroup() {
+        return itemGroup;
+    }
+    public void setItemName(String itemName)
+    {
+        this.itemName = itemName;
+    }
+
+    public String getItemName() 
+    {
+        return itemName;
+    }
+    public void setItemType(String itemType) 
+    {
+        this.itemType = itemType;
+    }
+
+    public String getItemType() 
+    {
+        return itemType;
+    }
+    public void setItemField(String itemField) 
+    {
+        this.itemField = itemField;
+    }
+
+    public String getItemField() 
+    {
+        return itemField;
+    }
+    public void setValueType(String valueType) 
+    {
+        this.valueType = valueType;
+    }
+
+    public String getValueType() 
+    {
+        return valueType;
+    }
+    public void setValueRule(String valueRule) 
+    {
+        this.valueRule = valueRule;
+    }
+
+    public String getValueRule() 
+    {
+        return valueRule;
+    }
+    public void setCorrectType(Integer correctType)
+    {
+        this.correctType = correctType;
+    }
+
+    public Integer getCorrectType()
+    {
+        return correctType;
+    }
+    public void setCorrectValue(String correctValue) 
+    {
+        this.correctValue = correctValue;
+    }
+
+    public String getCorrectValue() 
+    {
+        return correctValue;
+    }
+    public void setValuePassRule(String valuePassRule) 
+    {
+        this.valuePassRule = valuePassRule;
+    }
+
+    public String getValuePassRule() 
+    {
+        return valuePassRule;
+    }
+    public void setValueOptional(String valueOptional) 
+    {
+        this.valueOptional = valueOptional;
+    }
+
+    public String getValueOptional() 
+    {
+        return valueOptional;
+    }
+    public void setDescription(String description) 
+    {
+        this.description = description;
+    }
+
+    public String getDescription() 
+    {
+        return description;
+    }
+    public void setComment(String comment) 
+    {
+        this.comment = comment;
+    }
+
+    public String getComment() 
+    {
+        return comment;
+    }
+    public void setRegex(String regex) 
+    {
+        this.regex = regex;
+    }
+
+    public String getRegex() 
+    {
+        return regex;
+    }
+    public void setDefaultValue(String defaultValue) 
+    {
+        this.defaultValue = defaultValue;
+    }
+
+    public String getDefaultValue() 
+    {
+        return defaultValue;
+    }
+    public void setPlaceholder(String placeholder) 
+    {
+        this.placeholder = placeholder;
+    }
+
+    public String getPlaceholder() 
+    {
+        return placeholder;
+    }
+    public void setTips(String tips) 
+    {
+        this.tips = tips;
+    }
+
+    public String getTips() 
+    {
+        return tips;
+    }
+    public void setKeyboardMode(String keyboardMode) 
+    {
+        this.keyboardMode = keyboardMode;
+    }
+
+    public String getKeyboardMode() 
+    {
+        return keyboardMode;
+    }
+    public void setDotDisable(Long dotDisable) 
+    {
+        this.dotDisable = dotDisable;
+    }
+
+    public Long getDotDisable() 
+    {
+        return dotDisable;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("year", getYear())
+            .append("universityId", getUniversityId())
+            .append("universityName", getUniversityName())
+            .append("enrollFormula", getEnrollFormula())
+            .append("majorGroup", getMajorGroup())
+            .append("majorName", getMajorName())
+            .append("majorDirection", getMajorDirection())
+            .append("gender", getGender())
+            .append("examineeType", getExamineeType())
+            .append("itemCategory", getItemCategory())
+            .append("itemName", getItemName())
+            .append("itemType", getItemType())
+            .append("itemField", getItemField())
+            .append("valueType", getValueType())
+            .append("valueRule", getValueRule())
+            .append("correctType", getCorrectType())
+            .append("correctValue", getCorrectValue())
+            .append("valuePassRule", getValuePassRule())
+            .append("valueOptional", getValueOptional())
+            .append("description", getDescription())
+            .append("comment", getComment())
+            .append("regex", getRegex())
+            .append("defaultValue", getDefaultValue())
+            .append("placeholder", getPlaceholder())
+            .append("tips", getTips())
+            .append("keyboardMode", getKeyboardMode())
+            .append("dotDisable", getDotDisable())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/ie/domain/AEnrollUniversity.java

@@ -0,0 +1,149 @@
+package com.ruoyi.ie.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 院校考生考核方式总体对象 a_enroll_university
+ * 
+ * @author voluntary
+ * @date 2023-12-06
+ */
+public class AEnrollUniversity extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 年度 */
+    @Excel(name = "年度")
+    private Integer year;
+
+    /** 院校id */
+    @Excel(name = "院校id")
+    private Long universityId;
+
+    /** 院校名称 */
+    @Excel(name = "院校名称")
+    private String universityName;
+
+    /** 录取公式 */
+    @Excel(name = "录取公式")
+    private String enrollFormula;
+
+    /** 专业组 */
+    @Excel(name = "专业组")
+    private String majorGroups;
+
+    /** 专业类别 */
+    @Excel(name = "专业类别")
+    private String majorNames;
+
+    /** 考生类别 */
+    @Excel(name = "考生类别")
+    private String examineeTypes;
+
+    /** 政策变化 */
+    @Excel(name = "政策变化")
+    private Integer typeChange;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setYear(Integer year) 
+    {
+        this.year = year;
+    }
+
+    public Integer getYear() 
+    {
+        return year;
+    }
+    public void setUniversityId(Long universityId) 
+    {
+        this.universityId = universityId;
+    }
+
+    public Long getUniversityId() 
+    {
+        return universityId;
+    }
+    public void setUniversityName(String universityName) 
+    {
+        this.universityName = universityName;
+    }
+
+    public String getUniversityName() 
+    {
+        return universityName;
+    }
+    public void setEnrollFormula(String enrollFormula) 
+    {
+        this.enrollFormula = enrollFormula;
+    }
+
+    public String getEnrollFormula() 
+    {
+        return enrollFormula;
+    }
+    public void setMajorGroups(String majorGroups) 
+    {
+        this.majorGroups = majorGroups;
+    }
+
+    public String getMajorGroups() 
+    {
+        return majorGroups;
+    }
+    public void setMajorNames(String majorNames) 
+    {
+        this.majorNames = majorNames;
+    }
+
+    public String getMajorNames() 
+    {
+        return majorNames;
+    }
+    public void setExamineeTypes(String examineeTypes) 
+    {
+        this.examineeTypes = examineeTypes;
+    }
+
+    public String getExamineeTypes() 
+    {
+        return examineeTypes;
+    }
+    public void setTypeChange(Integer typeChange) 
+    {
+        this.typeChange = typeChange;
+    }
+
+    public Integer getTypeChange()
+    {
+        return typeChange;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("year", getYear())
+            .append("universityId", getUniversityId())
+            .append("universityName", getUniversityName())
+            .append("enrollFormula", getEnrollFormula())
+            .append("majorGroups", getMajorGroups())
+            .append("majorNames", getMajorNames())
+            .append("examineeTypes", getExamineeTypes())
+            .append("typeChange", getTypeChange())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/ie/domain/AMarjorEnroll.java

@@ -0,0 +1,177 @@
+package com.ruoyi.ie.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 专业录取情况对象 a_marjor_enroll
+ * 
+ * @author voluntary
+ * @date 2023-11-26
+ */
+public class AMarjorEnroll extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 年度 */
+    @Excel(name = "年度")
+    private Integer year;
+
+    /** 院校id */
+    @Excel(name = "院校id")
+    private Long universityId;
+
+    /** 院校 */
+    @Excel(name = "院校")
+    private String universityName;
+
+    /** 专业组 */
+    @Excel(name = "专业组")
+    private String majorGroup;
+
+    /** 专业 */
+    @Excel(name = "专业")
+    private String majorName;
+
+    /** 专业方向 */
+    @Excel(name = "专业方向")
+    private String majorDirection;
+
+    /** 录取总数 */
+    @Excel(name = "录取总数")
+    private Integer enrollTotal;
+
+    /** 补录总数 */
+    @Excel(name = "补录总数")
+    private Integer addedTotal;
+
+    /** 二志愿录取数 */
+    @Excel(name = "二志愿录取数")
+    private Integer twoTotal;
+
+    /** 三志愿录取数 */
+    @Excel(name = "三志愿录取数")
+    private Integer threeTotal;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setYear(Integer year) 
+    {
+        this.year = year;
+    }
+
+    public Integer getYear() 
+    {
+        return year;
+    }
+    public void setUniversityId(Long universityId) 
+    {
+        this.universityId = universityId;
+    }
+
+    public Long getUniversityId() 
+    {
+        return universityId;
+    }
+    public void setUniversityName(String universityName) 
+    {
+        this.universityName = universityName;
+    }
+
+    public String getUniversityName() 
+    {
+        return universityName;
+    }
+    public void setMajorGroup(String majorGroup) 
+    {
+        this.majorGroup = majorGroup;
+    }
+
+    public String getMajorGroup() 
+    {
+        return majorGroup;
+    }
+    public void setMajorName(String majorName) 
+    {
+        this.majorName = majorName;
+    }
+
+    public String getMajorName() 
+    {
+        return majorName;
+    }
+    public void setMajorDirection(String majorDirection) 
+    {
+        this.majorDirection = majorDirection;
+    }
+
+    public String getMajorDirection() 
+    {
+        return majorDirection;
+    }
+    public void setEnrollTotal(Integer enrollTotal) 
+    {
+        this.enrollTotal = enrollTotal;
+    }
+
+    public Integer getEnrollTotal() 
+    {
+        return enrollTotal;
+    }
+    public void setAddedTotal(Integer addedTotal) 
+    {
+        this.addedTotal = addedTotal;
+    }
+
+    public Integer getAddedTotal() 
+    {
+        return addedTotal;
+    }
+    public void setTwoTotal(Integer twoTotal) 
+    {
+        this.twoTotal = twoTotal;
+    }
+
+    public Integer getTwoTotal() 
+    {
+        return twoTotal;
+    }
+    public void setThreeTotal(Integer threeTotal) 
+    {
+        this.threeTotal = threeTotal;
+    }
+
+    public Integer getThreeTotal() 
+    {
+        return threeTotal;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("year", getYear())
+            .append("universityId", getUniversityId())
+            .append("universityName", getUniversityName())
+            .append("majorGroup", getMajorGroup())
+            .append("majorName", getMajorName())
+            .append("majorDirection", getMajorDirection())
+            .append("enrollTotal", getEnrollTotal())
+            .append("addedTotal", getAddedTotal())
+            .append("twoTotal", getTwoTotal())
+            .append("threeTotal", getThreeTotal())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/ie/domain/AMarjorPlan.java

@@ -0,0 +1,380 @@
+package com.ruoyi.ie.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 专业计划要求对象 a_marjor_plan
+ * 
+ * @author voluntary
+ * @date 2023-11-26
+ */
+public class AMarjorPlan extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 年度 */
+    @Excel(name = "年度")
+    private Integer year;
+
+    /** 院校id */
+    @Excel(name = "院校id")
+    private Long universityId;
+
+    /** 院校 */
+    @Excel(name = "院校")
+    private String universityName;
+
+    private String level;
+
+    /** 专业组 */
+    @Excel(name = "专业组")
+    private String majorGroup;
+
+    /** 专业 */
+    @Excel(name = "专业代码")
+    private String majorCode;
+
+    /** 专业 */
+    @Excel(name = "专业")
+    private String majorName;
+
+    /** 专业方向 */
+    @Excel(name = "专业方向")
+    private String majorDirection;
+
+
+    /** 招生代码 */
+    @Excel(name = "院校招生代码")
+    private String enrollCode;
+
+    /** 招生代码 */
+    @Excel(name = "专业招生代码")
+    private String majorEnrollCode;
+
+    /** 考生类型 */
+    @Excel(name = "考生类型")
+    private String examineeType;
+
+    /** 计划人数 */
+    @Excel(name = "计划人数")
+    private Integer planTotal;
+
+    private Integer xuefei;
+
+    /** 学制 */
+    @Excel(name = "学制")
+    private Integer lengthOfSchooling;
+
+    /** 综合分 */
+    @Excel(name = "综合分")
+    private Double score;
+
+    /** 文化 */
+    @Excel(name = "文化")
+    private Double culturalScore;
+
+    /** 专业技能 */
+    @Excel(name = "专业技能")
+    private Double profScore;
+
+    /** 校考 */
+    @Excel(name = "校考")
+    private Double schoolScore;
+
+    /** 语 */
+    @Excel(name = "语")
+    private Double chinessScore;
+
+    /** 数 */
+    @Excel(name = "数")
+    private Double mathScore;
+
+    /** 英 */
+    @Excel(name = "英")
+    private Double englishScore;
+
+    /** 自定义: 支持所有分英的算式函数 */
+    @Excel(name = "自定义: 支持所有分英的算式函数")
+    private String custCond;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String comment;
+
+    /** 合适企业 */
+    @Excel(name = "合适企业")
+    private String company;
+
+    /** 临时 */
+    private String test;
+
+    private String enrollFormula;
+
+    public Integer getXuefei() {
+        return xuefei;
+    }
+
+    public void setXuefei(Integer xuefei) {
+        this.xuefei = xuefei;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setYear(Integer year) 
+    {
+        this.year = year;
+    }
+
+    public Integer getYear() 
+    {
+        return year;
+    }
+    public void setUniversityId(Long universityId) 
+    {
+        this.universityId = universityId;
+    }
+
+    public Long getUniversityId() 
+    {
+        return universityId;
+    }
+    public void setUniversityName(String universityName) 
+    {
+        this.universityName = universityName;
+    }
+
+    public String getUniversityName() 
+    {
+        return universityName;
+    }
+    public void setLevel(String level) {
+        this.level = level;
+    }
+
+    public String getLevel() {
+        return level;
+    }
+    public void setMajorGroup(String majorGroup) 
+    {
+        this.majorGroup = majorGroup;
+    }
+
+    public String getMajorGroup() 
+    {
+        return majorGroup;
+    }
+    public void setMajorCode(String majorCode) {
+        this.majorCode = majorCode;
+    }
+
+    public String getMajorCode() {
+        return majorCode;
+    }
+    public void setMajorName(String majorName)
+    {
+        this.majorName = majorName;
+    }
+
+    public String getMajorName() 
+    {
+        return majorName;
+    }
+    public void setMajorDirection(String majorDirection) 
+    {
+        this.majorDirection = majorDirection;
+    }
+
+    public String getMajorDirection() 
+    {
+        return majorDirection;
+    }
+    public void setEnrollCode(String enrollCode) {
+        this.enrollCode = enrollCode;
+    }
+
+    public String getEnrollCode() {
+        return enrollCode;
+    }
+    public void setMajorEnrollCode(String majorEnrollCode) {
+        this.majorEnrollCode = majorEnrollCode;
+    }
+
+
+    public String getMajorEnrollCode() {
+        return majorEnrollCode;
+    }
+    public void setExamineeType(String examineeType)
+    {
+        this.examineeType = examineeType;
+    }
+
+    public String getExamineeType() 
+    {
+        return examineeType;
+    }
+    public void setPlanTotal(Integer planTotal) 
+    {
+        this.planTotal = planTotal;
+    }
+
+    public Integer getPlanTotal() 
+    {
+        return planTotal;
+    }
+    public void setLengthOfSchooling(Integer lengthOfSchooling) 
+    {
+        this.lengthOfSchooling = lengthOfSchooling;
+    }
+
+    public Integer getLengthOfSchooling() 
+    {
+        return lengthOfSchooling;
+    }
+    public void setScore(Double score) 
+    {
+        this.score = score;
+    }
+
+    public Double getScore() 
+    {
+        return score;
+    }
+    public void setCulturalScore(Double culturalScore) 
+    {
+        this.culturalScore = culturalScore;
+    }
+
+    public Double getCulturalScore() 
+    {
+        return culturalScore;
+    }
+    public void setProfScore(Double profScore) 
+    {
+        this.profScore = profScore;
+    }
+
+    public Double getProfScore() 
+    {
+        return profScore;
+    }
+    public void setSchoolScore(Double schoolScore) 
+    {
+        this.schoolScore = schoolScore;
+    }
+
+    public Double getSchoolScore() 
+    {
+        return schoolScore;
+    }
+    public void setChinessScore(Double chinessScore) 
+    {
+        this.chinessScore = chinessScore;
+    }
+
+    public Double getChinessScore() 
+    {
+        return chinessScore;
+    }
+    public void setMathScore(Double mathScore) 
+    {
+        this.mathScore = mathScore;
+    }
+
+    public Double getMathScore() 
+    {
+        return mathScore;
+    }
+    public void setEnglishScore(Double englishScore) 
+    {
+        this.englishScore = englishScore;
+    }
+
+    public Double getEnglishScore() 
+    {
+        return englishScore;
+    }
+    public void setCustCond(String custCond) 
+    {
+        this.custCond = custCond;
+    }
+
+    public String getCustCond() 
+    {
+        return custCond;
+    }
+    public void setComment(String comment) 
+    {
+        this.comment = comment;
+    }
+
+    public String getComment() 
+    {
+        return comment;
+    }
+    public void setCompany(String company) 
+    {
+        this.company = company;
+    }
+
+    public String getCompany() 
+    {
+        return company;
+    }
+    public void setTest(String test) 
+    {
+        this.test = test;
+    }
+
+    public String getTest() 
+    {
+        return test;
+    }
+
+    public String getEnrollFormula() {
+        return enrollFormula;
+    }
+
+    public void setEnrollFormula(String enrollFormula) {
+        this.enrollFormula = enrollFormula;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("year", getYear())
+            .append("universityId", getUniversityId())
+            .append("universityName", getUniversityName())
+            .append("majorGroup", getMajorGroup())
+            .append("majorName", getMajorName())
+            .append("majorDirection", getMajorDirection())
+            .append("examineeType", getExamineeType())
+            .append("planTotal", getPlanTotal())
+            .append("lengthOfSchooling", getLengthOfSchooling())
+            .append("score", getScore())
+            .append("culturalScore", getCulturalScore())
+            .append("profScore", getProfScore())
+            .append("schoolScore", getSchoolScore())
+            .append("chinessScore", getChinessScore())
+            .append("mathScore", getMathScore())
+            .append("englishScore", getEnglishScore())
+            .append("custCond", getCustCond())
+            .append("comment", getComment())
+            .append("company", getCompany())
+            .append("test", getTest())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/ie/domain/AMarjorSubmit.java

@@ -0,0 +1,334 @@
+package com.ruoyi.ie.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 专业报名划线对象 a_marjor_submit
+ * 
+ * @author voluntary
+ * @date 2023-11-26
+ */
+public class AMarjorSubmit extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 年度 */
+    @Excel(name = "年度")
+    private Integer year;
+
+    /** 院校录取id */
+    @Excel(name = "院校录取id")
+    private Long marjorEnrollId;
+
+    /** 院校id */
+    @Excel(name = "院校id")
+    private Long universityId;
+
+    /** 院校 */
+    @Excel(name = "院校")
+    private String universityName;
+
+    private String level;
+
+    /** 专业组 */
+    @Excel(name = "专业组")
+    private String majorGroup;
+
+    /** 专业 */
+    @Excel(name = "专业")
+    private String majorName;
+
+    /** 专业方向 */
+    @Excel(name = "专业方向")
+    private String majorDirection;
+
+    /** 考生类型 */
+    @Excel(name = "考生类型")
+    private String examineeType;
+
+    /** 录取类型:初录,补录 */
+    @Excel(name = "录取类型:初录,补录")
+    private String enrollType;
+
+    /** 录取人数 */
+    @Excel(name = "录取人数")
+    private Integer enrollTotal;
+
+    /** 综合分 */
+    @Excel(name = "综合分")
+    private Double score;
+
+    /** 综合总分 */
+    @Excel(name = "综合总分")
+    private Integer scoreTotal;
+
+    /** 文化 */
+    @Excel(name = "文化")
+    private Double culturalScore;
+
+    /** 专业技能 */
+    @Excel(name = "专业技能")
+    private Double profScore;
+
+    /** 校考 */
+    @Excel(name = "校考")
+    private Double schoolScore;
+
+    /** 语 */
+    @Excel(name = "语")
+    private Double chinessScore;
+
+    /** 数 */
+    @Excel(name = "数")
+    private Double mathScore;
+
+    /** 英 */
+    @Excel(name = "英")
+    private Double englishScore;
+
+    /** 自定义: 支持所有分英的算式函数 */
+    @Excel(name = "自定义: 支持所有分英的算式函数")
+    private String custCond;
+
+    /** 临时 */
+    private String test;
+
+    private String enrollFormula;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setYear(Integer year) 
+    {
+        this.year = year;
+    }
+
+    public Integer getYear() 
+    {
+        return year;
+    }
+    public void setMarjorEnrollId(Long marjorEnrollId) 
+    {
+        this.marjorEnrollId = marjorEnrollId;
+    }
+
+    public Long getMarjorEnrollId() 
+    {
+        return marjorEnrollId;
+    }
+    public void setUniversityId(Long universityId) 
+    {
+        this.universityId = universityId;
+    }
+
+    public Long getUniversityId() 
+    {
+        return universityId;
+    }
+    public void setUniversityName(String universityName) 
+    {
+        this.universityName = universityName;
+    }
+
+    public String getUniversityName() 
+    {
+        return universityName;
+    }
+    public void setLevel(String level) {
+        this.level = level;
+    }
+
+
+    public String getLevel() {
+        return level;
+    }
+    public void setMajorGroup(String majorGroup)
+    {
+        this.majorGroup = majorGroup;
+    }
+
+    public String getMajorGroup() 
+    {
+        return majorGroup;
+    }
+    public void setMajorName(String majorName) 
+    {
+        this.majorName = majorName;
+    }
+
+    public String getMajorName() 
+    {
+        return majorName;
+    }
+    public void setMajorDirection(String majorDirection) 
+    {
+        this.majorDirection = majorDirection;
+    }
+
+    public String getMajorDirection() 
+    {
+        return majorDirection;
+    }
+    public void setExamineeType(String examineeType) 
+    {
+        this.examineeType = examineeType;
+    }
+
+    public String getExamineeType() 
+    {
+        return examineeType;
+    }
+    public void setEnrollType(String enrollType) 
+    {
+        this.enrollType = enrollType;
+    }
+
+    public String getEnrollType() 
+    {
+        return enrollType;
+    }
+    public void setEnrollTotal(Integer enrollTotal) 
+    {
+        this.enrollTotal = enrollTotal;
+    }
+
+    public Integer getEnrollTotal() 
+    {
+        return enrollTotal;
+    }
+    public void setScore(Double score) 
+    {
+        this.score = score;
+    }
+
+    public Double getScore() 
+    {
+        return score;
+    }
+    public void setCulturalScore(Double culturalScore) 
+    {
+        this.culturalScore = culturalScore;
+    }
+
+    public Integer getScoreTotal() {
+        return scoreTotal;
+    }
+
+    public void setScoreTotal(Integer scoreTotal) {
+        this.scoreTotal = scoreTotal;
+    }
+
+    public Double getCulturalScore()
+    {
+        return culturalScore;
+    }
+    public void setProfScore(Double profScore) 
+    {
+        this.profScore = profScore;
+    }
+
+    public Double getProfScore() 
+    {
+        return profScore;
+    }
+    public void setSchoolScore(Double schoolScore) 
+    {
+        this.schoolScore = schoolScore;
+    }
+
+    public Double getSchoolScore() 
+    {
+        return schoolScore;
+    }
+    public void setChinessScore(Double chinessScore) 
+    {
+        this.chinessScore = chinessScore;
+    }
+
+    public Double getChinessScore() 
+    {
+        return chinessScore;
+    }
+    public void setMathScore(Double mathScore) 
+    {
+        this.mathScore = mathScore;
+    }
+
+    public Double getMathScore() 
+    {
+        return mathScore;
+    }
+    public void setEnglishScore(Double englishScore) 
+    {
+        this.englishScore = englishScore;
+    }
+
+    public Double getEnglishScore() 
+    {
+        return englishScore;
+    }
+    public void setCustCond(String custCond) 
+    {
+        this.custCond = custCond;
+    }
+
+    public String getCustCond() 
+    {
+        return custCond;
+    }
+    public void setTest(String test) 
+    {
+        this.test = test;
+    }
+
+    public String getTest() 
+    {
+        return test;
+    }
+
+    public String getEnrollFormula() {
+        return enrollFormula;
+    }
+
+    public void setEnrollFormula(String enrollFormula) {
+        this.enrollFormula = enrollFormula;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("year", getYear())
+            .append("marjorEnrollId", getMarjorEnrollId())
+            .append("universityId", getUniversityId())
+            .append("universityName", getUniversityName())
+            .append("majorGroup", getMajorGroup())
+            .append("majorName", getMajorName())
+            .append("majorDirection", getMajorDirection())
+            .append("examineeType", getExamineeType())
+            .append("enrollType", getEnrollType())
+            .append("enrollTotal", getEnrollTotal())
+            .append("score", getScore())
+            .append("culturalScore", getCulturalScore())
+            .append("profScore", getProfScore())
+            .append("schoolScore", getSchoolScore())
+            .append("chinessScore", getChinessScore())
+            .append("mathScore", getMathScore())
+            .append("englishScore", getEnglishScore())
+            .append("custCond", getCustCond())
+            .append("test", getTest())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/ie/domain/AWishRecord.java

@@ -0,0 +1,187 @@
+package com.ruoyi.ie.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 志愿记录对象 a_wish_record
+ * 
+ * @author voluntary
+ * @date 2023-11-26
+ */
+public class AWishRecord extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 用户 */
+    @Excel(name = "用户")
+    private Long userId;
+
+    /** 年度 */
+    @Excel(name = "年度")
+    private Integer year;
+
+    /** 类型 */
+    @Excel(name = "类型")
+    private String type;
+
+    /** 序号 */
+    @Excel(name = "序号")
+    private Integer seq;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String name;
+
+    /** 批次名称 */
+    @Excel(name = "批次名称")
+    private String batchName;
+
+    /** 输入条件 */
+    @Excel(name = "输入条件")
+    private String request;
+
+    /** 用户内容 */
+    @Excel(name = "用户内容")
+    private String userSnapshot;
+
+    /** 报名详情 */
+    @Excel(name = "报名详情")
+    private String details;
+
+    /** 状态:0无效1有效 */
+    @Excel(name = "状态:0无效1有效")
+    private Integer status;
+
+    private Boolean obsoleted;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setYear(Integer year) 
+    {
+        this.year = year;
+    }
+
+    public Integer getYear() 
+    {
+        return year;
+    }
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+    public void setSeq(Integer seq) 
+    {
+        this.seq = seq;
+    }
+
+    public Integer getSeq() 
+    {
+        return seq;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setRequest(String request) 
+    {
+        this.request = request;
+    }
+
+    public String getRequest() 
+    {
+        return request;
+    }
+    public void setUserSnapshot(String userSnapshot) 
+    {
+        this.userSnapshot = userSnapshot;
+    }
+
+    public String getUserSnapshot() 
+    {
+        return userSnapshot;
+    }
+    public void setDetails(String details) 
+    {
+        this.details = details;
+    }
+
+    public String getDetails() 
+    {
+        return details;
+    }
+    public void setStatus(Integer status) 
+    {
+        this.status = status;
+    }
+
+    public Integer getStatus() 
+    {
+        return status;
+    }
+
+    public String getBatchName() {
+        return batchName;
+    }
+
+    public void setBatchName(String batchName) {
+        this.batchName = batchName;
+    }
+
+    public Boolean getObsoleted() {
+        return obsoleted;
+    }
+
+    public void setObsoleted(Boolean obsoleted) {
+        this.obsoleted = obsoleted;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("userId", getUserId())
+            .append("year", getYear())
+            .append("type", getType())
+            .append("seq", getSeq())
+            .append("name", getName())
+            .append("request", getRequest())
+            .append("userSnapshot", getUserSnapshot())
+            .append("details", getDetails())
+            .append("status", getStatus())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/ie/mapper/AEnrollScoreMapper.java

@@ -0,0 +1,66 @@
+package com.ruoyi.ie.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.ie.domain.AEnrollScore;
+
+/**
+ * 院校考生考核成绩部分Mapper接口
+ * 
+ * @author voluntary
+ * @date 2023-11-26
+ */
+public interface AEnrollScoreMapper 
+{
+    /**
+     * 查询院校考生考核成绩部分
+     * 
+     * @param id 院校考生考核成绩部分主键
+     * @return 院校考生考核成绩部分
+     */
+    public AEnrollScore selectAEnrollScoreById(Long id);
+
+
+    public List<AEnrollScore> selectListByRuleCond(Map cond);
+
+    /**
+     * 查询院校考生考核成绩部分列表
+     * 
+     * @param aEnrollScore 院校考生考核成绩部分
+     * @return 院校考生考核成绩部分集合
+     */
+    public List<AEnrollScore> selectAEnrollScoreList(AEnrollScore aEnrollScore);
+
+    /**
+     * 新增院校考生考核成绩部分
+     * 
+     * @param aEnrollScore 院校考生考核成绩部分
+     * @return 结果
+     */
+    public int insertAEnrollScore(AEnrollScore aEnrollScore);
+
+    /**
+     * 修改院校考生考核成绩部分
+     * 
+     * @param aEnrollScore 院校考生考核成绩部分
+     * @return 结果
+     */
+    public int updateAEnrollScore(AEnrollScore aEnrollScore);
+
+    /**
+     * 删除院校考生考核成绩部分
+     * 
+     * @param id 院校考生考核成绩部分主键
+     * @return 结果
+     */
+    public int deleteAEnrollScoreById(Long id);
+
+    /**
+     * 批量删除院校考生考核成绩部分
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAEnrollScoreByIds(Long[] ids);
+}

ie-system/src/main/java/com/ruoyi/ie/mapper/AEnrollSkillMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.ie.mapper;
+
+import java.util.List;
+import com.ruoyi.ie.domain.AEnrollSkill;
+
+/**
+ * 院校考生技能考核办法Mapper接口
+ * 
+ * @author voluntary
+ * @date 2023-11-26
+ */
+public interface AEnrollSkillMapper 
+{
+    /**
+     * 查询院校考生技能考核办法
+     * 
+     * @param id 院校考生技能考核办法主键
+     * @return 院校考生技能考核办法
+     */
+    public AEnrollSkill selectAEnrollSkillById(Long id);
+
+    /**
+     * 查询院校考生技能考核办法列表
+     * 
+     * @param aEnrollSkill 院校考生技能考核办法
+     * @return 院校考生技能考核办法集合
+     */
+    public List<AEnrollSkill> selectAEnrollSkillList(AEnrollSkill aEnrollSkill);
+
+    /**
+     * 新增院校考生技能考核办法
+     * 
+     * @param aEnrollSkill 院校考生技能考核办法
+     * @return 结果
+     */
+    public int insertAEnrollSkill(AEnrollSkill aEnrollSkill);
+
+    /**
+     * 修改院校考生技能考核办法
+     * 
+     * @param aEnrollSkill 院校考生技能考核办法
+     * @return 结果
+     */
+    public int updateAEnrollSkill(AEnrollSkill aEnrollSkill);
+
+    /**
+     * 删除院校考生技能考核办法
+     * 
+     * @param id 院校考生技能考核办法主键
+     * @return 结果
+     */
+    public int deleteAEnrollSkillById(Long id);
+
+    /**
+     * 批量删除院校考生技能考核办法
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAEnrollSkillByIds(Long[] ids);
+}

ie-system/src/main/java/com/ruoyi/ie/mapper/AEnrollSpecialMapper.java

@@ -0,0 +1,65 @@
+package com.ruoyi.ie.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.ie.domain.AEnrollSpecial;
+
+/**
+ * 院校考生专项考核Mapper接口
+ * 
+ * @author voluntary
+ * @date 2023-11-26
+ */
+public interface AEnrollSpecialMapper 
+{
+    /**
+     * 查询院校考生专项考核
+     * 
+     * @param id 院校考生专项考核主键
+     * @return 院校考生专项考核
+     */
+    public AEnrollSpecial selectAEnrollSpecialById(Long id);
+
+    public List<AEnrollSpecial> selectListByRuleCond(Map cond);
+
+    /**
+     * 查询院校考生专项考核列表
+     * 
+     * @param aEnrollSpecial 院校考生专项考核
+     * @return 院校考生专项考核集合
+     */
+    public List<AEnrollSpecial> selectAEnrollSpecialList(AEnrollSpecial aEnrollSpecial);
+
+    /**
+     * 新增院校考生专项考核
+     * 
+     * @param aEnrollSpecial 院校考生专项考核
+     * @return 结果
+     */
+    public int insertAEnrollSpecial(AEnrollSpecial aEnrollSpecial);
+
+    /**
+     * 修改院校考生专项考核
+     * 
+     * @param aEnrollSpecial 院校考生专项考核
+     * @return 结果
+     */
+    public int updateAEnrollSpecial(AEnrollSpecial aEnrollSpecial);
+
+    /**
+     * 删除院校考生专项考核
+     * 
+     * @param id 院校考生专项考核主键
+     * @return 结果
+     */
+    public int deleteAEnrollSpecialById(Long id);
+
+    /**
+     * 批量删除院校考生专项考核
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAEnrollSpecialByIds(Long[] ids);
+}

ie-system/src/main/java/com/ruoyi/ie/mapper/AEnrollUniversityMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.ie.mapper;
+
+import java.util.List;
+import com.ruoyi.ie.domain.AEnrollUniversity;
+
+/**
+ * 院校考生考核方式总体Mapper接口
+ * 
+ * @author voluntary
+ * @date 2023-12-06
+ */
+public interface AEnrollUniversityMapper 
+{
+    /**
+     * 查询院校考生考核方式总体
+     * 
+     * @param id 院校考生考核方式总体主键
+     * @return 院校考生考核方式总体
+     */
+    public AEnrollUniversity selectAEnrollUniversityById(Long id);
+
+    /**
+     * 查询院校考生考核方式总体列表
+     * 
+     * @param aEnrollUniversity 院校考生考核方式总体
+     * @return 院校考生考核方式总体集合
+     */
+    public List<AEnrollUniversity> selectAEnrollUniversityList(AEnrollUniversity aEnrollUniversity);
+
+    /**
+     * 新增院校考生考核方式总体
+     * 
+     * @param aEnrollUniversity 院校考生考核方式总体
+     * @return 结果
+     */
+    public int insertAEnrollUniversity(AEnrollUniversity aEnrollUniversity);
+
+    /**
+     * 修改院校考生考核方式总体
+     * 
+     * @param aEnrollUniversity 院校考生考核方式总体
+     * @return 结果
+     */
+    public int updateAEnrollUniversity(AEnrollUniversity aEnrollUniversity);
+
+    /**
+     * 删除院校考生考核方式总体
+     * 
+     * @param id 院校考生考核方式总体主键
+     * @return 结果
+     */
+    public int deleteAEnrollUniversityById(Long id);
+
+    /**
+     * 批量删除院校考生考核方式总体
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAEnrollUniversityByIds(Long[] ids);
+}

ie-system/src/main/java/com/ruoyi/ie/mapper/AMarjorEnrollMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.ie.mapper;
+
+import java.util.List;
+import com.ruoyi.ie.domain.AMarjorEnroll;
+
+/**
+ * 专业录取情况Mapper接口
+ * 
+ * @author voluntary
+ * @date 2023-11-26
+ */
+public interface AMarjorEnrollMapper 
+{
+    /**
+     * 查询专业录取情况
+     * 
+     * @param id 专业录取情况主键
+     * @return 专业录取情况
+     */
+    public AMarjorEnroll selectAMarjorEnrollById(Long id);
+
+    /**
+     * 查询专业录取情况列表
+     * 
+     * @param aMarjorEnroll 专业录取情况
+     * @return 专业录取情况集合
+     */
+    public List<AMarjorEnroll> selectAMarjorEnrollList(AMarjorEnroll aMarjorEnroll);
+
+    /**
+     * 新增专业录取情况
+     * 
+     * @param aMarjorEnroll 专业录取情况
+     * @return 结果
+     */
+    public int insertAMarjorEnroll(AMarjorEnroll aMarjorEnroll);
+
+    /**
+     * 修改专业录取情况
+     * 
+     * @param aMarjorEnroll 专业录取情况
+     * @return 结果
+     */
+    public int updateAMarjorEnroll(AMarjorEnroll aMarjorEnroll);
+
+    /**
+     * 删除专业录取情况
+     * 
+     * @param id 专业录取情况主键
+     * @return 结果
+     */
+    public int deleteAMarjorEnrollById(Long id);
+
+    /**
+     * 批量删除专业录取情况
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAMarjorEnrollByIds(Long[] ids);
+}

ie-system/src/main/java/com/ruoyi/ie/mapper/AMarjorPlanMapper.java

@@ -0,0 +1,66 @@
+package com.ruoyi.ie.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.ie.domain.AMarjorPlan;
+
+/**
+ * 专业计划要求Mapper接口
+ * 
+ * @author voluntary
+ * @date 2023-11-26
+ */
+public interface AMarjorPlanMapper 
+{
+    /**
+     * 查询专业计划要求
+     * 
+     * @param id 专业计划要求主键
+     * @return 专业计划要求
+     */
+    public AMarjorPlan selectAMarjorPlanById(Long id);
+    public List<String> selectMajorCodesByIds(Long[] ids);
+
+    public List<AMarjorPlan> selectListByRuleCond(Map cond);
+
+    /**
+     * 查询专业计划要求列表
+     * 
+     * @param aMarjorPlan 专业计划要求
+     * @return 专业计划要求集合
+     */
+    public List<AMarjorPlan> selectAMarjorPlanList(AMarjorPlan aMarjorPlan);
+
+    /**
+     * 新增专业计划要求
+     * 
+     * @param aMarjorPlan 专业计划要求
+     * @return 结果
+     */
+    public int insertAMarjorPlan(AMarjorPlan aMarjorPlan);
+
+    /**
+     * 修改专业计划要求
+     * 
+     * @param aMarjorPlan 专业计划要求
+     * @return 结果
+     */
+    public int updateAMarjorPlan(AMarjorPlan aMarjorPlan);
+
+    /**
+     * 删除专业计划要求
+     * 
+     * @param id 专业计划要求主键
+     * @return 结果
+     */
+    public int deleteAMarjorPlanById(Long id);
+
+    /**
+     * 批量删除专业计划要求
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAMarjorPlanByIds(Long[] ids);
+}

ie-system/src/main/java/com/ruoyi/ie/mapper/AMarjorSubmitMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.ie.mapper;
+
+import java.util.List;
+import com.ruoyi.ie.domain.AMarjorSubmit;
+
+/**
+ * 专业报名划线Mapper接口
+ * 
+ * @author voluntary
+ * @date 2023-11-26
+ */
+public interface AMarjorSubmitMapper 
+{
+    /**
+     * 查询专业报名划线
+     * 
+     * @param id 专业报名划线主键
+     * @return 专业报名划线
+     */
+    public AMarjorSubmit selectAMarjorSubmitById(Long id);
+
+    /**
+     * 查询专业报名划线列表
+     * 
+     * @param aMarjorSubmit 专业报名划线
+     * @return 专业报名划线集合
+     */
+    public List<AMarjorSubmit> selectAMarjorSubmitList(AMarjorSubmit aMarjorSubmit);
+
+    /**
+     * 新增专业报名划线
+     * 
+     * @param aMarjorSubmit 专业报名划线
+     * @return 结果
+     */
+    public int insertAMarjorSubmit(AMarjorSubmit aMarjorSubmit);
+
+    /**
+     * 修改专业报名划线
+     * 
+     * @param aMarjorSubmit 专业报名划线
+     * @return 结果
+     */
+    public int updateAMarjorSubmit(AMarjorSubmit aMarjorSubmit);
+
+    /**
+     * 删除专业报名划线
+     * 
+     * @param id 专业报名划线主键
+     * @return 结果
+     */
+    public int deleteAMarjorSubmitById(Long id);
+
+    /**
+     * 批量删除专业报名划线
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAMarjorSubmitByIds(Long[] ids);
+}

ie-system/src/main/java/com/ruoyi/ie/mapper/AWishRecordMapper.java

@@ -0,0 +1,66 @@
+package com.ruoyi.ie.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.ie.domain.AWishRecord;
+
+/**
+ * 志愿记录Mapper接口
+ * 
+ * @author voluntary
+ * @date 2023-11-26
+ */
+public interface AWishRecordMapper 
+{
+    /**
+     * 查询志愿记录
+     * 
+     * @param id 志愿记录主键
+     * @return 志愿记录
+     */
+    public AWishRecord selectAWishRecordById(Long id);
+
+    /**
+     * 查询志愿记录列表
+     * 
+     * @param aWishRecord 志愿记录
+     * @return 志愿记录集合
+     */
+    public List<AWishRecord> selectAWishRecordList(AWishRecord aWishRecord);
+
+    /**
+     * 新增志愿记录
+     * 
+     * @param aWishRecord 志愿记录
+     * @return 结果
+     */
+    public int insertAWishRecord(AWishRecord aWishRecord);
+
+    /**
+     * 修改志愿记录
+     * 
+     * @param aWishRecord 志愿记录
+     * @return 结果
+     */
+    public int updateAWishRecord(AWishRecord aWishRecord);
+    public int updateObsoleteByUser(Long userId);
+
+    /**
+     * 删除志愿记录
+     * 
+     * @param id 志愿记录主键
+     * @return 结果
+     */
+    public int deleteAWishRecordById(Long id);
+
+    public int deleteAWishRecordByMap(Map cond);
+
+    /**
+     * 批量删除志愿记录
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAWishRecordByIds(Long[] ids);
+}

ie-system/src/main/java/com/ruoyi/ie/service/IAEnrollScoreService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.ie.service;
+
+import java.util.List;
+import com.ruoyi.ie.domain.AEnrollScore;
+
+/**
+ * 院校考生考核成绩部分Service接口
+ * 
+ * @author voluntary
+ * @date 2023-11-26
+ */
+public interface IAEnrollScoreService 
+{
+    /**
+     * 查询院校考生考核成绩部分
+     * 
+     * @param id 院校考生考核成绩部分主键
+     * @return 院校考生考核成绩部分
+     */
+    public AEnrollScore selectAEnrollScoreById(Long id);
+
+    /**
+     * 查询院校考生考核成绩部分列表
+     * 
+     * @param aEnrollScore 院校考生考核成绩部分
+     * @return 院校考生考核成绩部分集合
+     */
+    public List<AEnrollScore> selectAEnrollScoreList(AEnrollScore aEnrollScore);
+
+    /**
+     * 新增院校考生考核成绩部分
+     * 
+     * @param aEnrollScore 院校考生考核成绩部分
+     * @return 结果
+     */
+    public int insertAEnrollScore(AEnrollScore aEnrollScore);
+
+    /**
+     * 修改院校考生考核成绩部分
+     * 
+     * @param aEnrollScore 院校考生考核成绩部分
+     * @return 结果
+     */
+    public int updateAEnrollScore(AEnrollScore aEnrollScore);
+
+    /**
+     * 批量删除院校考生考核成绩部分
+     * 
+     * @param ids 需要删除的院校考生考核成绩部分主键集合
+     * @return 结果
+     */
+    public int deleteAEnrollScoreByIds(Long[] ids);
+
+    /**
+     * 删除院校考生考核成绩部分信息
+     * 
+     * @param id 院校考生考核成绩部分主键
+     * @return 结果
+     */
+    public int deleteAEnrollScoreById(Long id);
+}

ie-system/src/main/java/com/ruoyi/ie/service/IAEnrollSkillService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.ie.service;
+
+import java.util.List;
+import com.ruoyi.ie.domain.AEnrollSkill;
+
+/**
+ * 院校考生技能考核办法Service接口
+ * 
+ * @author voluntary
+ * @date 2023-11-26
+ */
+public interface IAEnrollSkillService 
+{
+    /**
+     * 查询院校考生技能考核办法
+     * 
+     * @param id 院校考生技能考核办法主键
+     * @return 院校考生技能考核办法
+     */
+    public AEnrollSkill selectAEnrollSkillById(Long id);
+
+    /**
+     * 查询院校考生技能考核办法列表
+     * 
+     * @param aEnrollSkill 院校考生技能考核办法
+     * @return 院校考生技能考核办法集合
+     */
+    public List<AEnrollSkill> selectAEnrollSkillList(AEnrollSkill aEnrollSkill);
+
+    /**
+     * 新增院校考生技能考核办法
+     * 
+     * @param aEnrollSkill 院校考生技能考核办法
+     * @return 结果
+     */
+    public int insertAEnrollSkill(AEnrollSkill aEnrollSkill);
+
+    /**
+     * 修改院校考生技能考核办法
+     * 
+     * @param aEnrollSkill 院校考生技能考核办法
+     * @return 结果
+     */
+    public int updateAEnrollSkill(AEnrollSkill aEnrollSkill);
+
+    /**
+     * 批量删除院校考生技能考核办法
+     * 
+     * @param ids 需要删除的院校考生技能考核办法主键集合
+     * @return 结果
+     */
+    public int deleteAEnrollSkillByIds(Long[] ids);
+
+    /**
+     * 删除院校考生技能考核办法信息
+     * 
+     * @param id 院校考生技能考核办法主键
+     * @return 结果
+     */
+    public int deleteAEnrollSkillById(Long id);
+}

ie-system/src/main/java/com/ruoyi/ie/service/IAEnrollSpecialService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.ie.service;
+
+import java.util.List;
+import com.ruoyi.ie.domain.AEnrollSpecial;
+
+/**
+ * 院校考生专项考核Service接口
+ * 
+ * @author voluntary
+ * @date 2023-11-26
+ */
+public interface IAEnrollSpecialService 
+{
+    /**
+     * 查询院校考生专项考核
+     * 
+     * @param id 院校考生专项考核主键
+     * @return 院校考生专项考核
+     */
+    public AEnrollSpecial selectAEnrollSpecialById(Long id);
+
+    /**
+     * 查询院校考生专项考核列表
+     * 
+     * @param aEnrollSpecial 院校考生专项考核
+     * @return 院校考生专项考核集合
+     */
+    public List<AEnrollSpecial> selectAEnrollSpecialList(AEnrollSpecial aEnrollSpecial);
+
+    /**
+     * 新增院校考生专项考核
+     * 
+     * @param aEnrollSpecial 院校考生专项考核
+     * @return 结果
+     */
+    public int insertAEnrollSpecial(AEnrollSpecial aEnrollSpecial);
+
+    /**
+     * 修改院校考生专项考核
+     * 
+     * @param aEnrollSpecial 院校考生专项考核
+     * @return 结果
+     */
+    public int updateAEnrollSpecial(AEnrollSpecial aEnrollSpecial);
+
+    /**
+     * 批量删除院校考生专项考核
+     * 
+     * @param ids 需要删除的院校考生专项考核主键集合
+     * @return 结果
+     */
+    public int deleteAEnrollSpecialByIds(Long[] ids);
+
+    /**
+     * 删除院校考生专项考核信息
+     * 
+     * @param id 院校考生专项考核主键
+     * @return 结果
+     */
+    public int deleteAEnrollSpecialById(Long id);
+}

ie-system/src/main/java/com/ruoyi/ie/service/IAEnrollUniversityService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.ie.service;
+
+import java.util.List;
+import com.ruoyi.ie.domain.AEnrollUniversity;
+
+/**
+ * 院校考生考核方式总体Service接口
+ * 
+ * @author voluntary
+ * @date 2023-12-06
+ */
+public interface IAEnrollUniversityService 
+{
+    /**
+     * 查询院校考生考核方式总体
+     * 
+     * @param id 院校考生考核方式总体主键
+     * @return 院校考生考核方式总体
+     */
+    public AEnrollUniversity selectAEnrollUniversityById(Long id);
+
+    /**
+     * 查询院校考生考核方式总体列表
+     * 
+     * @param aEnrollUniversity 院校考生考核方式总体
+     * @return 院校考生考核方式总体集合
+     */
+    public List<AEnrollUniversity> selectAEnrollUniversityList(AEnrollUniversity aEnrollUniversity);
+
+    /**
+     * 新增院校考生考核方式总体
+     * 
+     * @param aEnrollUniversity 院校考生考核方式总体
+     * @return 结果
+     */
+    public int insertAEnrollUniversity(AEnrollUniversity aEnrollUniversity);
+
+    /**
+     * 修改院校考生考核方式总体
+     * 
+     * @param aEnrollUniversity 院校考生考核方式总体
+     * @return 结果
+     */
+    public int updateAEnrollUniversity(AEnrollUniversity aEnrollUniversity);
+
+    /**
+     * 批量删除院校考生考核方式总体
+     * 
+     * @param ids 需要删除的院校考生考核方式总体主键集合
+     * @return 结果
+     */
+    public int deleteAEnrollUniversityByIds(Long[] ids);
+
+    /**
+     * 删除院校考生考核方式总体信息
+     * 
+     * @param id 院校考生考核方式总体主键
+     * @return 结果
+     */
+    public int deleteAEnrollUniversityById(Long id);
+}

ie-system/src/main/java/com/ruoyi/ie/service/IAMarjorEnrollService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.ie.service;
+
+import java.util.List;
+import com.ruoyi.ie.domain.AMarjorEnroll;
+
+/**
+ * 专业录取情况Service接口
+ * 
+ * @author voluntary
+ * @date 2023-11-26
+ */
+public interface IAMarjorEnrollService 
+{
+    /**
+     * 查询专业录取情况
+     * 
+     * @param id 专业录取情况主键
+     * @return 专业录取情况
+     */
+    public AMarjorEnroll selectAMarjorEnrollById(Long id);
+
+    /**
+     * 查询专业录取情况列表
+     * 
+     * @param aMarjorEnroll 专业录取情况
+     * @return 专业录取情况集合
+     */
+    public List<AMarjorEnroll> selectAMarjorEnrollList(AMarjorEnroll aMarjorEnroll);
+
+    /**
+     * 新增专业录取情况
+     * 
+     * @param aMarjorEnroll 专业录取情况
+     * @return 结果
+     */
+    public int insertAMarjorEnroll(AMarjorEnroll aMarjorEnroll);
+
+    /**
+     * 修改专业录取情况
+     * 
+     * @param aMarjorEnroll 专业录取情况
+     * @return 结果
+     */
+    public int updateAMarjorEnroll(AMarjorEnroll aMarjorEnroll);
+
+    /**
+     * 批量删除专业录取情况
+     * 
+     * @param ids 需要删除的专业录取情况主键集合
+     * @return 结果
+     */
+    public int deleteAMarjorEnrollByIds(Long[] ids);
+
+    /**
+     * 删除专业录取情况信息
+     * 
+     * @param id 专业录取情况主键
+     * @return 结果
+     */
+    public int deleteAMarjorEnrollById(Long id);
+}

ie-system/src/main/java/com/ruoyi/ie/service/IAMarjorPlanService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.ie.service;
+
+import java.util.List;
+import com.ruoyi.ie.domain.AMarjorPlan;
+
+/**
+ * 专业计划要求Service接口
+ * 
+ * @author voluntary
+ * @date 2023-11-26
+ */
+public interface IAMarjorPlanService 
+{
+    /**
+     * 查询专业计划要求
+     * 
+     * @param id 专业计划要求主键
+     * @return 专业计划要求
+     */
+    public AMarjorPlan selectAMarjorPlanById(Long id);
+
+    /**
+     * 查询专业计划要求列表
+     * 
+     * @param aMarjorPlan 专业计划要求
+     * @return 专业计划要求集合
+     */
+    public List<AMarjorPlan> selectAMarjorPlanList(AMarjorPlan aMarjorPlan);
+
+    /**
+     * 新增专业计划要求
+     * 
+     * @param aMarjorPlan 专业计划要求
+     * @return 结果
+     */
+    public int insertAMarjorPlan(AMarjorPlan aMarjorPlan);
+
+    /**
+     * 修改专业计划要求
+     * 
+     * @param aMarjorPlan 专业计划要求
+     * @return 结果
+     */
+    public int updateAMarjorPlan(AMarjorPlan aMarjorPlan);
+
+    /**
+     * 批量删除专业计划要求
+     * 
+     * @param ids 需要删除的专业计划要求主键集合
+     * @return 结果
+     */
+    public int deleteAMarjorPlanByIds(Long[] ids);
+
+    /**
+     * 删除专业计划要求信息
+     * 
+     * @param id 专业计划要求主键
+     * @return 结果
+     */
+    public int deleteAMarjorPlanById(Long id);
+}

ie-system/src/main/java/com/ruoyi/ie/service/IAMarjorSubmitService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.ie.service;
+
+import java.util.List;
+import com.ruoyi.ie.domain.AMarjorSubmit;
+
+/**
+ * 专业报名划线Service接口
+ * 
+ * @author voluntary
+ * @date 2023-11-26
+ */
+public interface IAMarjorSubmitService 
+{
+    /**
+     * 查询专业报名划线
+     * 
+     * @param id 专业报名划线主键
+     * @return 专业报名划线
+     */
+    public AMarjorSubmit selectAMarjorSubmitById(Long id);
+
+    /**
+     * 查询专业报名划线列表
+     * 
+     * @param aMarjorSubmit 专业报名划线
+     * @return 专业报名划线集合
+     */
+    public List<AMarjorSubmit> selectAMarjorSubmitList(AMarjorSubmit aMarjorSubmit);
+
+    /**
+     * 新增专业报名划线
+     * 
+     * @param aMarjorSubmit 专业报名划线
+     * @return 结果
+     */
+    public int insertAMarjorSubmit(AMarjorSubmit aMarjorSubmit);
+
+    /**
+     * 修改专业报名划线
+     * 
+     * @param aMarjorSubmit 专业报名划线
+     * @return 结果
+     */
+    public int updateAMarjorSubmit(AMarjorSubmit aMarjorSubmit);
+
+    /**
+     * 批量删除专业报名划线
+     * 
+     * @param ids 需要删除的专业报名划线主键集合
+     * @return 结果
+     */
+    public int deleteAMarjorSubmitByIds(Long[] ids);
+
+    /**
+     * 删除专业报名划线信息
+     * 
+     * @param id 专业报名划线主键
+     * @return 结果
+     */
+    public int deleteAMarjorSubmitById(Long id);
+}

ie-system/src/main/java/com/ruoyi/ie/service/IAWishRecordService.java

@@ -0,0 +1,65 @@
+package com.ruoyi.ie.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.ie.domain.AWishRecord;
+
+/**
+ * 志愿记录Service接口
+ * 
+ * @author voluntary
+ * @date 2023-11-26
+ */
+public interface IAWishRecordService 
+{
+    /**
+     * 查询志愿记录
+     * 
+     * @param id 志愿记录主键
+     * @return 志愿记录
+     */
+    public AWishRecord selectAWishRecordById(Long id);
+
+    /**
+     * 查询志愿记录列表
+     * 
+     * @param aWishRecord 志愿记录
+     * @return 志愿记录集合
+     */
+    public List<AWishRecord> selectAWishRecordList(AWishRecord aWishRecord);
+
+    /**
+     * 新增志愿记录
+     * 
+     * @param aWishRecord 志愿记录
+     * @return 结果
+     */
+    public int insertAWishRecord(AWishRecord aWishRecord);
+
+    /**
+     * 修改志愿记录
+     * 
+     * @param aWishRecord 志愿记录
+     * @return 结果
+     */
+    public int updateAWishRecord(AWishRecord aWishRecord);
+
+    /**
+     * 批量删除志愿记录
+     * 
+     * @param ids 需要删除的志愿记录主键集合
+     * @return 结果
+     */
+    public int deleteAWishRecordByIds(Long[] ids);
+
+    public int deleteAWishRecordByMap(Map cond);
+
+    /**
+     * 删除志愿记录信息
+     * 
+     * @param id 志愿记录主键
+     * @return 结果
+     */
+    public int deleteAWishRecordById(Long id);
+}

ie-system/src/main/java/com/ruoyi/ie/service/impl/AEnrollScoreServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.ie.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.ie.mapper.AEnrollScoreMapper;
+import com.ruoyi.ie.domain.AEnrollScore;
+import com.ruoyi.ie.service.IAEnrollScoreService;
+
+/**
+ * 院校考生考核成绩部分Service业务层处理
+ * 
+ * @author voluntary
+ * @date 2023-11-26
+ */
+@Service
+public class AEnrollScoreServiceImpl implements IAEnrollScoreService 
+{
+    @Autowired
+    private AEnrollScoreMapper aEnrollScoreMapper;
+
+    /**
+     * 查询院校考生考核成绩部分
+     * 
+     * @param id 院校考生考核成绩部分主键
+     * @return 院校考生考核成绩部分
+     */
+    @Override
+    public AEnrollScore selectAEnrollScoreById(Long id)
+    {
+        return aEnrollScoreMapper.selectAEnrollScoreById(id);
+    }
+
+    /**
+     * 查询院校考生考核成绩部分列表
+     * 
+     * @param aEnrollScore 院校考生考核成绩部分
+     * @return 院校考生考核成绩部分
+     */
+    @Override
+    public List<AEnrollScore> selectAEnrollScoreList(AEnrollScore aEnrollScore)
+    {
+        return aEnrollScoreMapper.selectAEnrollScoreList(aEnrollScore);
+    }
+
+    /**
+     * 新增院校考生考核成绩部分
+     * 
+     * @param aEnrollScore 院校考生考核成绩部分
+     * @return 结果
+     */
+    @Override
+    public int insertAEnrollScore(AEnrollScore aEnrollScore)
+    {
+        return aEnrollScoreMapper.insertAEnrollScore(aEnrollScore);
+    }
+
+    /**
+     * 修改院校考生考核成绩部分
+     * 
+     * @param aEnrollScore 院校考生考核成绩部分
+     * @return 结果
+     */
+    @Override
+    public int updateAEnrollScore(AEnrollScore aEnrollScore)
+    {
+        return aEnrollScoreMapper.updateAEnrollScore(aEnrollScore);
+    }
+
+    /**
+     * 批量删除院校考生考核成绩部分
+     * 
+     * @param ids 需要删除的院校考生考核成绩部分主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAEnrollScoreByIds(Long[] ids)
+    {
+        return aEnrollScoreMapper.deleteAEnrollScoreByIds(ids);
+    }
+
+    /**
+     * 删除院校考生考核成绩部分信息
+     * 
+     * @param id 院校考生考核成绩部分主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAEnrollScoreById(Long id)
+    {
+        return aEnrollScoreMapper.deleteAEnrollScoreById(id);
+    }
+}

ie-system/src/main/java/com/ruoyi/ie/service/impl/AEnrollSkillServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.ie.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.ie.mapper.AEnrollSkillMapper;
+import com.ruoyi.ie.domain.AEnrollSkill;
+import com.ruoyi.ie.service.IAEnrollSkillService;
+
+/**
+ * 院校考生技能考核办法Service业务层处理
+ * 
+ * @author voluntary
+ * @date 2023-11-26
+ */
+@Service
+public class AEnrollSkillServiceImpl implements IAEnrollSkillService 
+{
+    @Autowired
+    private AEnrollSkillMapper aEnrollSkillMapper;
+
+    /**
+     * 查询院校考生技能考核办法
+     * 
+     * @param id 院校考生技能考核办法主键
+     * @return 院校考生技能考核办法
+     */
+    @Override
+    public AEnrollSkill selectAEnrollSkillById(Long id)
+    {
+        return aEnrollSkillMapper.selectAEnrollSkillById(id);
+    }
+
+    /**
+     * 查询院校考生技能考核办法列表
+     * 
+     * @param aEnrollSkill 院校考生技能考核办法
+     * @return 院校考生技能考核办法
+     */
+    @Override
+    public List<AEnrollSkill> selectAEnrollSkillList(AEnrollSkill aEnrollSkill)
+    {
+        return aEnrollSkillMapper.selectAEnrollSkillList(aEnrollSkill);
+    }
+
+    /**
+     * 新增院校考生技能考核办法
+     * 
+     * @param aEnrollSkill 院校考生技能考核办法
+     * @return 结果
+     */
+    @Override
+    public int insertAEnrollSkill(AEnrollSkill aEnrollSkill)
+    {
+        return aEnrollSkillMapper.insertAEnrollSkill(aEnrollSkill);
+    }
+
+    /**
+     * 修改院校考生技能考核办法
+     * 
+     * @param aEnrollSkill 院校考生技能考核办法
+     * @return 结果
+     */
+    @Override
+    public int updateAEnrollSkill(AEnrollSkill aEnrollSkill)
+    {
+        return aEnrollSkillMapper.updateAEnrollSkill(aEnrollSkill);
+    }
+
+    /**
+     * 批量删除院校考生技能考核办法
+     * 
+     * @param ids 需要删除的院校考生技能考核办法主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAEnrollSkillByIds(Long[] ids)
+    {
+        return aEnrollSkillMapper.deleteAEnrollSkillByIds(ids);
+    }
+
+    /**
+     * 删除院校考生技能考核办法信息
+     * 
+     * @param id 院校考生技能考核办法主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAEnrollSkillById(Long id)
+    {
+        return aEnrollSkillMapper.deleteAEnrollSkillById(id);
+    }
+}

ie-system/src/main/java/com/ruoyi/ie/service/impl/AEnrollSpecialServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.ie.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.ie.mapper.AEnrollSpecialMapper;
+import com.ruoyi.ie.domain.AEnrollSpecial;
+import com.ruoyi.ie.service.IAEnrollSpecialService;
+
+/**
+ * 院校考生专项考核Service业务层处理
+ * 
+ * @author voluntary
+ * @date 2023-11-26
+ */
+@Service
+public class AEnrollSpecialServiceImpl implements IAEnrollSpecialService 
+{
+    @Autowired
+    private AEnrollSpecialMapper aEnrollSpecialMapper;
+
+    /**
+     * 查询院校考生专项考核
+     * 
+     * @param id 院校考生专项考核主键
+     * @return 院校考生专项考核
+     */
+    @Override
+    public AEnrollSpecial selectAEnrollSpecialById(Long id)
+    {
+        return aEnrollSpecialMapper.selectAEnrollSpecialById(id);
+    }
+
+    /**
+     * 查询院校考生专项考核列表
+     * 
+     * @param aEnrollSpecial 院校考生专项考核
+     * @return 院校考生专项考核
+     */
+    @Override
+    public List<AEnrollSpecial> selectAEnrollSpecialList(AEnrollSpecial aEnrollSpecial)
+    {
+        return aEnrollSpecialMapper.selectAEnrollSpecialList(aEnrollSpecial);
+    }
+
+    /**
+     * 新增院校考生专项考核
+     * 
+     * @param aEnrollSpecial 院校考生专项考核
+     * @return 结果
+     */
+    @Override
+    public int insertAEnrollSpecial(AEnrollSpecial aEnrollSpecial)
+    {
+        return aEnrollSpecialMapper.insertAEnrollSpecial(aEnrollSpecial);
+    }
+
+    /**
+     * 修改院校考生专项考核
+     * 
+     * @param aEnrollSpecial 院校考生专项考核
+     * @return 结果
+     */
+    @Override
+    public int updateAEnrollSpecial(AEnrollSpecial aEnrollSpecial)
+    {
+        return aEnrollSpecialMapper.updateAEnrollSpecial(aEnrollSpecial);
+    }
+
+    /**
+     * 批量删除院校考生专项考核
+     * 
+     * @param ids 需要删除的院校考生专项考核主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAEnrollSpecialByIds(Long[] ids)
+    {
+        return aEnrollSpecialMapper.deleteAEnrollSpecialByIds(ids);
+    }
+
+    /**
+     * 删除院校考生专项考核信息
+     * 
+     * @param id 院校考生专项考核主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAEnrollSpecialById(Long id)
+    {
+        return aEnrollSpecialMapper.deleteAEnrollSpecialById(id);
+    }
+}

ie-system/src/main/java/com/ruoyi/ie/service/impl/AEnrollUniversityServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.ie.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.ie.mapper.AEnrollUniversityMapper;
+import com.ruoyi.ie.domain.AEnrollUniversity;
+import com.ruoyi.ie.service.IAEnrollUniversityService;
+
+/**
+ * 院校考生考核方式总体Service业务层处理
+ * 
+ * @author voluntary
+ * @date 2023-12-06
+ */
+@Service
+public class AEnrollUniversityServiceImpl implements IAEnrollUniversityService 
+{
+    @Autowired
+    private AEnrollUniversityMapper aEnrollUniversityMapper;
+
+    /**
+     * 查询院校考生考核方式总体
+     * 
+     * @param id 院校考生考核方式总体主键
+     * @return 院校考生考核方式总体
+     */
+    @Override
+    public AEnrollUniversity selectAEnrollUniversityById(Long id)
+    {
+        return aEnrollUniversityMapper.selectAEnrollUniversityById(id);
+    }
+
+    /**
+     * 查询院校考生考核方式总体列表
+     * 
+     * @param aEnrollUniversity 院校考生考核方式总体
+     * @return 院校考生考核方式总体
+     */
+    @Override
+    public List<AEnrollUniversity> selectAEnrollUniversityList(AEnrollUniversity aEnrollUniversity)
+    {
+        return aEnrollUniversityMapper.selectAEnrollUniversityList(aEnrollUniversity);
+    }
+
+    /**
+     * 新增院校考生考核方式总体
+     * 
+     * @param aEnrollUniversity 院校考生考核方式总体
+     * @return 结果
+     */
+    @Override
+    public int insertAEnrollUniversity(AEnrollUniversity aEnrollUniversity)
+    {
+        return aEnrollUniversityMapper.insertAEnrollUniversity(aEnrollUniversity);
+    }
+
+    /**
+     * 修改院校考生考核方式总体
+     * 
+     * @param aEnrollUniversity 院校考生考核方式总体
+     * @return 结果
+     */
+    @Override
+    public int updateAEnrollUniversity(AEnrollUniversity aEnrollUniversity)
+    {
+        return aEnrollUniversityMapper.updateAEnrollUniversity(aEnrollUniversity);
+    }
+
+    /**
+     * 批量删除院校考生考核方式总体
+     * 
+     * @param ids 需要删除的院校考生考核方式总体主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAEnrollUniversityByIds(Long[] ids)
+    {
+        return aEnrollUniversityMapper.deleteAEnrollUniversityByIds(ids);
+    }
+
+    /**
+     * 删除院校考生考核方式总体信息
+     * 
+     * @param id 院校考生考核方式总体主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAEnrollUniversityById(Long id)
+    {
+        return aEnrollUniversityMapper.deleteAEnrollUniversityById(id);
+    }
+}

ie-system/src/main/java/com/ruoyi/ie/service/impl/AMarjorEnrollServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.ie.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.ie.mapper.AMarjorEnrollMapper;
+import com.ruoyi.ie.domain.AMarjorEnroll;
+import com.ruoyi.ie.service.IAMarjorEnrollService;
+
+/**
+ * 专业录取情况Service业务层处理
+ * 
+ * @author voluntary
+ * @date 2023-11-26
+ */
+@Service
+public class AMarjorEnrollServiceImpl implements IAMarjorEnrollService 
+{
+    @Autowired
+    private AMarjorEnrollMapper aMarjorEnrollMapper;
+
+    /**
+     * 查询专业录取情况
+     * 
+     * @param id 专业录取情况主键
+     * @return 专业录取情况
+     */
+    @Override
+    public AMarjorEnroll selectAMarjorEnrollById(Long id)
+    {
+        return aMarjorEnrollMapper.selectAMarjorEnrollById(id);
+    }
+
+    /**
+     * 查询专业录取情况列表
+     * 
+     * @param aMarjorEnroll 专业录取情况
+     * @return 专业录取情况
+     */
+    @Override
+    public List<AMarjorEnroll> selectAMarjorEnrollList(AMarjorEnroll aMarjorEnroll)
+    {
+        return aMarjorEnrollMapper.selectAMarjorEnrollList(aMarjorEnroll);
+    }
+
+    /**
+     * 新增专业录取情况
+     * 
+     * @param aMarjorEnroll 专业录取情况
+     * @return 结果
+     */
+    @Override
+    public int insertAMarjorEnroll(AMarjorEnroll aMarjorEnroll)
+    {
+        return aMarjorEnrollMapper.insertAMarjorEnroll(aMarjorEnroll);
+    }
+
+    /**
+     * 修改专业录取情况
+     * 
+     * @param aMarjorEnroll 专业录取情况
+     * @return 结果
+     */
+    @Override
+    public int updateAMarjorEnroll(AMarjorEnroll aMarjorEnroll)
+    {
+        return aMarjorEnrollMapper.updateAMarjorEnroll(aMarjorEnroll);
+    }
+
+    /**
+     * 批量删除专业录取情况
+     * 
+     * @param ids 需要删除的专业录取情况主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAMarjorEnrollByIds(Long[] ids)
+    {
+        return aMarjorEnrollMapper.deleteAMarjorEnrollByIds(ids);
+    }
+
+    /**
+     * 删除专业录取情况信息
+     * 
+     * @param id 专业录取情况主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAMarjorEnrollById(Long id)
+    {
+        return aMarjorEnrollMapper.deleteAMarjorEnrollById(id);
+    }
+}

ie-system/src/main/java/com/ruoyi/ie/service/impl/AMarjorPlanServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.ie.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.ie.mapper.AMarjorPlanMapper;
+import com.ruoyi.ie.domain.AMarjorPlan;
+import com.ruoyi.ie.service.IAMarjorPlanService;
+
+/**
+ * 专业计划要求Service业务层处理
+ * 
+ * @author voluntary
+ * @date 2023-11-26
+ */
+@Service
+public class AMarjorPlanServiceImpl implements IAMarjorPlanService 
+{
+    @Autowired
+    private AMarjorPlanMapper aMarjorPlanMapper;
+
+    /**
+     * 查询专业计划要求
+     * 
+     * @param id 专业计划要求主键
+     * @return 专业计划要求
+     */
+    @Override
+    public AMarjorPlan selectAMarjorPlanById(Long id)
+    {
+        return aMarjorPlanMapper.selectAMarjorPlanById(id);
+    }
+
+    /**
+     * 查询专业计划要求列表
+     * 
+     * @param aMarjorPlan 专业计划要求
+     * @return 专业计划要求
+     */
+    @Override
+    public List<AMarjorPlan> selectAMarjorPlanList(AMarjorPlan aMarjorPlan)
+    {
+        return aMarjorPlanMapper.selectAMarjorPlanList(aMarjorPlan);
+    }
+
+    /**
+     * 新增专业计划要求
+     * 
+     * @param aMarjorPlan 专业计划要求
+     * @return 结果
+     */
+    @Override
+    public int insertAMarjorPlan(AMarjorPlan aMarjorPlan)
+    {
+        return aMarjorPlanMapper.insertAMarjorPlan(aMarjorPlan);
+    }
+
+    /**
+     * 修改专业计划要求
+     * 
+     * @param aMarjorPlan 专业计划要求
+     * @return 结果
+     */
+    @Override
+    public int updateAMarjorPlan(AMarjorPlan aMarjorPlan)
+    {
+        return aMarjorPlanMapper.updateAMarjorPlan(aMarjorPlan);
+    }
+
+    /**
+     * 批量删除专业计划要求
+     * 
+     * @param ids 需要删除的专业计划要求主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAMarjorPlanByIds(Long[] ids)
+    {
+        return aMarjorPlanMapper.deleteAMarjorPlanByIds(ids);
+    }
+
+    /**
+     * 删除专业计划要求信息
+     * 
+     * @param id 专业计划要求主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAMarjorPlanById(Long id)
+    {
+        return aMarjorPlanMapper.deleteAMarjorPlanById(id);
+    }
+}

ie-system/src/main/java/com/ruoyi/ie/service/impl/AMarjorSubmitServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.ie.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.ie.mapper.AMarjorSubmitMapper;
+import com.ruoyi.ie.domain.AMarjorSubmit;
+import com.ruoyi.ie.service.IAMarjorSubmitService;
+
+/**
+ * 专业报名划线Service业务层处理
+ * 
+ * @author voluntary
+ * @date 2023-11-26
+ */
+@Service
+public class AMarjorSubmitServiceImpl implements IAMarjorSubmitService 
+{
+    @Autowired
+    private AMarjorSubmitMapper aMarjorSubmitMapper;
+
+    /**
+     * 查询专业报名划线
+     * 
+     * @param id 专业报名划线主键
+     * @return 专业报名划线
+     */
+    @Override
+    public AMarjorSubmit selectAMarjorSubmitById(Long id)
+    {
+        return aMarjorSubmitMapper.selectAMarjorSubmitById(id);
+    }
+
+    /**
+     * 查询专业报名划线列表
+     * 
+     * @param aMarjorSubmit 专业报名划线
+     * @return 专业报名划线
+     */
+    @Override
+    public List<AMarjorSubmit> selectAMarjorSubmitList(AMarjorSubmit aMarjorSubmit)
+    {
+        return aMarjorSubmitMapper.selectAMarjorSubmitList(aMarjorSubmit);
+    }
+
+    /**
+     * 新增专业报名划线
+     * 
+     * @param aMarjorSubmit 专业报名划线
+     * @return 结果
+     */
+    @Override
+    public int insertAMarjorSubmit(AMarjorSubmit aMarjorSubmit)
+    {
+        return aMarjorSubmitMapper.insertAMarjorSubmit(aMarjorSubmit);
+    }
+
+    /**
+     * 修改专业报名划线
+     * 
+     * @param aMarjorSubmit 专业报名划线
+     * @return 结果
+     */
+    @Override
+    public int updateAMarjorSubmit(AMarjorSubmit aMarjorSubmit)
+    {
+        return aMarjorSubmitMapper.updateAMarjorSubmit(aMarjorSubmit);
+    }
+
+    /**
+     * 批量删除专业报名划线
+     * 
+     * @param ids 需要删除的专业报名划线主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAMarjorSubmitByIds(Long[] ids)
+    {
+        return aMarjorSubmitMapper.deleteAMarjorSubmitByIds(ids);
+    }
+
+    /**
+     * 删除专业报名划线信息
+     * 
+     * @param id 专业报名划线主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAMarjorSubmitById(Long id)
+    {
+        return aMarjorSubmitMapper.deleteAMarjorSubmitById(id);
+    }
+}

ie-system/src/main/java/com/ruoyi/ie/service/impl/AWishRecordServiceImpl.java

@@ -0,0 +1,105 @@
+package com.ruoyi.ie.service.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.ie.mapper.AWishRecordMapper;
+import com.ruoyi.ie.domain.AWishRecord;
+import com.ruoyi.ie.service.IAWishRecordService;
+
+/**
+ * 志愿记录Service业务层处理
+ * 
+ * @author voluntary
+ * @date 2023-11-26
+ */
+@Service
+public class AWishRecordServiceImpl implements IAWishRecordService 
+{
+    @Autowired
+    private AWishRecordMapper aWishRecordMapper;
+
+    /**
+     * 查询志愿记录
+     * 
+     * @param id 志愿记录主键
+     * @return 志愿记录
+     */
+    @Override
+    public AWishRecord selectAWishRecordById(Long id)
+    {
+        return aWishRecordMapper.selectAWishRecordById(id);
+    }
+
+    /**
+     * 查询志愿记录列表
+     * 
+     * @param aWishRecord 志愿记录
+     * @return 志愿记录
+     */
+    @Override
+    public List<AWishRecord> selectAWishRecordList(AWishRecord aWishRecord)
+    {
+        return aWishRecordMapper.selectAWishRecordList(aWishRecord);
+    }
+
+    /**
+     * 新增志愿记录
+     * 
+     * @param aWishRecord 志愿记录
+     * @return 结果
+     */
+    @Override
+    public int insertAWishRecord(AWishRecord aWishRecord)
+    {
+        aWishRecord.setCreateTime(DateUtils.getNowDate());
+        return aWishRecordMapper.insertAWishRecord(aWishRecord);
+    }
+
+    /**
+     * 修改志愿记录
+     * 
+     * @param aWishRecord 志愿记录
+     * @return 结果
+     */
+    @Override
+    public int updateAWishRecord(AWishRecord aWishRecord)
+    {
+        aWishRecord.setUpdateTime(DateUtils.getNowDate());
+        return aWishRecordMapper.updateAWishRecord(aWishRecord);
+    }
+
+    /**
+     * 批量删除志愿记录
+     * 
+     * @param ids 需要删除的志愿记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAWishRecordByIds(Long[] ids)
+    {
+        return aWishRecordMapper.deleteAWishRecordByIds(ids);
+    }
+
+    @Override
+    public int deleteAWishRecordByMap(Map cond)
+    {
+        return aWishRecordMapper.deleteAWishRecordByMap(cond);
+    }
+
+
+    /**
+     * 删除志愿记录信息
+     * 
+     * @param id 志愿记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAWishRecordById(Long id)
+    {
+        return aWishRecordMapper.deleteAWishRecordById(id);
+    }
+}

ie-system/src/main/java/com/ruoyi/learn/domain/TestPaperVO.java

@@ -0,0 +1,89 @@
+package com.ruoyi.learn.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+public class TestPaperVO {
+    enum PaperBuildType {
+        Manual, Auto
+    }
+
+    @ApiModel("批量组卷请求")
+    @Data
+    public static class TestPapersBuildReq {
+        @ApiModelProperty("班级")
+        List<Long> classIds;
+        @ApiModelProperty("考生类型")
+        List<String> examTypes;
+        @ApiModelProperty("组卷类型")
+        PaperBuildType buildType;
+        @ApiModelProperty("定向类型 null是全部")
+        Boolean directType;
+        @ApiModelProperty("院校")
+        List<Long> universityIds;
+        @ApiModelProperty("专业组(单院校有效)")
+        List<String> groups;
+        @ApiModelProperty("科目")
+        List<Integer> subjectIds;
+        @ApiModelProperty("知识点")
+        List<Long> knowledgeIds;
+        @ApiModelProperty("题型要求")
+        Map<String, Integer> questionTypeNum;
+    }
+
+    @ApiModel("批量查询请求")
+    @Data
+    public static class TestPapersQueryReq {
+        @ApiModelProperty("测试卷批次")
+        Long batchId;
+        @ApiModelProperty("考生类型")
+        List<String> examTypes;
+        @ApiModelProperty("组卷类型")
+        PaperBuildType buildType;
+        @ApiModelProperty("发送情况")
+        Boolean publicType;
+
+        @ApiModelProperty("班级")
+        List<Long> classIds;
+        @ApiModelProperty("学生")
+        List<Long> studentIds;
+    }
+
+    @ApiModel("批量发布请求")
+    @Data
+    public static class TestPapersPublishReq {
+        @ApiModelProperty("测试卷批次")
+        Long batchId;
+        @ApiModelProperty("考生类型")
+        List<String> examTypes;
+        @ApiModelProperty("组卷类型")
+        PaperBuildType buildType;
+        @ApiModelProperty("定向类型 null是全部")
+        Boolean directType;
+        @ApiModelProperty("试卷ID")
+        Long paperId;
+
+        @ApiModelProperty("班级")
+        List<Long> classIds;
+        @ApiModelProperty("学生")
+        List<Long> studentIds;
+    }
+
+
+    @ApiModel("试卷发布请求")
+    @Data
+    public static class TestPaperPublishReq {
+        @ApiModelProperty("测试卷批次")
+        Long batchId;
+        @ApiModelProperty("试卷ID")
+        Long paperId;
+        @ApiModelProperty("班级")
+        List<Long> classIds;
+        @ApiModelProperty("学生")
+        List<Long> studentIds;
+    }
+}

ie-system/src/main/java/com/ruoyi/mxjb/domain/BBusiWishUniversityMarjorsCollege.java

@@ -0,0 +1,187 @@
+package com.ruoyi.mxjb.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 院校计划计划组对象 b_busi_wish_university_marjors_college
+ * 
+ * @author mingxue
+ * @date 2022-07-22
+ */
+public class BBusiWishUniversityMarjorsCollege extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 院校 */
+    @Excel(name = "院校")
+    private Long universityId;
+
+    /** 所在地 */
+    @Excel(name = "所在地")
+    private String location;
+
+    /** 年份 */
+    @Excel(name = "年份")
+    private String year;
+
+    /** 层次 */
+    @Excel(name = "层次")
+    private String level;
+
+    /** 科类： 1理科(物理)，0文科(历史), 2文理不分 */
+    @Excel(name = "科类： 1理科(物理)，0文科(历史), 2文理不分")
+    private Integer liberalScience;
+
+    /** 院校代码 */
+    @Excel(name = "院校代码")
+    private String collegeCode;
+
+    /** 专业数 */
+    @Excel(name = "专业数")
+    private Long marjorCount;
+
+    /** 计划数 */
+    @Excel(name = "计划数")
+    private Long planCount;
+
+    /** 录取最低分 */
+    @Excel(name = "录取最低分")
+    private Long score;
+
+    /** 状态(0:无效,1:有效) */
+    @Excel(name = "状态(0:无效,1:有效)")
+    private Integer status;
+
+    private SubmitYearsStats stats;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setUniversityId(Long universityId)
+    {
+        this.universityId = universityId;
+    }
+
+    public Long getUniversityId()
+    {
+        return universityId;
+    }
+    public void setLocation(String location) 
+    {
+        this.location = location;
+    }
+
+    public String getLocation() 
+    {
+        return location;
+    }
+    public void setYear(String year) 
+    {
+        this.year = year;
+    }
+
+    public String getYear() 
+    {
+        return year;
+    }
+    public void setLevel(String level) 
+    {
+        this.level = level;
+    }
+
+    public String getLevel() 
+    {
+        return level;
+    }
+    public void setLiberalScience(Integer liberalScience)
+    {
+        this.liberalScience = liberalScience;
+    }
+
+    public Integer getLiberalScience()
+    {
+        return liberalScience;
+    }
+    public void setCollegeCode(String collegeCode) 
+    {
+        this.collegeCode = collegeCode;
+    }
+
+    public String getCollegeCode() 
+    {
+        return collegeCode;
+    }
+    public void setMarjorCount(Long marjorCount) 
+    {
+        this.marjorCount = marjorCount;
+    }
+
+    public Long getMarjorCount() 
+    {
+        return marjorCount;
+    }
+    public void setPlanCount(Long planCount) 
+    {
+        this.planCount = planCount;
+    }
+
+    public Long getPlanCount() 
+    {
+        return planCount;
+    }
+    public void setScore(Long score) 
+    {
+        this.score = score;
+    }
+
+    public Long getScore() 
+    {
+        return score;
+    }
+    public void setStatus(Integer status) 
+    {
+        this.status = status;
+    }
+
+    public Integer getStatus() 
+    {
+        return status;
+    }
+    public void setStats(SubmitYearsStats stats) {
+        this.stats = stats;
+    }
+
+    public SubmitYearsStats getStats() {
+        return stats;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("universityId", getUniversityId())
+            .append("location", getLocation())
+            .append("year", getYear())
+            .append("level", getLevel())
+            .append("liberalScience", getLiberalScience())
+            .append("collegeCode", getCollegeCode())
+            .append("marjorCount", getMarjorCount())
+            .append("planCount", getPlanCount())
+            .append("score", getScore())
+            .append("createTime", getCreateTime())
+            .append("status", getStatus())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/mxjb/domain/BBusiWishUniversityMarjorsGroup.java

@@ -0,0 +1,136 @@
+package com.ruoyi.mxjb.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 院校专业分组跨年聚合对象 b_busi_wish_university_marjors_group
+ * 
+ * @author voluntary
+ * @date 2022-12-01
+ */
+public class BBusiWishUniversityMarjorsGroup extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /**  */
+    private Long groupId;
+
+    /** 院校 */
+    @Excel(name = "院校")
+    private Long universityId;
+
+    /** 所在地 */
+    @Excel(name = "所在地")
+    private String location;
+
+    /** 层次 */
+    @Excel(name = "层次")
+    private String level;
+
+    /** 科类： 1理科(物理)，0文科(历史), 2文理不分 */
+    @Excel(name = "科类： 1理科(物理)，0文科(历史), 2文理不分")
+    private Integer liberalScience;
+
+    /** 专业名 */
+    @Excel(name = "专业名")
+    private String marjorName;
+
+    /** 专业特征 */
+    @Excel(name = "专业特征")
+    private String marjorSpecial;
+
+    /** 状态(0:无效,1:有效) */
+    @Excel(name = "状态(0:无效,1:有效)")
+    private Long status;
+
+    public void setGroupId(Long groupId) 
+    {
+        this.groupId = groupId;
+    }
+
+    public Long getGroupId() 
+    {
+        return groupId;
+    }
+    public void setUniversityId(Long universityId)
+    {
+        this.universityId = universityId;
+    }
+
+    public Long getUniversityId()
+    {
+        return universityId;
+    }
+    public void setLocation(String location) 
+    {
+        this.location = location;
+    }
+
+    public String getLocation() 
+    {
+        return location;
+    }
+    public void setLevel(String level) 
+    {
+        this.level = level;
+    }
+
+    public String getLevel() 
+    {
+        return level;
+    }
+    public void setLiberalScience(Integer liberalScience)
+    {
+        this.liberalScience = liberalScience;
+    }
+
+    public Integer getLiberalScience()
+    {
+        return liberalScience;
+    }
+    public void setMarjorName(String marjorName) 
+    {
+        this.marjorName = marjorName;
+    }
+
+    public String getMarjorName() 
+    {
+        return marjorName;
+    }
+    public void setMarjorSpecial(String marjorSpecial) 
+    {
+        this.marjorSpecial = marjorSpecial;
+    }
+
+    public String getMarjorSpecial() 
+    {
+        return marjorSpecial;
+    }
+    public void setStatus(Long status) 
+    {
+        this.status = status;
+    }
+
+    public Long getStatus() 
+    {
+        return status;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("groupId", getGroupId())
+            .append("universityId", getUniversityId())
+            .append("location", getLocation())
+            .append("level", getLevel())
+            .append("liberalScience", getLiberalScience())
+            .append("marjorName", getMarjorName())
+            .append("marjorSpecial", getMarjorSpecial())
+            .append("createTime", getCreateTime())
+            .append("status", getStatus())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/mxjb/domain/BBusiWishUniversityMarjorsPlanSubmit.java

@@ -0,0 +1,240 @@
+package com.ruoyi.mxjb.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 院校计划历史对象 b_busi_wish_university_marjors_plan_submit
+ * 
+ * @author mingxue
+ * @date 2022-07-22
+ */
+public class BBusiWishUniversityMarjorsPlanSubmit extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long planId;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long submitId;
+
+    private Long groupId;
+
+    /** 院校 */
+    @Excel(name = "院校")
+    private Long universityId;
+
+    /** 所在地 */
+    @Excel(name = "所在地")
+    private String location;
+
+    /** 年份 */
+    @Excel(name = "年份")
+    private String year;
+
+    /** 院校代码 */
+    @Excel(name = "院校代码")
+    private String collegeCode;
+
+    /** 层次 */
+    @Excel(name = "层次")
+    private String level;
+
+    /** 科类： 1理科(物理)，0文科(历史), 2文理不分 */
+    @Excel(name = "科类： 1理科(物理)，0文科(历史), 2文理不分")
+    private Integer liberalScience;
+
+    /** 科目限制 */
+    @Excel(name = "科目限制")
+    private String course;
+
+    /** 科目主 */
+    @Excel(name = "科目主")
+    private String course0;
+
+    /** 科目或 */
+    @Excel(name = "科目或")
+    private String course1;
+
+    /** 科目与 */
+    @Excel(name = "科目与")
+    private String course2;
+
+    /** 专业名 */
+    @Excel(name = "专业名")
+    private String marjorName;
+
+    /** 专业组id */
+    @Excel(name = "专业组id")
+    private Long marjorCollegeId;
+
+    private SubmitYearsStats stats;
+
+    /** 状态(0:无效,1:有效) */
+    @Excel(name = "状态(0:无效,1:有效)")
+    private Integer status;
+
+    public void setPlanId(Long planId) 
+    {
+        this.planId = planId;
+    }
+
+    public Long getPlanId() 
+    {
+        return planId;
+    }
+    public void setSubmitId(Long submitId)
+    {
+        this.submitId = submitId;
+    }
+
+    public Long getSubmitId()
+    {
+        return submitId;
+    }
+    public void setGroupId(Long groupId) {
+        this.groupId = groupId;
+    }
+
+    public Long getGroupId() {
+        return groupId;
+    }
+    public void setUniversityId(Long universityId)
+    {
+        this.universityId = universityId;
+    }
+
+    public Long getUniversityId()
+    {
+        return universityId;
+    }
+    public void setLocation(String location) 
+    {
+        this.location = location;
+    }
+
+    public String getLocation() 
+    {
+        return location;
+    }
+    public void setYear(String year) 
+    {
+        this.year = year;
+    }
+
+    public String getYear() 
+    {
+        return year;
+    }
+    public void setCollegeCode(String collegeCode) 
+    {
+        this.collegeCode = collegeCode;
+    }
+
+    public String getCollegeCode() 
+    {
+        return collegeCode;
+    }
+    public void setLevel(String level) 
+    {
+        this.level = level;
+    }
+
+    public String getLevel() 
+    {
+        return level;
+    }
+    public void setLiberalScience(Integer liberalScience)
+    {
+        this.liberalScience = liberalScience;
+    }
+
+    public Integer getLiberalScience()
+    {
+        return liberalScience;
+    }
+    public void setCourse(String course) {
+        this.course = course;
+    }
+
+    public String getCourse() {
+        return course;
+    }
+    public void setCourse0(String course0) {
+        this.course0 = course0;
+    }
+
+    public String getCourse0() {
+        return course0;
+    }
+    public void setCourse1(String course1) {
+        this.course1 = course1;
+    }
+
+    public String getCourse1() {
+        return course1;
+    }
+    public void setCourse2(String course2) {
+        this.course2 = course2;
+    }
+
+    public String getCourse2() {
+        return course2;
+    }
+    public void setMarjorName(String marjorName)
+    {
+        this.marjorName = marjorName;
+    }
+
+    public String getMarjorName() 
+    {
+        return marjorName;
+    }
+    public void setMarjorCollegeId(Long marjorCollegeId) 
+    {
+        this.marjorCollegeId = marjorCollegeId;
+    }
+
+    public Long getMarjorCollegeId() 
+    {
+        return marjorCollegeId;
+    }
+    public void setStatus(Integer status) 
+    {
+        this.status = status;
+    }
+
+    public Integer getStatus() 
+    {
+        return status;
+    }
+    public void setStats(SubmitYearsStats stats) {
+        this.stats = stats;
+    }
+
+    public SubmitYearsStats getStats() {
+        return stats;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("planId", getPlanId())
+            .append("submitId", getSubmitId())
+            .append("universityId", getUniversityId())
+            .append("location", getLocation())
+            .append("year", getYear())
+            .append("collegeCode", getCollegeCode())
+            .append("level", getLevel())
+            .append("liberalScience", getLiberalScience())
+            .append("marjorName", getMarjorName())
+            .append("marjorCollegeId", getMarjorCollegeId())
+            .append("createTime", getCreateTime())
+            .append("status", getStatus())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/mxjb/domain/MxjbContants.java

@@ -0,0 +1,177 @@
+package com.ruoyi.mxjb.domain;
+
+import com.google.common.collect.Sets;
+import com.ruoyi.common.utils.StringUtils;
+
+import java.util.Set;
+
+public class MxjbContants {
+    public static final String FormTypeAddClassMaster = "AddClassMaster"; // 1
+    public static final String FormTypeUpdateClassMaster = "UpdateClassMaster"; // 2
+    public static final String FormTypeDelClassMaster = "DelClassMaster"; // 3
+    public static final String FormTypeAddClass = "AddClass"; // 11
+    public static final String FormTypeUpdateClass = "UpdateClass"; // 12
+    public static final String FormTypeDelClass = "DelClass"; // 13
+
+    public static final String FormAuditAuto = "Auto";
+    public static final String FormAuditSystem = "System";
+    public static final String FormAuditHeadMaster = "HeadMaster";
+
+
+    public static String FormStatusNone = "0";
+    public static String FormStatusAccept = "1";
+    public static String FormStatusReject = "2";
+    public static String FormStatusRecall = "3";
+
+
+    public static String ScoringTypeSelf = "1";
+    public static String ScoringTypeTeacher = "2";
+    public static String ScoringTypeAuto = "3";
+
+    public static String RoleKey_frontMaster = "frontMaster";
+    public static String RoleKey_frontTeacher = "frontTeacher";
+    public static String RoleKey_frontStudent = "frontStudent";
+
+    public static Integer User_None = 0;
+    public static Integer User_ClassMaster = 1;
+    public static Integer User_Teacher = 2;
+    public static Integer User_Student = 3;
+    public static Integer User_Competition = 12;
+
+    public static String Period_Primary = "primary";
+    public static String Period_Junior = "junior";
+    public static String Period_Senior = "senior";
+
+    public static Double ScoreRateLimit = 0.8;
+    public static Double ScoreRateSeg1 = 0.3;
+    public static Double ScoreRateSeg2 = 0.6;
+    public static Double ScoreRateSeg3 = 0.8;
+
+    public static Integer ScoreRatePSeg1 = 30;
+    public static Integer ScoreRatePSeg2 = 60;
+    public static Integer ScoreRatePSeg3 = 80;
+
+    public static String ScoreLevelRight = "R";
+    public static String ScoreLevelWrong = "W";
+    public static String ScoreLevelEmpty = "E";
+
+    public static String QuestionTypeChoose = "1";
+    public static String QuestionTypeMultiChoose = "3"; //
+    public static String QuestionTypeSubjective = "2";
+    public static String QuestionTypeMultiTotal = "4";
+    public static String QuestionTypeMultiScore = "5";
+    public static String QuestionTypeChooseCount = "6";
+    public static String QuestionTypeChooseScore = "7";
+    public static Long QuestionScoreWrong = 0L;
+    public static Long QuestionScoreRight = 1L;
+    public static Long QuestionScoreNone = 1L;
+
+    public static String CompQuesTypeQuestion = "question";
+    public static String CompQuesTypeVideo = "video";
+    public static String ExamineeTypeCompetitor = "competitor";
+    public static String ExamineeTypeEvaluation = "evaluation";
+    public static String ExamineeTypeAi = "ai";
+    public static String ExamineeTypeTest = "test";
+    public static String ExamineeTypeHomework = "homework";
+    public static String ExamineeTypeIe = "ie";
+
+    public static String ExamineeTypeEvalKey = "E";
+    public static String ExamineeTypeCompKey = "C";
+    public static String ExamineeTypeAiKey = "A";
+    public static String ExamineeTypeTestKey = "T";
+    public static String ExamineeTypeHomeworkKey = "H";
+    public static String ExamineeTypeIeKey = "I";
+    public static Integer ExamineeTypeEvalValue = 1;
+    public static Integer ExamineeTypeCompValue = 2;
+    public static Integer ExamineeTypeAiValue = 3;
+    public static Integer ExamineeTypeTestValue = 4;
+    public static Integer ExamineeTypeHomeworkValue = 5;
+    public static Integer ExamineeTypeIeValue = 6;
+
+    public static String StateTypeExaminee = "examinee_status";
+    public static String StateTypeEvaluation = "evaluation_status";
+
+    public static Long EvaluationClassTest = 1L;    // 未发布
+    public static Long EvaluationPersonTest = 3L;    // 个人测评
+
+    public static Long EvaluationStatusEdit = 1L;    // 未发布
+    public static Long EvaluationStatusPublish = 2L; // 已发布
+    public static Long EvaluationStatusOpen = 3L;    // 开启
+    public static Long EvaluationStatusSigning = 4L;
+    public static Long EvaluationStatusExamining = 5L;
+    public static Long EvaluationStatusScoring = 6L;
+    public static Long EvaluationStatusPublishScore = 7L;  // 发布成绩
+    public static Long EvaluationStatusClose = 8L; // 关闭
+
+    public static Long ExamineeStatusInit = 1L;
+    public static Long ExamineeStatusSign = 2L;
+    public static Long ExamineeStatusExamine = 3L;
+    public static Long ExamineeStatusCommit = 4L;
+    public static Long ExamineeStatusReview = 5L;
+    public static Long ExamineeStatusPublish = 6L;
+    public static Long ExamineeStatusClose = 7L;
+
+    public static String PaperTypeStandard = "standard";
+    public static String PaperTypeCustom = "custom";
+
+    public static String SubjectTypeSingle = "Single";
+    public static String SubjectTypeCombine = "Combine";
+
+    public static String SubjectLang = "L"; // 语
+    public static String SubjectMath = "M"; // 数
+    public static String SubjectEng = "E"; // 英
+    public static String SubjectPhy = "S"; // 物/理 Science
+    public static String SubjectChem = "C"; // 化
+    public static String SubjectBio = "B"; // 生
+    public static String SubjectGeo = "G"; // 地
+    public static String SubjectPolitics = "P"; // 政
+    public static String SubjectHistory = "H"; // 历
+
+    public static Integer Ali_Id_dezhi = 1;                 //
+    public static Integer Ali_Id_sygh = 2;                  //
+    public static Integer Ali_Id_mxapp =3;                  // app视频
+    public static Integer Ali_Id_question = 4;              // 题视频
+    public static Integer Ali_Id_resource_person = 5;       // 个人资源库
+    public static Integer Ali_Id_resource_school = 6;       // 学校资源库
+    public static Integer Ali_Id_resource_cloud = 7;        // 云资源库
+    public static Integer Ali_Id_resource_board = 8;        // 班级board
+    public static Integer Ali_Id_resource_student = 9;      // 学生资源
+    public static Integer Ali_Id_resource_ai = 10;      // AI视频
+    public static Integer Ali_Id_voluntary_course = 11;      // 志愿课堂
+
+    public static final Set<String> InvalidScoreLevelSet = Sets.newHashSet(MxjbContants.ScoreLevelEmpty, MxjbContants.ScoreLevelWrong);
+
+    public static String getExamineeTypeKey(Integer examineeType) {
+        if (ExamineeTypeCompValue.equals(examineeType)) {
+            return ExamineeTypeCompKey;
+        } else if (ExamineeTypeAiValue.equals(examineeType)) {
+            return ExamineeTypeAiKey;
+        } else if (ExamineeTypeTestValue.equals(examineeType)) {
+            return ExamineeTypeTestKey;
+        } else if (ExamineeTypeHomeworkValue.equals(examineeType)) {
+            return ExamineeTypeHomeworkKey;
+        } else if (ExamineeTypeIeValue.equals(examineeType)) {
+            return ExamineeTypeIeKey;
+        }
+        return ExamineeTypeEvalKey;
+    }
+
+    public static String getExamineeTypeKey(String examineeType) {
+        if (ExamineeTypeCompetitor.equals(examineeType)) {
+            return ExamineeTypeCompKey;
+        } else if (ExamineeTypeAi.equals(examineeType)) {
+            return ExamineeTypeAiKey;
+        } else if (ExamineeTypeTest.equals(examineeType)) {
+            return ExamineeTypeTestKey;
+        } else if (ExamineeTypeHomework.equals(examineeType)) {
+            return ExamineeTypeHomeworkKey;
+        } else if (ExamineeTypeIe.equals(examineeType)) {
+            return ExamineeTypeIeKey;
+        }
+        return ExamineeTypeEvalKey;
+    }
+
+    public static String getNormalAnswer(String answer, String defValue) {
+        return StringUtils.isNotBlank(answer) ? StringUtils.splitByWholeSeparatorPreserveAllTokens(answer, "$@")[0] : defValue;
+    }
+}

ie-system/src/main/java/com/ruoyi/mxjb/domain/MxjbWishScoreRate.java

@@ -0,0 +1,107 @@
+package com.ruoyi.mxjb.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * mxjbWishScoreRate对象 mxjb_wish_score_rate
+ * 
+ * @author voluntary
+ * @date 2023-02-05
+ */
+public class MxjbWishScoreRate extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 年度 */
+    @Excel(name = "年度")
+    private Integer year;
+
+    /** 偏差值 */
+    @Excel(name = "偏差值")
+    private Integer diff;
+
+    /** 0 冲 1 稳 2 保 */
+    @Excel(name = "0 冲 1 稳 2 保")
+    private Integer enrollLevel;
+
+    /** 概率 */
+    @Excel(name = "概率")
+    private Integer ratio;
+
+    /** 极高, 中等, 较低, 较小 */
+    @Excel(name = "极高, 中等, 较低, 较小")
+    private String riskLevel;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setYear(Integer year) 
+    {
+        this.year = year;
+    }
+
+    public Integer getYear() 
+    {
+        return year;
+    }
+    public void setDiff(Integer diff) 
+    {
+        this.diff = diff;
+    }
+
+    public Integer getDiff() 
+    {
+        return diff;
+    }
+    public void setEnrollLevel(Integer enrollLevel) 
+    {
+        this.enrollLevel = enrollLevel;
+    }
+
+    public Integer getEnrollLevel() 
+    {
+        return enrollLevel;
+    }
+    public void setRatio(Integer ratio) 
+    {
+        this.ratio = ratio;
+    }
+
+    public Integer getRatio() 
+    {
+        return ratio;
+    }
+    public void setRiskLevel(String riskLevel) 
+    {
+        this.riskLevel = riskLevel;
+    }
+
+    public String getRiskLevel() 
+    {
+        return riskLevel;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("year", getYear())
+            .append("diff", getDiff())
+            .append("enrollLevel", getEnrollLevel())
+            .append("ratio", getRatio())
+            .append("riskLevel", getRiskLevel())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/mxjb/domain/SubmitYearsStats.java

@@ -0,0 +1,24 @@
+package com.ruoyi.mxjb.domain;
+
+import lombok.Data;
+
+@Data
+public class SubmitYearsStats {
+    Integer year;
+    YearStat[] stats;
+
+    @Data
+    public static class YearStat {
+        Integer year;
+        Long submitId;
+        Long score;
+        Long seat;
+        Long corrScore;
+        Long corrSeat;
+        Long numReal;
+        Boolean collect;
+        String collectDesc;
+        Boolean sinoForeign;
+        String sinoForeignDesc;
+    }
+}

ie-system/src/main/java/com/ruoyi/mxjb/handlers/SubmitYearsStatsHandler.java

@@ -0,0 +1,80 @@
+package com.ruoyi.mxjb.handlers;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.Maps;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.mxjb.domain.SubmitYearsStats;
+import org.apache.ibatis.type.JdbcType;
+import org.apache.ibatis.type.MappedJdbcTypes;
+import org.apache.ibatis.type.MappedTypes;
+import org.apache.ibatis.type.TypeHandler;
+
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Map;
+
+@MappedJdbcTypes(value = {JdbcType.VARCHAR, JdbcType.NULL})
+@MappedTypes(SubmitYearsStats.class)
+public class SubmitYearsStatsHandler implements TypeHandler<SubmitYearsStats> {
+    private static ObjectMapper om = new ObjectMapper();
+    static {
+        om.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+        om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+    }
+
+    @Override
+    public void setParameter(PreparedStatement preparedStatement, int i, SubmitYearsStats stats, JdbcType jdbcType) throws SQLException {
+        try {
+            preparedStatement.setString(i, null == stats ? null : om.writeValueAsString(stats));
+        } catch (JsonProcessingException e) {
+            preparedStatement.setString(i, null);
+        }
+    }
+
+    @Override
+    public SubmitYearsStats getResult(ResultSet resultSet, String s) throws SQLException {
+        return toObject(resultSet.getString(s));
+    }
+
+    @Override
+    public SubmitYearsStats getResult(ResultSet resultSet, int i) throws SQLException {
+        return toObject(resultSet.getString(i));
+    }
+
+    @Override
+    public SubmitYearsStats getResult(CallableStatement callableStatement, int i) throws SQLException {
+        return toObject(callableStatement.getString(i));
+    }
+
+    private SubmitYearsStats toObject(String s) {
+        if(StringUtils.isNotBlank(s) ) {
+            try {
+                SubmitYearsStats yearStats = om.readValue(s, SubmitYearsStats.class);
+                SubmitYearsStats.YearStat[] stats = yearStats.getStats();
+                if (null != stats[0].getYear()) {
+                    Integer minYear = yearStats.getYear();
+                    Map<Integer, SubmitYearsStats.YearStat> statMap = Maps.newHashMap();
+                    for (SubmitYearsStats.YearStat ys : stats) {
+                        statMap.put(ys.getYear(), ys);
+                        minYear = Math.min(minYear, ys.getYear());
+                    }
+                    Integer cnt = Math.max(yearStats.getYear() - minYear, 4);
+                    SubmitYearsStats.YearStat[] newStats = new SubmitYearsStats.YearStat[cnt];
+                    for (int i = 0; i < cnt; i++) {
+                        newStats[i] = statMap.get(yearStats.getYear() - i);
+                    }
+                    yearStats.setStats(newStats);
+                }
+                return yearStats;
+            } catch (JsonProcessingException e) {
+
+            }
+        }
+        return null;
+    }
+}

ie-system/src/main/java/com/ruoyi/mxjb/mapper/BBusiWishUniversityMarjorsCollegeMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.mxjb.mapper;
+
+import java.util.List;
+import com.ruoyi.mxjb.domain.BBusiWishUniversityMarjorsCollege;
+
+/**
+ * 院校计划计划组Mapper接口
+ * 
+ * @author mingxue
+ * @date 2022-07-22
+ */
+public interface BBusiWishUniversityMarjorsCollegeMapper 
+{
+    /**
+     * 查询院校计划计划组
+     * 
+     * @param id 院校计划计划组ID
+     * @return 院校计划计划组
+     */
+    public BBusiWishUniversityMarjorsCollege selectBBusiWishUniversityMarjorsCollegeById(Long id);
+
+    /**
+     * 查询院校计划计划组列表
+     * 
+     * @param bBusiWishUniversityMarjorsCollege 院校计划计划组
+     * @return 院校计划计划组集合
+     */
+    public List<BBusiWishUniversityMarjorsCollege> selectBBusiWishUniversityMarjorsCollegeList(BBusiWishUniversityMarjorsCollege bBusiWishUniversityMarjorsCollege);
+
+    /**
+     * 新增院校计划计划组
+     * 
+     * @param bBusiWishUniversityMarjorsCollege 院校计划计划组
+     * @return 结果
+     */
+    public int insertBBusiWishUniversityMarjorsCollege(BBusiWishUniversityMarjorsCollege bBusiWishUniversityMarjorsCollege);
+
+    /**
+     * 修改院校计划计划组
+     * 
+     * @param bBusiWishUniversityMarjorsCollege 院校计划计划组
+     * @return 结果
+     */
+    public int updateBBusiWishUniversityMarjorsCollege(BBusiWishUniversityMarjorsCollege bBusiWishUniversityMarjorsCollege);
+
+    /**
+     * 删除院校计划计划组
+     * 
+     * @param id 院校计划计划组ID
+     * @return 结果
+     */
+    public int deleteBBusiWishUniversityMarjorsCollegeById(Long id);
+
+    /**
+     * 批量删除院校计划计划组
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteBBusiWishUniversityMarjorsCollegeByIds(Long[] ids);
+}

ie-system/src/main/java/com/ruoyi/mxjb/mapper/BBusiWishUniversityMarjorsGroupMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.mxjb.mapper;
+
+import java.util.List;
+import com.ruoyi.mxjb.domain.BBusiWishUniversityMarjorsGroup;
+
+/**
+ * 院校专业分组跨年聚合Mapper接口
+ * 
+ * @author voluntary
+ * @date 2022-12-01
+ */
+public interface BBusiWishUniversityMarjorsGroupMapper 
+{
+    /**
+     * 查询院校专业分组跨年聚合
+     * 
+     * @param groupId 院校专业分组跨年聚合主键
+     * @return 院校专业分组跨年聚合
+     */
+    public BBusiWishUniversityMarjorsGroup selectBBusiWishUniversityMarjorsGroupByGroupId(Long groupId);
+
+    /**
+     * 查询院校专业分组跨年聚合列表
+     * 
+     * @param bBusiWishUniversityMarjorsGroup 院校专业分组跨年聚合
+     * @return 院校专业分组跨年聚合集合
+     */
+    public List<BBusiWishUniversityMarjorsGroup> selectBBusiWishUniversityMarjorsGroupList(BBusiWishUniversityMarjorsGroup bBusiWishUniversityMarjorsGroup);
+
+    /**
+     * 新增院校专业分组跨年聚合
+     * 
+     * @param bBusiWishUniversityMarjorsGroup 院校专业分组跨年聚合
+     * @return 结果
+     */
+    public int insertBBusiWishUniversityMarjorsGroup(BBusiWishUniversityMarjorsGroup bBusiWishUniversityMarjorsGroup);
+
+    /**
+     * 修改院校专业分组跨年聚合
+     * 
+     * @param bBusiWishUniversityMarjorsGroup 院校专业分组跨年聚合
+     * @return 结果
+     */
+    public int updateBBusiWishUniversityMarjorsGroup(BBusiWishUniversityMarjorsGroup bBusiWishUniversityMarjorsGroup);
+
+    /**
+     * 删除院校专业分组跨年聚合
+     * 
+     * @param groupId 院校专业分组跨年聚合主键
+     * @return 结果
+     */
+    public int deleteBBusiWishUniversityMarjorsGroupByGroupId(Long groupId);
+
+    /**
+     * 批量删除院校专业分组跨年聚合
+     * 
+     * @param groupIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteBBusiWishUniversityMarjorsGroupByGroupIds(Long[] groupIds);
+}

ie-system/src/main/java/com/ruoyi/mxjb/mapper/BBusiWishUniversityMarjorsPlanSubmitMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.mxjb.mapper;
+
+import com.ruoyi.mxjb.domain.BBusiWishUniversityMarjorsPlanSubmit;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 院校计划历史Mapper接口
+ * 
+ * @author mingxue
+ * @date 2022-07-22
+ */
+public interface BBusiWishUniversityMarjorsPlanSubmitMapper 
+{
+    /**
+     * 查询院校计划历史
+     * 
+     * @param planId 院校计划历史ID
+     * @return 院校计划历史
+     */
+    public BBusiWishUniversityMarjorsPlanSubmit selectBBusiWishUniversityMarjorsPlanSubmitById(Long planId);
+    public List<BBusiWishUniversityMarjorsPlanSubmit> selectBBusiWishUniversityMarjorsPlanSubmitByIds(Collection<Long> planIds);
+    /**
+     * 查询院校计划历史列表
+     * 
+     * @param bBusiWishUniversityMarjorsPlanSubmit 院校计划历史
+     * @return 院校计划历史集合
+     */
+    public List<BBusiWishUniversityMarjorsPlanSubmit> selectBBusiWishUniversityMarjorsPlanSubmitList(BBusiWishUniversityMarjorsPlanSubmit bBusiWishUniversityMarjorsPlanSubmit);
+
+    /**
+     * 新增院校计划历史
+     * 
+     * @param bBusiWishUniversityMarjorsPlanSubmit 院校计划历史
+     * @return 结果
+     */
+    public int insertBBusiWishUniversityMarjorsPlanSubmit(BBusiWishUniversityMarjorsPlanSubmit bBusiWishUniversityMarjorsPlanSubmit);
+
+    /**
+     * 修改院校计划历史
+     * 
+     * @param bBusiWishUniversityMarjorsPlanSubmit 院校计划历史
+     * @return 结果
+     */
+    public int updateBBusiWishUniversityMarjorsPlanSubmit(BBusiWishUniversityMarjorsPlanSubmit bBusiWishUniversityMarjorsPlanSubmit);
+
+    /**
+     * 删除院校计划历史
+     * 
+     * @param planId 院校计划历史ID
+     * @return 结果
+     */
+    public int deleteBBusiWishUniversityMarjorsPlanSubmitById(Long planId);
+
+    /**
+     * 批量删除院校计划历史
+     * 
+     * @param planIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteBBusiWishUniversityMarjorsPlanSubmitByIds(Long[] planIds);
+}

ie-system/src/main/java/com/ruoyi/mxjb/mapper/MxjbWishScoreRateMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.mxjb.mapper;
+
+import java.util.List;
+import com.ruoyi.mxjb.domain.MxjbWishScoreRate;
+
+/**
+ * mxjbWishScoreRateMapper接口
+ * 
+ * @author voluntary
+ * @date 2023-02-05
+ */
+public interface MxjbWishScoreRateMapper 
+{
+    /**
+     * 查询mxjbWishScoreRate
+     * 
+     * @param id mxjbWishScoreRate主键
+     * @return mxjbWishScoreRate
+     */
+    public MxjbWishScoreRate selectMxjbWishScoreRateById(Long id);
+
+    /**
+     * 查询mxjbWishScoreRate列表
+     * 
+     * @param mxjbWishScoreRate mxjbWishScoreRate
+     * @return mxjbWishScoreRate集合
+     */
+    public List<MxjbWishScoreRate> selectMxjbWishScoreRateList(MxjbWishScoreRate mxjbWishScoreRate);
+
+    /**
+     * 新增mxjbWishScoreRate
+     * 
+     * @param mxjbWishScoreRate mxjbWishScoreRate
+     * @return 结果
+     */
+    public int insertMxjbWishScoreRate(MxjbWishScoreRate mxjbWishScoreRate);
+
+    /**
+     * 修改mxjbWishScoreRate
+     * 
+     * @param mxjbWishScoreRate mxjbWishScoreRate
+     * @return 结果
+     */
+    public int updateMxjbWishScoreRate(MxjbWishScoreRate mxjbWishScoreRate);
+
+    /**
+     * 删除mxjbWishScoreRate
+     * 
+     * @param id mxjbWishScoreRate主键
+     * @return 结果
+     */
+    public int deleteMxjbWishScoreRateById(Long id);
+
+    /**
+     * 批量删除mxjbWishScoreRate
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteMxjbWishScoreRateByIds(Long[] ids);
+}

ie-system/src/main/java/com/ruoyi/mxjb/service/IMxjbWishScoreRateService.java

@@ -0,0 +1,66 @@
+package com.ruoyi.mxjb.service;
+
+import com.ruoyi.mxjb.domain.MxjbWishScoreRate;
+import com.ruoyi.mxjb.service.impl.MxjbWishScoreRateServiceImpl;
+
+import java.util.List;
+
+/**
+ * mxjbWishScoreRateService接口
+ * 
+ * @author voluntary
+ * @date 2023-02-05
+ */
+public interface IMxjbWishScoreRateService 
+{
+	Integer[] getWishScoreRatioRanges(Integer year, Integer selfScore);
+    MxjbWishScoreRateServiceImpl.ScoreRatioResult getWishScoreRatioResult(Integer year, Integer selfScore, Integer targetScore);
+
+    /**
+     * 查询mxjbWishScoreRate
+     * 
+     * @param id mxjbWishScoreRate主键
+     * @return mxjbWishScoreRate
+     */
+    public MxjbWishScoreRate selectMxjbWishScoreRateById(Long id);
+
+    /**
+     * 查询mxjbWishScoreRate列表
+     * 
+     * @param mxjbWishScoreRate mxjbWishScoreRate
+     * @return mxjbWishScoreRate集合
+     */
+    public List<MxjbWishScoreRate> selectMxjbWishScoreRateList(MxjbWishScoreRate mxjbWishScoreRate);
+
+    /**
+     * 新增mxjbWishScoreRate
+     * 
+     * @param mxjbWishScoreRate mxjbWishScoreRate
+     * @return 结果
+     */
+    public int insertMxjbWishScoreRate(MxjbWishScoreRate mxjbWishScoreRate);
+
+    /**
+     * 修改mxjbWishScoreRate
+     * 
+     * @param mxjbWishScoreRate mxjbWishScoreRate
+     * @return 结果
+     */
+    public int updateMxjbWishScoreRate(MxjbWishScoreRate mxjbWishScoreRate);
+
+    /**
+     * 批量删除mxjbWishScoreRate
+     * 
+     * @param ids 需要删除的mxjbWishScoreRate主键集合
+     * @return 结果
+     */
+    public int deleteMxjbWishScoreRateByIds(Long[] ids);
+
+    /**
+     * 删除mxjbWishScoreRate信息
+     * 
+     * @param id mxjbWishScoreRate主键
+     * @return 结果
+     */
+    public int deleteMxjbWishScoreRateById(Long id);
+}

ie-system/src/main/java/com/ruoyi/mxjb/service/impl/MxjbWishScoreRateServiceImpl.java

@@ -0,0 +1,203 @@
+package com.ruoyi.mxjb.service.impl;
+
+import com.google.common.collect.Maps;
+import com.ruoyi.mxjb.domain.MxjbWishScoreRate;
+import com.ruoyi.mxjb.mapper.MxjbWishScoreRateMapper;
+import com.ruoyi.mxjb.service.IMxjbWishScoreRateService;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * mxjbWishScoreRateService业务层处理
+ * 
+ * @author voluntary
+ * @date 2023-02-05
+ */
+@Service
+public class MxjbWishScoreRateServiceImpl implements IMxjbWishScoreRateService 
+{
+    private final MxjbWishScoreRateMapper mxjbWishScoreRateMapper;
+    // [Level=冲的最大Diff, 冲的最低Diff, 稳的最低Diff, 保的最低Diff, Rate>=99的最高Diff, Rate<=1的最小Diff]
+	private Map<Integer, Integer[]> wishScoreRangeMap = Maps.newHashMap();
+    // key is year, key2 is diff, key3 is Enroll/Ratio/Risk
+    private Map<Integer, Map<Integer, ScoreRatioResult>> yearDiffRateMap = Maps.newHashMap();
+
+
+    public MxjbWishScoreRateServiceImpl(MxjbWishScoreRateMapper mxjbWishScoreRateMapper) {
+        this.mxjbWishScoreRateMapper = mxjbWishScoreRateMapper;
+        refresh();
+    }
+
+    @AllArgsConstructor
+    @NoArgsConstructor
+    @Data
+    public static class ScoreRatioResult {
+        private Integer diff;
+        private Integer enrollLevel;
+        private Integer overflow = 0; // 1 0%, 0 正常 -1 100%
+        private Integer ratio;
+        private String riskLevel;
+    }
+
+    /**
+     *
+     * @param year
+     * @param selfScore
+     * @return [Level=冲的最大值, 冲的最低值, 稳的最低值, 保的最低值, Rate>=99的最高值, Rate<=1的最小值]
+     */
+    @Override
+    public Integer[] getWishScoreRatioRanges(Integer year, Integer selfScore) {
+        Integer[] ranges = wishScoreRangeMap.get(year); // 最高分加一分，需要闭区间
+        return null != ranges ? new Integer[] {ranges[0] + selfScore + 1, ranges[1] + selfScore, ranges[2] + selfScore, ranges[3] + selfScore, ranges[4] + selfScore, ranges[5] + selfScore } : null;
+    }
+
+    @Override
+    public ScoreRatioResult getWishScoreRatioResult(Integer year, Integer selfScore, Integer targetScore) {
+        if (targetScore <= 0) {
+            return null;
+        }
+        Integer diff = targetScore - selfScore;
+        Integer[] ranges = wishScoreRangeMap.get(year); // [Level=冲的最大Diff, 冲的最低Diff, 稳的最低Diff, 保的最低Diff, Rate>=99的最高Diff, Rate<=1的最小Diff]
+        Map<Integer, ScoreRatioResult> diffRateMap = yearDiffRateMap.get(year);
+        if (null == ranges || null == diffRateMap) {
+            return null;
+        }
+        if (diff < ranges[3]) { // 超时最大最小值算 超  0
+            return diffRateMap.get(ranges[3] - 100);
+        } else if (diff > ranges[0]) { // 100
+            return diffRateMap.get(ranges[0] + 100);
+        }
+        return diffRateMap.get(diff);
+    }
+
+    private void refresh() {
+        Map<Integer, Integer[]> tmpWishScoreRangeMap = Maps.newHashMap();
+        Map<Integer, Map<Integer, ScoreRatioResult>> tmpYearDiffRateMap = Maps.newHashMap();
+        mxjbWishScoreRateMapper.selectMxjbWishScoreRateList(new MxjbWishScoreRate()).forEach(t -> {
+            Integer[] scoreRanges = tmpWishScoreRangeMap.get(t.getYear());
+            if (null == scoreRanges) {
+                scoreRanges = new Integer[6]; // [Level=冲的最大Diff, 冲的最低Diff, 稳的最低Diff, 保的最低Diff, Rate>=99的最高Diff, Rate<=1的最小Diff]
+                tmpWishScoreRangeMap.put(t.getYear(), scoreRanges);
+            }
+            if (t.getRatio() <= 2) {
+                if (null == scoreRanges[5] || t.getDiff() < scoreRanges[5]) {
+                    scoreRanges[5] = t.getDiff();
+                }
+            } else if (t.getRatio() >= 98 && (null == scoreRanges[4] || t.getDiff() > scoreRanges[4])) {
+                scoreRanges[4] = t.getDiff();
+            }
+            if (t.getEnrollLevel().equals(0) && (null == scoreRanges[0] || t.getDiff() > scoreRanges[0])) {
+                scoreRanges[0] = t.getDiff();
+            }
+            Integer index = t.getEnrollLevel() + 1;
+            if (null == scoreRanges[index] || t.getDiff() < scoreRanges[index]) {
+                scoreRanges[index] = t.getDiff();
+            }
+            Map<Integer, ScoreRatioResult> diffRateMap = tmpYearDiffRateMap.get(t.getYear());
+            if (null == diffRateMap) {
+                diffRateMap = Maps.newHashMap();
+                tmpYearDiffRateMap.put(t.getYear(), diffRateMap);
+            }
+            diffRateMap.put(t.getDiff(), new ScoreRatioResult(t.getDiff(), t.getEnrollLevel(), 0, t.getRatio(), t.getRiskLevel()));
+        });
+        for (Integer year : tmpYearDiffRateMap.keySet()) {
+            Integer[] scoreRanges = tmpWishScoreRangeMap.get(year);
+            Map<Integer, ScoreRatioResult> diffRateMap = tmpYearDiffRateMap.get(year);
+            // 高于冲的最大Diff的设置特殊值
+            ScoreRatioResult result = diffRateMap.get(scoreRanges[0]);
+            Integer diff = scoreRanges[0] + 100;
+            diffRateMap.put(diff, new ScoreRatioResult(scoreRanges[0], result.enrollLevel, 1, 1, result.getRiskLevel()));
+            // 小于保的最小Diff的设置特殊值
+            result = diffRateMap.get(scoreRanges[3]);
+            diff = scoreRanges[3] - 100;
+            diffRateMap.put(diff, new ScoreRatioResult(scoreRanges[3], result.enrollLevel, -1, 99, result.getRiskLevel()));
+        }
+        yearDiffRateMap.putAll(tmpYearDiffRateMap);
+        wishScoreRangeMap.putAll(tmpWishScoreRangeMap);
+    }
+
+    /**
+     * 查询mxjbWishScoreRate
+     * 
+     * @param id mxjbWishScoreRate主键
+     * @return mxjbWishScoreRate
+     */
+    @Override
+    public MxjbWishScoreRate selectMxjbWishScoreRateById(Long id)
+    {
+        return mxjbWishScoreRateMapper.selectMxjbWishScoreRateById(id);
+    }
+
+    /**
+     * 查询mxjbWishScoreRate列表
+     * 
+     * @param mxjbWishScoreRate mxjbWishScoreRate
+     * @return mxjbWishScoreRate
+     */
+    @Override
+    public List<MxjbWishScoreRate> selectMxjbWishScoreRateList(MxjbWishScoreRate mxjbWishScoreRate)
+    {
+        return mxjbWishScoreRateMapper.selectMxjbWishScoreRateList(mxjbWishScoreRate);
+    }
+
+    /**
+     * 新增mxjbWishScoreRate
+     * 
+     * @param mxjbWishScoreRate mxjbWishScoreRate
+     * @return 结果
+     */
+    @Override
+    public int insertMxjbWishScoreRate(MxjbWishScoreRate mxjbWishScoreRate)
+    {
+        int iRet = mxjbWishScoreRateMapper.insertMxjbWishScoreRate(mxjbWishScoreRate);
+        refresh();
+        return iRet;
+    }
+
+    /**
+     * 修改mxjbWishScoreRate
+     * 
+     * @param mxjbWishScoreRate mxjbWishScoreRate
+     * @return 结果
+     */
+    @Override
+    public int updateMxjbWishScoreRate(MxjbWishScoreRate mxjbWishScoreRate)
+    {
+        int iRet = mxjbWishScoreRateMapper.updateMxjbWishScoreRate(mxjbWishScoreRate);
+        refresh();
+        return iRet;
+    }
+
+    /**
+     * 批量删除mxjbWishScoreRate
+     * 
+     * @param ids 需要删除的mxjbWishScoreRate主键
+     * @return 结果
+     */
+    @Override
+    public int deleteMxjbWishScoreRateByIds(Long[] ids)
+    {
+        int iRet = mxjbWishScoreRateMapper.deleteMxjbWishScoreRateByIds(ids);
+        refresh();
+        return iRet;
+    }
+
+    /**
+     * 删除mxjbWishScoreRate信息
+     * 
+     * @param id mxjbWishScoreRate主键
+     * @return 结果
+     */
+    @Override
+    public int deleteMxjbWishScoreRateById(Long id)
+    {
+        int iRet = mxjbWishScoreRateMapper.deleteMxjbWishScoreRateById(id);
+        refresh();
+        return iRet;
+    }
+}

ie-system/src/main/java/com/ruoyi/mxjb/util/DataLocker.java

@@ -0,0 +1,53 @@
+package com.ruoyi.mxjb.util;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.Semaphore;
+
+public class DataLocker {
+    private Map<Long, SemaphoreDataLocker> concurrentSemaphoreMap = Collections.synchronizedMap(new HashMap());
+
+
+    /**
+     * 获取临界区，并记录申请的个数
+     *
+     * @param id
+     * @return
+     */
+    public SemaphoreDataLocker getSemaphore(Long id) {
+        synchronized (concurrentSemaphoreMap) {
+            SemaphoreDataLocker semaphoreWithCount = concurrentSemaphoreMap.get(id);
+            if (semaphoreWithCount == null) {
+                semaphoreWithCount = new SemaphoreDataLocker(id);
+                concurrentSemaphoreMap.put(id, semaphoreWithCount);
+            } else {
+                semaphoreWithCount.count++;
+            }
+            return semaphoreWithCount;
+        }
+    }
+
+    public void freeSemaphore(SemaphoreDataLocker semaphoreWithCount) {
+        if (null == semaphoreWithCount) {
+            return;
+        }
+        synchronized (concurrentSemaphoreMap) {
+            semaphoreWithCount.count--;
+            if (0 == semaphoreWithCount.count) {
+                concurrentSemaphoreMap.remove(semaphoreWithCount.id);
+            }
+        }
+    }
+
+    public static class SemaphoreDataLocker extends Semaphore {
+        Long id;
+        Integer count;
+
+        public SemaphoreDataLocker(Long id) {
+            super(1);
+            this.count = 1;
+            this.id = id;
+        }
+    }
+}

ie-system/src/main/java/com/ruoyi/sy/domain/SyKnowledgeInterstMajor.java

@@ -0,0 +1,79 @@
+package com.ruoyi.sy.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 知识兴趣测评对象 sy_knowledge_interst_major
+ * 
+ * @author mingxue
+ * @date 2022-03-02
+ */
+public class SyKnowledgeInterstMajor extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 知识描述词 */
+    @Excel(name = "知识描述词")
+    private String matchCode;
+
+    /** 专业码（二级） */
+    @Excel(name = "专业码", readConverterExp = "二=级")
+    private String majorCategoryCode;
+
+    /** 专业类 */
+    @Excel(name = "专业类")
+    private String majorCategory;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setMatchCode(String matchCode) 
+    {
+        this.matchCode = matchCode;
+    }
+
+    public String getMatchCode() 
+    {
+        return matchCode;
+    }
+    public void setMajorCategoryCode(String majorCategoryCode) 
+    {
+        this.majorCategoryCode = majorCategoryCode;
+    }
+
+    public String getMajorCategoryCode() 
+    {
+        return majorCategoryCode;
+    }
+    public void setMajorCategory(String majorCategory) 
+    {
+        this.majorCategory = majorCategory;
+    }
+
+    public String getMajorCategory() 
+    {
+        return majorCategory;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("matchCode", getMatchCode())
+            .append("majorCategoryCode", getMajorCategoryCode())
+            .append("majorCategory", getMajorCategory())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/sy/domain/SyKnowledgeInterstType.java

@@ -0,0 +1,112 @@
+package com.ruoyi.sy.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 知识兴趣类型对象 sy_knowledge_interst_type
+ * 
+ * @author mingxue
+ * @date 2022-03-02
+ */
+public class SyKnowledgeInterstType extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 编码 */
+    @Excel(name = "编码")
+    private String code;
+
+    /** 数据key */
+    @Excel(name = "数据key")
+    private String key;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String name;
+
+    /** 内容 */
+    @Excel(name = "内容")
+    private String content;
+
+    private Integer total;
+    private Boolean matched;
+
+    public Boolean getMatched() {
+        return matched;
+    }
+
+    public void setMatched(Boolean matched) {
+        this.matched = matched;
+    }
+
+    public Integer getTotal() {
+        return total;
+    }
+
+    public void setTotal(Integer total) {
+        this.total = total;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setCode(String code) 
+    {
+        this.code = code;
+    }
+
+    public String getCode() 
+    {
+        return code;
+    }
+    public void setKey(String key) 
+    {
+        this.key = key;
+    }
+
+    public String getKey() 
+    {
+        return key;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setContent(String content) 
+    {
+        this.content = content;
+    }
+
+    public String getContent() 
+    {
+        return content;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("code", getCode())
+            .append("key", getKey())
+            .append("name", getName())
+            .append("content", getContent())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/sy/domain/SyMajor.java

@@ -0,0 +1,177 @@
+package com.ruoyi.sy.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 专业对象 sy_major
+ *
+ * @author mingxue
+ * @date 2022-04-27
+ */
+public class SyMajor extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 科目code */
+    @Excel(name = "科目code")
+    private String code;
+
+    /** 科目parentcode */
+    @Excel(name = "科目parentcode")
+    private String parentCode;
+
+    /** 科目名称 */
+    @Excel(name = "科目名称")
+    private String name;
+
+    private String examType;
+
+    /** 科目类型，本科/专科 */
+    @Excel(name = "科目类型，本科/专科")
+    private String type;
+
+    /** 层级 */
+    @Excel(name = "层级")
+    private Integer level;
+
+    /** 祖级编码 */
+    @Excel(name = "祖级编码")
+    private String ancestors;
+
+    /** 子级数量 */
+    @Excel(name = "子级数量")
+    private Integer childCount;
+
+    /** 孙级数量 */
+    @Excel(name = "孙级数量")
+    private Integer grandchildCount;
+
+    /** 修业年限 */
+    @Excel(name = "修业年限")
+    private String learnYearArab;
+
+    public String getLearnYearArab() {
+        return learnYearArab;
+    }
+
+    public void setLearnYearArab(String learnYearArab) {
+        this.learnYearArab = learnYearArab;
+    }
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public SyMajor setCode(String code)
+    {
+        this.code = code;
+        return this;
+    }
+
+    public String getCode()
+    {
+        return code;
+
+    }
+    public SyMajor setParentCode(String parentCode)
+    {
+        this.parentCode = parentCode;
+        return this;
+    }
+
+    public String getParentCode()
+    {
+        return parentCode;
+    }
+    public SyMajor setName(String name)
+    {
+        this.name = name;
+        return this;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+    public SyMajor setType(String type)
+    {
+        this.type = type;
+        return this;
+    }
+
+    public String getExamType() {
+        return examType;
+    }
+
+    public SyMajor setExamType(String examType) {
+        this.examType = examType;
+        return this;
+    }
+
+    public String getType()
+    {
+        return type;
+    }
+    public SyMajor setLevel(Integer level)
+    {
+        this.level = level;
+        return this;
+    }
+
+    public Integer getLevel()
+    {
+        return level;
+    }
+    public void setAncestors(String ancestors)
+    {
+        this.ancestors = ancestors;
+    }
+
+    public String getAncestors()
+    {
+        return ancestors;
+    }
+    public void setChildCount(Integer childCount)
+    {
+        this.childCount = childCount;
+    }
+
+    public Integer getChildCount()
+    {
+        return childCount;
+    }
+    public void setGrandchildCount(Integer grandchildCount)
+    {
+        this.grandchildCount = grandchildCount;
+    }
+
+    public Integer getGrandchildCount()
+    {
+        return grandchildCount;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("code", getCode())
+            .append("parentCode", getParentCode())
+            .append("name", getName())
+            .append("type", getType())
+            .append("level", getLevel())
+            .append("ancestors", getAncestors())
+            .append("childCount", getChildCount())
+            .append("grandchildCount", getGrandchildCount())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/sy/domain/SyMajorCareerProspects.java

@@ -0,0 +1,165 @@
+package com.ruoyi.sy.domain;
+
+import com.alibaba.fastjson.JSONArray;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.List;
+
+/**
+ * 专业就业前景对象 sy_major_career_prospects
+ * 
+ * @author mingxue
+ * @date 2022-04-09
+ */
+public class SyMajorCareerProspects extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 专业三级编码 */
+    @Excel(name = "专业三级编码")
+    private String code;
+    private List<String> codes;
+
+    /** 专业方向 */
+    @Excel(name = "专业方向")
+    private String jobDirection;
+
+    /** 职业分布 */
+    @Excel(name = "职业分布")
+    private String vocationalDistribution;
+
+    /** 行业分布 */
+    @Excel(name = "行业分布")
+    private String industryDistribution;
+
+    /** 就业地区分布 */
+    @Excel(name = "就业地区分布")
+    private String jobRegionDistribution;
+
+    /** 近10年平均薪资 */
+    @Excel(name = "近10年平均薪资")
+    private String averageSalary;
+
+    /** 描述 */
+    @Excel(name = "描述")
+    private String description;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setCode(String code) 
+    {
+        this.code = code;
+    }
+
+    public String getCode() 
+    {
+        return code;
+    }
+    public void setJobDirection(String jobDirection) 
+    {
+        this.jobDirection = jobDirection;
+    }
+
+    public String getJobDirection() 
+    {
+        return jobDirection;
+    }
+    public void setVocationalDistribution(String vocationalDistribution) 
+    {
+        this.vocationalDistribution = vocationalDistribution;
+    }
+
+    public JSONArray getVocationalDistribution()
+    {
+        if(StringUtils.isEmpty(vocationalDistribution)){
+            return new JSONArray();
+        }
+        return JSONArray.parseArray(vocationalDistribution);
+    }
+    public void setIndustryDistribution(String industryDistribution) 
+    {
+        this.industryDistribution = industryDistribution;
+    }
+
+    public JSONArray getIndustryDistribution()
+    {
+        if(StringUtils.isEmpty(industryDistribution)){
+            return new JSONArray();
+        }
+        return JSONArray.parseArray(industryDistribution);
+    }
+    public SyMajorCareerProspects setJobRegionDistribution(String jobRegionDistribution)
+    {
+        this.jobRegionDistribution = jobRegionDistribution;
+        return this;
+    }
+
+    public JSONArray getJobRegionDistribution()
+    {
+        if(StringUtils.isEmpty(jobRegionDistribution)){
+            return new JSONArray();
+        }
+        return JSONArray.parseArray(jobRegionDistribution);
+    }
+    public void setAverageSalary(String averageSalary) 
+    {
+        this.averageSalary = averageSalary;
+    }
+
+    public JSONArray getAverageSalary()
+    {
+        if(StringUtils.isEmpty(averageSalary)){
+            return new JSONArray();
+        }
+        return JSONArray.parseArray(averageSalary);
+    }
+    public void setDescription(String description) 
+    {
+        this.description = description;
+    }
+
+    public JSONArray getDescription()
+    {
+        if(StringUtils.isEmpty(description)){
+            return new JSONArray();
+        }
+        return JSONArray.parseArray(description);
+    }
+
+    public List<String> getCodes() {
+        return codes;
+    }
+
+    public void setCodes(List<String> codes) {
+        this.codes = codes;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("code", getCode())
+            .append("jobDirection", getJobDirection())
+            .append("vocationalDistribution", getVocationalDistribution())
+            .append("industryDistribution", getIndustryDistribution())
+            .append("jobRegionDistribution", getJobRegionDistribution())
+            .append("averageSalary", getAverageSalary())
+            .append("description", getDescription())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/sy/domain/SyMajorCategory.java

@@ -0,0 +1,149 @@
+package com.ruoyi.sy.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.List;
+
+/**
+ * 二级专业对象 sy_major_category
+ * 
+ * @author mingxue
+ * @date 2022-03-02
+ */
+public class SyMajorCategory extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 二级专业code */
+    @Excel(name = "二级专业code")
+    private String majorCategoryCode;
+
+    /** 二级专业名称 */
+    @Excel(name = "二级专业名称")
+    private String majorCategoryName;
+
+    /** 一级专业code */
+    @Excel(name = "一级专业code")
+    private String majorSubjectCode;
+
+    private String majorSubjectName;
+
+    private String majorCode;
+
+    private String majorName;
+
+    /** 科目类型，本科/专科 */
+    @Excel(name = "科目类型，本科/专科")
+    private String type;
+
+    /** 层级 */
+    @Excel(name = "层级")
+    private Integer level;
+
+    private Integer state;
+
+    public String getMajorCode() {
+        return majorCode;
+    }
+
+    public void setMajorCode(String majorCode) {
+        this.majorCode = majorCode;
+    }
+
+    public String getMajorName() {
+        return majorName;
+    }
+
+    public void setMajorName(String majorName) {
+        this.majorName = majorName;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public String getMajorSubjectName() {
+        return majorSubjectName;
+    }
+
+    public void setMajorSubjectName(String majorSubjectName) {
+        this.majorSubjectName = majorSubjectName;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setMajorCategoryCode(String majorCategoryCode) 
+    {
+        this.majorCategoryCode = majorCategoryCode;
+    }
+
+    public String getMajorCategoryCode() 
+    {
+        return majorCategoryCode;
+    }
+    public void setMajorCategoryName(String majorCategoryName) 
+    {
+        this.majorCategoryName = majorCategoryName;
+    }
+
+    public String getMajorCategoryName() 
+    {
+        return majorCategoryName;
+    }
+    public void setMajorSubjectCode(String majorSubjectCode) 
+    {
+        this.majorSubjectCode = majorSubjectCode;
+    }
+
+    public String getMajorSubjectCode() 
+    {
+        return majorSubjectCode;
+    }
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+    public void setLevel(Integer level) 
+    {
+        this.level = level;
+    }
+
+    public Integer getLevel() 
+    {
+        return level;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("majorCategoryCode", getMajorCategoryCode())
+            .append("majorCategoryName", getMajorCategoryName())
+            .append("majorSubjectCode", getMajorSubjectCode())
+            .append("type", getType())
+            .append("level", getLevel())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/sy/domain/SyMajorDetail.java

@@ -0,0 +1,16 @@
+package com.ruoyi.sy.domain;
+
+import lombok.Data;
+
+
+@Data
+public class SyMajorDetail
+{
+    private static final long serialVersionUID = 1L;
+
+    private String code;
+    private String name;
+    private SyMajorOverview overview;
+    private SyMajorCareerProspects prospects;
+
+}

ie-system/src/main/java/com/ruoyi/sy/domain/SyMajorMajor.java

@@ -0,0 +1,107 @@
+package com.ruoyi.sy.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 三级专业对象 sy_major_major
+ * 
+ * @author mingxue
+ * @date 2022-03-02
+ */
+public class SyMajorMajor extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 三级专业code */
+    @Excel(name = "三级专业code")
+    private String majorCode;
+
+    /** 三级专业名称 */
+    @Excel(name = "三级专业名称")
+    private String majorName;
+
+    /** 二级专业code */
+    @Excel(name = "二级专业code")
+    private String majorCategoryCode;
+
+    /** 科目类型，本科/专科 */
+    @Excel(name = "科目类型，本科/专科")
+    private String type;
+
+    /** 层级 */
+    @Excel(name = "层级")
+    private Integer level;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setMajorCode(String majorCode) 
+    {
+        this.majorCode = majorCode;
+    }
+
+    public String getMajorCode() 
+    {
+        return majorCode;
+    }
+    public void setMajorName(String majorName) 
+    {
+        this.majorName = majorName;
+    }
+
+    public String getMajorName() 
+    {
+        return majorName;
+    }
+    public void setMajorCategoryCode(String majorCategoryCode) 
+    {
+        this.majorCategoryCode = majorCategoryCode;
+    }
+
+    public String getMajorCategoryCode() 
+    {
+        return majorCategoryCode;
+    }
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+    public void setLevel(Integer level) 
+    {
+        this.level = level;
+    }
+
+    public Integer getLevel() 
+    {
+        return level;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("majorCode", getMajorCode())
+            .append("majorName", getMajorName())
+            .append("majorCategoryCode", getMajorCategoryCode())
+            .append("type", getType())
+            .append("level", getLevel())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/sy/domain/SyMajorOverview.java

@@ -0,0 +1,615 @@
+package com.ruoyi.sy.domain;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.List;
+
+/**
+ * 三级专业概况对象 sy_major_overview
+ *
+ * @author mingxue
+ * @date 2022-04-13
+ */
+public class SyMajorOverview extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+    private Long marjorId;
+
+    /** 三级专业code */
+    @Excel(name = "三级专业code")
+    private String code;
+
+    private List<String> codes;
+
+    private Boolean isCollect = false;
+
+    /** 三级专业名称 */
+    @Excel(name = "三级专业名称")
+    private String name;
+
+    /** 子级数目 */
+    @Excel(name = "子级数目")
+    private Long childCount;
+
+    /** 授予学位
+ */
+    @Excel(name = "授予学位")
+    private String degree;
+
+    /** 学历层次（ben/zhuan） */
+    @Excel(name = "学历层次", readConverterExp = "b=en/zhuan")
+    private String eduLevel;
+
+    /** 培养目标 */
+    @Excel(name = "培养目标")
+    private String eduObjective;
+
+    /** 培养要求 */
+    @Excel(name = "培养要求")
+    private String eduRequirement;
+
+    /** 雇佣热度 */
+    @Excel(name = "雇佣热度")
+    private Long employmentHeat;
+
+    /** 社会名人 */
+    @Excel(name = "社会名人")
+    private String famousScholar;
+
+    /** 女性比例 */
+    @Excel(name = "女性比例")
+    private Long femaleRatio;
+
+    /** 女性比例 */
+    @Excel(name = "女性比例")
+    private String femaleRatioText;
+
+    /** 点击数 */
+    @Excel(name = "点击数")
+    private Long hits;
+
+    /** 实习描述 */
+    @Excel(name = "实习描述")
+    private String internshipDesc;
+
+    /** 专业介绍 */
+    @Excel(name = "专业介绍")
+    private String introduction;
+
+    /** 职业方向 */
+    @Excel(name = "职业方向")
+    private String jobDirection;
+
+    /** 职业介绍 */
+    @Excel(name = "职业介绍")
+    private String jobText;
+
+    /** 学习年分 */
+    @Excel(name = "学习年分")
+    private String learnYear;
+
+    /** 修业年限 */
+    @Excel(name = "修业年限")
+    private String learnYearArab;
+
+    /** 修业年限（中文） */
+    @Excel(name = "修业年限", readConverterExp = "中=文")
+    private String learnYearZh;
+
+    /** 层级 */
+    @Excel(name = "层级")
+    private Long level;
+
+    /** lkRatio */
+    @Excel(name = "lkRatio")
+    private Long lkRatio;
+
+    /** lkRatioText */
+    @Excel(name = "lkRatioText")
+    private String lkRatiotext;
+
+    /** 知识能力 */
+    @Excel(name = "知识能力")
+    private String loreAndAbility;
+
+    /** 主要课程 */
+    @Excel(name = "主要课程")
+    private String mainCourse;
+
+    /** 男性比例 */
+    @Excel(name = "男性比例")
+    private Long maleRatio;
+
+    /** 男性比例 */
+    @Excel(name = "男性比例")
+    private String maleRatioText;
+
+    /** 打开学校数 */
+    @Excel(name = "打开学校数")
+    private Long openCollegeCount;
+
+    /** 薪资 */
+    @Excel(name = "薪资")
+    private String salary;
+
+    /** 考研方向 */
+    @Excel(name = "考研方向")
+    private String studyDirection;
+
+    /** 学科要求 */
+    @Excel(name = "学科要求")
+    private String subjectRequirement;
+
+    /** 总结 */
+    @Excel(name = "总结")
+    private String summary;
+
+    /** wkRatio */
+    @Excel(name = "wkRatio")
+    private Long wkRatio;
+
+    /** wkRatioText */
+    @Excel(name = "wkRatioText")
+    private String wkRatioText;
+
+    /** 专升本 */
+    @Excel(name = "专升本")
+    private String zhuanToBenOrient;
+
+    /** 二级专业名称 */
+    @Excel(name = "二级专业名称")
+    private String middleName;
+
+    /** 一级专业名称 */
+    @Excel(name = "一级专业名称")
+    private String bigName;
+
+    private String qualification;
+    private String zhongzhiMajors;
+    private String benMajors;
+    private String relationMajors;
+
+    public String getQualification() {
+        return qualification;
+    }
+
+    public void setQualification(String qualification) {
+        this.qualification = qualification;
+    }
+
+    public String getZhongzhiMajors() {
+        return zhongzhiMajors;
+    }
+
+    public void setZhongzhiMajors(String zhongzhiMajors) {
+        this.zhongzhiMajors = zhongzhiMajors;
+    }
+
+    public String getBenMajors() {
+        return benMajors;
+    }
+
+    public void setBenMajors(String benMajors) {
+        this.benMajors = benMajors;
+    }
+
+    public String getRelationMajors() {
+        return relationMajors;
+    }
+
+    public void setRelationMajors(String relationMajors) {
+        this.relationMajors = relationMajors;
+    }
+
+
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setCode(String code)
+    {
+        this.code = code;
+    }
+
+    public String getCode()
+    {
+        return code;
+    }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+    public void setChildCount(Long childCount)
+    {
+        this.childCount = childCount;
+    }
+
+    public Long getChildCount()
+    {
+        return childCount;
+    }
+    public void setDegree(String degree)
+    {
+        this.degree = degree;
+    }
+
+    public String getDegree()
+    {
+        return degree;
+    }
+    public void setEduLevel(String eduLevel)
+    {
+        this.eduLevel = eduLevel;
+    }
+
+    public String getEduLevel()
+    {
+        return eduLevel;
+    }
+    public void setEduObjective(String eduObjective)
+    {
+        this.eduObjective = eduObjective;
+    }
+
+    public String getEduObjective()
+    {
+        return eduObjective;
+    }
+    public void setEduRequirement(String eduRequirement)
+    {
+        this.eduRequirement = eduRequirement;
+    }
+
+    public String getEduRequirement()
+    {
+        return eduRequirement;
+    }
+    public void setEmploymentHeat(Long employmentHeat)
+    {
+        this.employmentHeat = employmentHeat;
+    }
+
+    public Long getEmploymentHeat()
+    {
+        return employmentHeat;
+    }
+    public void setFamousScholar(String famousScholar)
+    {
+        this.famousScholar = famousScholar;
+    }
+
+    public String getFamousScholar()
+    {
+        return famousScholar;
+    }
+    public void setFemaleRatio(Long femaleRatio)
+    {
+        this.femaleRatio = femaleRatio;
+    }
+
+    public Long getFemaleRatio()
+    {
+        return femaleRatio;
+    }
+    public void setFemaleRatioText(String femaleRatioText)
+    {
+        this.femaleRatioText = femaleRatioText;
+    }
+
+    public String getFemaleRatioText()
+    {
+        return femaleRatioText;
+    }
+    public void setHits(Long hits)
+    {
+        this.hits = hits;
+    }
+
+    public Long getHits()
+    {
+        return hits;
+    }
+    public void setInternshipDesc(String internshipDesc)
+    {
+        this.internshipDesc = internshipDesc;
+    }
+
+    public String getInternshipDesc()
+    {
+        return internshipDesc;
+    }
+    public void setIntroduction(String introduction)
+    {
+        this.introduction = introduction;
+    }
+
+    public String getIntroduction()
+    {
+        return introduction;
+    }
+    public void setJobDirection(String jobDirection)
+    {
+        this.jobDirection = jobDirection;
+    }
+
+    public String getJobDirection()
+    {
+        return jobDirection;
+    }
+    public void setJobText(String jobText)
+    {
+        this.jobText = jobText;
+    }
+
+    public JSONArray getJobText()
+    {
+        return JSONArray.parseArray(jobText);
+    }
+    public void setLearnYear(String learnYear)
+    {
+        this.learnYear = learnYear;
+    }
+
+    public String getLearnYear()
+    {
+        return learnYear;
+    }
+    public void setLearnYearArab(String learnYearArab)
+    {
+        this.learnYearArab = learnYearArab;
+    }
+
+    public String getLearnYearArab()
+    {
+        return learnYearArab;
+    }
+    public void setLearnYearZh(String learnYearZh)
+    {
+        this.learnYearZh = learnYearZh;
+    }
+
+    public String getLearnYearZh()
+    {
+        return learnYearZh;
+    }
+    public void setLevel(Long level)
+    {
+        this.level = level;
+    }
+
+    public Long getLevel()
+    {
+        return level;
+    }
+    public void setLkRatio(Long lkRatio)
+    {
+        this.lkRatio = lkRatio;
+    }
+
+    public Long getLkRatio()
+    {
+        return lkRatio;
+    }
+    public void setLkRatiotext(String lkRatiotext)
+    {
+        this.lkRatiotext = lkRatiotext;
+    }
+
+    public String getLkRatiotext()
+    {
+        return lkRatiotext;
+    }
+    public void setLoreAndAbility(String loreAndAbility)
+    {
+        this.loreAndAbility = loreAndAbility;
+    }
+
+    public String getLoreAndAbility()
+    {
+        return loreAndAbility;
+    }
+    public void setMainCourse(String mainCourse)
+    {
+        this.mainCourse = mainCourse;
+    }
+
+    public String getMainCourse()
+    {
+        return mainCourse;
+    }
+    public void setMaleRatio(Long maleRatio)
+    {
+        this.maleRatio = maleRatio;
+    }
+
+    public Long getMaleRatio()
+    {
+        return maleRatio;
+    }
+    public void setMaleRatioText(String maleRatioText)
+    {
+        this.maleRatioText = maleRatioText;
+    }
+
+    public String getMaleRatioText()
+    {
+        return maleRatioText;
+    }
+    public void setOpenCollegeCount(Long openCollegeCount)
+    {
+        this.openCollegeCount = openCollegeCount;
+    }
+
+    public Long getOpenCollegeCount()
+    {
+        return openCollegeCount;
+    }
+    public void setSalary(String salary)
+    {
+        this.salary = salary;
+    }
+
+    public String getSalary()
+    {
+        return salary;
+    }
+    public void setStudyDirection(String studyDirection)
+    {
+        this.studyDirection = studyDirection;
+    }
+
+    public String getStudyDirection()
+    {
+        return studyDirection;
+    }
+    public void setSubjectRequirement(String subjectRequirement)
+    {
+        this.subjectRequirement = subjectRequirement;
+    }
+
+    public String getSubjectRequirement()
+    {
+        return subjectRequirement;
+    }
+    public void setSummary(String summary)
+    {
+        this.summary = summary;
+    }
+
+    public String getSummary()
+    {
+        return summary;
+    }
+    public void setWkRatio(Long wkRatio)
+    {
+        this.wkRatio = wkRatio;
+    }
+
+    public Long getWkRatio()
+    {
+        return wkRatio;
+    }
+    public void setWkRatioText(String wkRatioText)
+    {
+        this.wkRatioText = wkRatioText;
+    }
+
+    public String getWkRatioText()
+    {
+        return wkRatioText;
+    }
+    public void setZhuanToBenOrient(String zhuanToBenOrient)
+    {
+        this.zhuanToBenOrient = zhuanToBenOrient;
+    }
+
+    public String getZhuanToBenOrient()
+    {
+        return zhuanToBenOrient;
+    }
+    public void setMiddleName(String middleName)
+    {
+        this.middleName = middleName;
+    }
+
+    public String getMiddleName()
+    {
+        return middleName;
+    }
+    public void setBigName(String bigName)
+    {
+        this.bigName = bigName;
+    }
+
+    public String getBigName()
+    {
+        return bigName;
+    }
+
+    public Boolean getIsCollect() {
+        return isCollect;
+    }
+
+    public void setIsCollect(Boolean collect) {
+        isCollect = collect;
+    }
+
+    public Long getMarjorId() {
+        return marjorId;
+    }
+
+    public void setMarjorId(Long marjorId) {
+        this.marjorId = marjorId;
+    }
+
+    public List<String> getCodes() {
+        return codes;
+    }
+
+    public void setCodes(List<String> codes) {
+        this.codes = codes;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("code", getCode())
+            .append("name", getName())
+            .append("childCount", getChildCount())
+            .append("degree", getDegree())
+            .append("eduLevel", getEduLevel())
+            .append("eduObjective", getEduObjective())
+            .append("eduRequirement", getEduRequirement())
+            .append("employmentHeat", getEmploymentHeat())
+            .append("famousScholar", getFamousScholar())
+            .append("femaleRatio", getFemaleRatio())
+            .append("femaleRatioText", getFemaleRatioText())
+            .append("hits", getHits())
+            .append("internshipDesc", getInternshipDesc())
+            .append("introduction", getIntroduction())
+            .append("jobDirection", getJobDirection())
+            .append("jobText", getJobText())
+            .append("learnYear", getLearnYear())
+            .append("learnYearArab", getLearnYearArab())
+            .append("learnYearZh", getLearnYearZh())
+            .append("level", getLevel())
+            .append("lkRatio", getLkRatio())
+            .append("lkRatiotext", getLkRatiotext())
+            .append("loreAndAbility", getLoreAndAbility())
+            .append("mainCourse", getMainCourse())
+            .append("maleRatio", getMaleRatio())
+            .append("maleRatioText", getMaleRatioText())
+            .append("openCollegeCount", getOpenCollegeCount())
+            .append("salary", getSalary())
+            .append("studyDirection", getStudyDirection())
+            .append("subjectRequirement", getSubjectRequirement())
+            .append("summary", getSummary())
+            .append("wkRatio", getWkRatio())
+            .append("wkRatioText", getWkRatioText())
+            .append("zhuanToBenOrient", getZhuanToBenOrient())
+            .append("middleName", getMiddleName())
+            .append("bigName", getBigName())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/sy/domain/SyMajorSubject.java

@@ -0,0 +1,150 @@
+package com.ruoyi.sy.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 专业对象 sy_major_subject
+ * 
+ * @author mingxue
+ * @date 2022-04-27
+ */
+public class SyMajorSubject extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 科目code */
+    @Excel(name = "科目code")
+    private String code;
+
+    /** 科目parentcode */
+    @Excel(name = "科目parentcode")
+    private String parentCode;
+
+    /** 科目名称 */
+    @Excel(name = "科目名称")
+    private String name;
+
+    /** 科目类型，本科/专科 */
+    @Excel(name = "科目类型，本科/专科")
+    private String type;
+
+    /** 层级 */
+    @Excel(name = "层级")
+    private Integer level;
+
+    /** 祖级编码 */
+    @Excel(name = "祖级编码")
+    private String ancestors;
+
+    /** 子级数量 */
+    @Excel(name = "子级数量")
+    private Integer childCount;
+
+    /** 孙级数量 */
+    @Excel(name = "孙级数量")
+    private Integer grandchildCount;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setCode(String code) 
+    {
+        this.code = code;
+    }
+
+    public String getCode() 
+    {
+        return code;
+    }
+    public void setParentCode(String parentCode) 
+    {
+        this.parentCode = parentCode;
+    }
+
+    public String getParentCode() 
+    {
+        return parentCode;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public SyMajorSubject setType(String type)
+    {
+        this.type = type;
+        return this;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+    public void setLevel(Integer level) 
+    {
+        this.level = level;
+    }
+
+    public Integer getLevel() 
+    {
+        return level;
+    }
+    public void setAncestors(String ancestors) 
+    {
+        this.ancestors = ancestors;
+    }
+
+    public String getAncestors() 
+    {
+        return ancestors;
+    }
+    public void setChildCount(Integer childCount)
+    {
+        this.childCount = childCount;
+    }
+
+    public Integer getChildCount()
+    {
+        return childCount;
+    }
+    public void setGrandchildCount(Integer grandchildCount)
+    {
+        this.grandchildCount = grandchildCount;
+    }
+
+    public Integer getGrandchildCount()
+    {
+        return grandchildCount;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("code", getCode())
+            .append("parentCode", getParentCode())
+            .append("name", getName())
+            .append("type", getType())
+            .append("level", getLevel())
+            .append("ancestors", getAncestors())
+            .append("childCount", getChildCount())
+            .append("grandchildCount", getGrandchildCount())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/sy/domain/SyMajorUniversity.java

@@ -0,0 +1,231 @@
+package com.ruoyi.sy.domain;
+
+import com.ruoyi.syzy.domain.BBusiWishUniversities;
+import com.ruoyi.syzy.dto.UniversitiesCondDTO;
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 专业开设院校对象 sy_major_university
+ * 
+ * @author mingxue
+ * @date 2022-07-01
+ */
+public class SyMajorUniversity extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 学校编码 */
+    @Excel(name = "学校编码")
+    private String universityCode;
+
+    private String location;
+
+    /** 学校编码 */
+    @Excel(name = "学校编码")
+    private String universityName;
+
+    /** 综合指数 */
+    @Excel(name = "综合指数")
+    private String diffScore;
+
+    /** 评级 */
+    @Excel(name = "评级")
+    private String grade;
+
+    /** 评级 */
+    @Excel(name = "评级")
+    private String mseLevel;
+
+    /** 排名 */
+    @Excel(name = "排名")
+    private Long rank;
+
+    /** 专业编码 */
+    @Excel(name = "专业编码")
+    private String majorCode;
+
+    /** 年份 */
+    @Excel(name = "年份")
+    private Long year;
+
+    /** 主管部门类别 */
+    @ApiModelProperty("主管部门类别")
+    private String managerType;
+
+    private String natureTypeCN;
+
+    /** 院校类型 */
+    @ApiModelProperty("院校类型")
+    private String type;
+
+    /** 学历层次 */
+    @ApiModelProperty("学历层次")
+    private String level;
+
+    @ApiModelProperty("特色")
+    private String features;
+
+    private BBusiWishUniversities university;
+
+    public String getLocation() {
+        return location;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+
+    public BBusiWishUniversities getUniversity() {
+        return university;
+    }
+
+    public void setUniversity(BBusiWishUniversities university) {
+        this.university = university;
+    }
+
+    public String getManagerType() {
+        return managerType;
+    }
+
+    public void setManagerType(String managerType) {
+        this.managerType = managerType;
+    }
+
+    public String getNatureTypeCN() {
+        return natureTypeCN;
+    }
+
+    public void setNatureTypeCN(String natureTypeCN) {
+        this.natureTypeCN = natureTypeCN;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getLevel() {
+        return level;
+    }
+
+    public void setLevel(String level) {
+        this.level = level;
+    }
+
+    public String getFeatures() {
+        return features;
+    }
+
+    public void setFeatures(String features) {
+        this.features = features;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setUniversityCode(String universityCode)
+    {
+        this.universityCode = universityCode;
+    }
+
+    public String getUniversityCode()
+    {
+        return universityCode;
+    }
+    public void setUniversityName(String universityName)
+    {
+        this.universityName = universityName;
+    }
+
+    public String getUniversityName()
+    {
+        return universityName;
+    }
+    public void setDiffScore(String diffScore)
+    {
+        this.diffScore = diffScore;
+    }
+
+    public String getDiffScore()
+    {
+        return diffScore;
+    }
+    public void setGrade(String grade)
+    {
+        this.grade = grade;
+    }
+
+    public String getGrade()
+    {
+        return grade;
+    }
+    public void setMseLevel(String mseLevel)
+    {
+        this.mseLevel = mseLevel;
+    }
+
+    public String getMseLevel()
+    {
+        return mseLevel;
+    }
+    public void setRank(Long rank)
+    {
+        this.rank = rank;
+    }
+
+    public Long getRank()
+    {
+        return rank;
+    }
+    public void setMajorCode(String majorCode)
+    {
+        this.majorCode = majorCode;
+    }
+
+    public String getMajorCode()
+    {
+        return majorCode;
+    }
+    public void setYear(Long year)
+    {
+        this.year = year;
+    }
+
+    public Long getYear()
+    {
+        return year;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("universityCode", getUniversityCode())
+            .append("universityName", getUniversityName())
+            .append("diffScore", getDiffScore())
+            .append("grade", getGrade())
+            .append("mseLevel", getMseLevel())
+            .append("rank", getRank())
+            .append("majorCode", getMajorCode())
+            .append("year", getYear())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/sy/domain/SyOccupationInterstMajor.java

@@ -0,0 +1,79 @@
+package com.ruoyi.sy.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 职业兴趣结论对象 sy_occupation_interst_major
+ * 
+ * @author mingxue
+ * @date 2022-03-02
+ */
+public class SyOccupationInterstMajor extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 兴趣码 */
+    @Excel(name = "兴趣码")
+    private String matchCode;
+
+    /** 专业码（二级） */
+    @Excel(name = "专业码", readConverterExp = "二=级")
+    private String majorCategoryCode;
+
+    /** 专业类 */
+    @Excel(name = "专业类")
+    private String majorCategory;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setMatchCode(String matchCode) 
+    {
+        this.matchCode = matchCode;
+    }
+
+    public String getMatchCode() 
+    {
+        return matchCode;
+    }
+    public void setMajorCategoryCode(String majorCategoryCode) 
+    {
+        this.majorCategoryCode = majorCategoryCode;
+    }
+
+    public String getMajorCategoryCode() 
+    {
+        return majorCategoryCode;
+    }
+    public void setMajorCategory(String majorCategory) 
+    {
+        this.majorCategory = majorCategory;
+    }
+
+    public String getMajorCategory() 
+    {
+        return majorCategory;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("matchCode", getMatchCode())
+            .append("majorCategoryCode", getMajorCategoryCode())
+            .append("majorCategory", getMajorCategory())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/sy/domain/SyOccupationInterstType.java

@@ -0,0 +1,123 @@
+package com.ruoyi.sy.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.Map;
+
+/**
+ * 职业兴趣类型对象 sy_occupation_interst_type
+ * 
+ * @author mingxue
+ * @date 2022-03-02
+ */
+public class SyOccupationInterstType extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 编码 */
+    @Excel(name = "编码")
+    private String code;
+
+    /** 数据key */
+    @Excel(name = "数据key")
+    private String key;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String name;
+
+    /** 内容 */
+    @Excel(name = "内容")
+    private String content;
+
+    private Integer total = 0;
+    private Boolean matched;
+    private Map<String, Integer> stats;
+
+    public Integer getTotal() {
+        return total;
+    }
+
+    public void setTotal(Integer total) {
+        this.total = total;
+    }
+
+    public Boolean getMatched() {
+        return matched;
+    }
+
+    public void setMatched(Boolean matched) {
+        this.matched = matched;
+    }
+
+    public Map<String, Integer> getStats() {
+        return stats;
+    }
+
+    public void setStats(Map<String, Integer> stats) {
+        this.stats = stats;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setCode(String code) 
+    {
+        this.code = code;
+    }
+
+    public String getCode() 
+    {
+        return code;
+    }
+    public void setKey(String key) 
+    {
+        this.key = key;
+    }
+
+    public String getKey() 
+    {
+        return key;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setContent(String content) 
+    {
+        this.content = content;
+    }
+
+    public String getContent() 
+    {
+        return content;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("code", getCode())
+            .append("key", getKey())
+            .append("name", getName())
+            .append("content", getContent())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/sy/domain/SyPhilosophyViewMajor.java

@@ -0,0 +1,79 @@
+package com.ruoyi.sy.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 价值观专业对象 sy_philosophy_view_major
+ * 
+ * @author mingxue
+ * @date 2022-03-02
+ */
+public class SyPhilosophyViewMajor extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 匹配码 */
+    @Excel(name = "匹配码")
+    private String matchCode;
+
+    /** 专业码（二级） */
+    @Excel(name = "专业码", readConverterExp = "二=级")
+    private String majorCategoryCode;
+
+    /** 专业类 */
+    @Excel(name = "专业类")
+    private String majorCategory;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setMatchCode(String matchCode) 
+    {
+        this.matchCode = matchCode;
+    }
+
+    public String getMatchCode() 
+    {
+        return matchCode;
+    }
+    public void setMajorCategoryCode(String majorCategoryCode) 
+    {
+        this.majorCategoryCode = majorCategoryCode;
+    }
+
+    public String getMajorCategoryCode() 
+    {
+        return majorCategoryCode;
+    }
+    public void setMajorCategory(String majorCategory) 
+    {
+        this.majorCategory = majorCategory;
+    }
+
+    public String getMajorCategory() 
+    {
+        return majorCategory;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("matchCode", getMatchCode())
+            .append("majorCategoryCode", getMajorCategoryCode())
+            .append("majorCategory", getMajorCategory())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/sy/domain/SyPhilosophyViewType.java

@@ -0,0 +1,150 @@
+package com.ruoyi.sy.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 价值观解读对象 sy_philosophy_view_type
+ * 
+ * @author mingxue
+ * @date 2022-03-02
+ */
+public class SyPhilosophyViewType extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 代码 */
+    @Excel(name = "代码")
+    private String code;
+
+    /** 类型 */
+    @Excel(name = "类型")
+    private String key;
+
+    /** 类型名称 */
+    @Excel(name = "类型名称")
+    private String name;
+
+    /** 描述 */
+    @Excel(name = "描述")
+    private String content;
+
+    /** 学科门类（一级专业） */
+    private String matchedMajor;
+
+    private Integer total = 0;
+    private Map<String, Integer> stats;
+    private Boolean matched;
+
+    List<SyPhilosophyViewMajor> viewMajorList;
+
+
+    public Integer getTotal() {
+        return total;
+    }
+
+    public void setTotal(Integer total) {
+        this.total = total;
+    }
+
+
+    public Boolean getMatched() {
+        return matched;
+    }
+
+    public void setMatched(Boolean matched) {
+        this.matched = matched;
+    }
+
+
+    public Map<String, Integer> getStats() {
+        return stats;
+    }
+
+    public void setStats(Map<String, Integer> stats) {
+        this.stats = stats;
+    }
+
+    public List<SyPhilosophyViewMajor> getViewMajorList() {
+        return viewMajorList;
+    }
+
+    public void setViewMajorList(List<SyPhilosophyViewMajor> viewMajorList) {
+        this.viewMajorList = viewMajorList;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setCode(String code) 
+    {
+        this.code = code;
+    }
+
+    public String getCode() 
+    {
+        return code;
+    }
+    public void setKey(String key) 
+    {
+        this.key = key;
+    }
+
+    public String getKey() 
+    {
+        return key;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setContent(String content) 
+    {
+        this.content = content;
+    }
+
+    public String getContent() 
+    {
+        return content;
+    }
+    public void setMatchedMajor(String matchedMajor) 
+    {
+        this.matchedMajor = matchedMajor;
+    }
+
+    public String getMatchedMajor() 
+    {
+        return matchedMajor;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("code", getCode())
+            .append("key", getKey())
+            .append("name", getName())
+            .append("content", getContent())
+            .append("matchedMajor", getMatchedMajor())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/sy/domain/SyTestAnswers.java

@@ -0,0 +1,205 @@
+package com.ruoyi.sy.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 答题卡对象 sy_test_answers
+ * 
+ * @author mingxue
+ * @date 2022-03-02
+ */
+public class SyTestAnswers extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 答题id */
+    private Long answerId;
+
+    /** 应试学生id */
+    @Excel(name = "应试学生id")
+    private Long examineeId;
+
+    /** 试卷使用类型 */
+    @Excel(name = "试卷使用类型")
+    private String examineeType;
+
+    /** 试题id */
+    @Excel(name = "试题id")
+    private Long questionId;
+
+    /** 题号 */
+    @Excel(name = "题号")
+    private Long seq;
+
+    /** 学生答案 */
+    @Excel(name = "学生答案")
+    private String answer;
+
+    /** 批改答案 */
+    @Excel(name = "批改答案")
+    private String correct;
+
+    /** 最长时间 */
+    @Excel(name = "最长时间")
+    private Long duration;
+
+    /** 更新次数 */
+    @Excel(name = "更新次数")
+    private Long count;
+
+    /** 状态 1 正确 */
+    @Excel(name = "状态 1 正确")
+    private Long state;
+
+    /** 评级 */
+    @Excel(name = "评级")
+    private String scoreLevel;
+
+    /** 评分 */
+    @Excel(name = "评分")
+    private Long score;
+
+    /** 得分率 */
+    @Excel(name = "得分率")
+    private Long scoreRate;
+
+    public void setAnswerId(Long answerId) 
+    {
+        this.answerId = answerId;
+    }
+
+    public Long getAnswerId() 
+    {
+        return answerId;
+    }
+    public void setExamineeId(Long examineeId) 
+    {
+        this.examineeId = examineeId;
+    }
+
+    public Long getExamineeId() 
+    {
+        return examineeId;
+    }
+    public void setExamineeType(String examineeType) 
+    {
+        this.examineeType = examineeType;
+    }
+
+    public String getExamineeType() 
+    {
+        return examineeType;
+    }
+    public void setQuestionId(Long questionId) 
+    {
+        this.questionId = questionId;
+    }
+
+    public Long getQuestionId() 
+    {
+        return questionId;
+    }
+    public void setSeq(Long seq) 
+    {
+        this.seq = seq;
+    }
+
+    public Long getSeq() 
+    {
+        return seq;
+    }
+    public void setAnswer(String answer) 
+    {
+        this.answer = answer;
+    }
+
+    public String getAnswer() 
+    {
+        return answer;
+    }
+    public void setCorrect(String correct) 
+    {
+        this.correct = correct;
+    }
+
+    public String getCorrect() 
+    {
+        return correct;
+    }
+    public void setDuration(Long duration) 
+    {
+        this.duration = duration;
+    }
+
+    public Long getDuration() 
+    {
+        return duration;
+    }
+    public void setCount(Long count) 
+    {
+        this.count = count;
+    }
+
+    public Long getCount() 
+    {
+        return count;
+    }
+    public void setState(Long state) 
+    {
+        this.state = state;
+    }
+
+    public Long getState() 
+    {
+        return state;
+    }
+    public void setScoreLevel(String scoreLevel) 
+    {
+        this.scoreLevel = scoreLevel;
+    }
+
+    public String getScoreLevel() 
+    {
+        return scoreLevel;
+    }
+    public void setScore(Long score) 
+    {
+        this.score = score;
+    }
+
+    public Long getScore() 
+    {
+        return score;
+    }
+    public void setScoreRate(Long scoreRate) 
+    {
+        this.scoreRate = scoreRate;
+    }
+
+    public Long getScoreRate() 
+    {
+        return scoreRate;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("answerId", getAnswerId())
+            .append("examineeId", getExamineeId())
+            .append("examineeType", getExamineeType())
+            .append("questionId", getQuestionId())
+            .append("seq", getSeq())
+            .append("answer", getAnswer())
+            .append("correct", getCorrect())
+            .append("duration", getDuration())
+            .append("count", getCount())
+            .append("state", getState())
+            .append("scoreLevel", getScoreLevel())
+            .append("score", getScore())
+            .append("scoreRate", getScoreRate())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/sy/domain/SyTestExaminee.java

@@ -0,0 +1,195 @@
+package com.ruoyi.sy.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 测评人员对象 sy_test_examinee
+ * 
+ * @author mingxue
+ * @date 2022-03-02
+ */
+public class SyTestExaminee extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 应试学生id */
+    private Long examineeId;
+
+    /** 试卷id */
+    @Excel(name = "试卷id")
+    private Long paperId;
+
+    /** 轮次 */
+    @Excel(name = "轮次")
+    private Long round;
+
+    /** 用户编码 */
+    @Excel(name = "用户编码")
+    private String customerCode;
+
+    /** 开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date beginTime;
+
+    /** 结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date endTime;
+
+    /** 未答题, 已答题, 通过, 未通过 */
+    @Excel(name = "未答题, 已答题, 通过, 未通过")
+    private Long state;
+
+    /** 分级 */
+    @Excel(name = "分级")
+    private String scoreLevel;
+
+    /** 分值 */
+    @Excel(name = "分值")
+    private Long score;
+
+    /** 分率 */
+    @Excel(name = "分率")
+    private Double scoreRate;
+
+    /** 名次 */
+    @Excel(name = "名次")
+    private Long ranking;
+
+    /** 答案统计json */
+    @Excel(name = "答案统计json")
+    private String stats;
+
+    public void setExamineeId(Long examineeId) 
+    {
+        this.examineeId = examineeId;
+    }
+
+    public Long getExamineeId() 
+    {
+        return examineeId;
+    }
+    public void setPaperId(Long paperId) 
+    {
+        this.paperId = paperId;
+    }
+
+    public Long getPaperId() 
+    {
+        return paperId;
+    }
+    public void setRound(Long round) 
+    {
+        this.round = round;
+    }
+
+    public Long getRound() 
+    {
+        return round;
+    }
+    public void setCustomerCode(String customerCode) 
+    {
+        this.customerCode = customerCode;
+    }
+
+    public String getCustomerCode() 
+    {
+        return customerCode;
+    }
+    public void setBeginTime(Date beginTime) 
+    {
+        this.beginTime = beginTime;
+    }
+
+    public Date getBeginTime() 
+    {
+        return beginTime;
+    }
+    public void setEndTime(Date endTime) 
+    {
+        this.endTime = endTime;
+    }
+
+    public Date getEndTime() 
+    {
+        return endTime;
+    }
+    public void setState(Long state) 
+    {
+        this.state = state;
+    }
+
+    public Long getState() 
+    {
+        return state;
+    }
+    public void setScoreLevel(String scoreLevel) 
+    {
+        this.scoreLevel = scoreLevel;
+    }
+
+    public String getScoreLevel() 
+    {
+        return scoreLevel;
+    }
+    public void setScore(Long score) 
+    {
+        this.score = score;
+    }
+
+    public Long getScore()
+    {
+        return score;
+    }
+    public void setScoreRate(Double scoreRate)
+    {
+        this.scoreRate = scoreRate;
+    }
+
+    public Double getScoreRate()
+    {
+        return scoreRate;
+    }
+    public void setRanking(Long ranking) 
+    {
+        this.ranking = ranking;
+    }
+
+    public Long getRanking() 
+    {
+        return ranking;
+    }
+    public void setStats(String stats) 
+    {
+        this.stats = stats;
+    }
+
+    public String getStats() 
+    {
+        return stats;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("examineeId", getExamineeId())
+            .append("paperId", getPaperId())
+            .append("round", getRound())
+            .append("customerCode", getCustomerCode())
+            .append("beginTime", getBeginTime())
+            .append("endTime", getEndTime())
+            .append("state", getState())
+            .append("scoreLevel", getScoreLevel())
+            .append("score", getScore())
+            .append("scoreRate", getScoreRate())
+            .append("ranking", getRanking())
+            .append("stats", getStats())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/sy/domain/SyTestPaper.java

@@ -0,0 +1,96 @@
+package com.ruoyi.sy.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 选科测试卷对象 sy_test_paper
+ * 
+ * @author mingxue
+ * @date 2022-03-02
+ */
+public class SyTestPaper extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** paper_id */
+    private Long paperId;
+
+    /** 类型 价值 知识 职业 */
+    @Excel(name = "类型 价值 知识 职业")
+    private Integer category;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String name;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private Long creatorId;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdTime;
+
+    public void setPaperId(Long paperId) 
+    {
+        this.paperId = paperId;
+    }
+
+    public Long getPaperId() 
+    {
+        return paperId;
+    }
+    public void setCategory(Integer category)
+    {
+        this.category = category;
+    }
+
+    public Integer getCategory()
+    {
+        return category;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setCreatorId(Long creatorId) 
+    {
+        this.creatorId = creatorId;
+    }
+
+    public Long getCreatorId() 
+    {
+        return creatorId;
+    }
+    public void setCreatedTime(Date createdTime) 
+    {
+        this.createdTime = createdTime;
+    }
+
+    public Date getCreatedTime() 
+    {
+        return createdTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("paperId", getPaperId())
+            .append("category", getCategory())
+            .append("name", getName())
+            .append("creatorId", getCreatorId())
+            .append("createdTime", getCreatedTime())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/sy/domain/SyTestQuestion.java

@@ -0,0 +1,304 @@
+package com.ruoyi.sy.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 组卷题目对象 sy_test_question
+ * 
+ * @author mingxue
+ * @date 2022-03-02
+ */
+public class SyTestQuestion extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 试题id */
+    private Long questionId;
+
+    /** 试卷id */
+    @Excel(name = "试卷id")
+    private Long paperId;
+
+    /** 序号 */
+    @Excel(name = "序号")
+    private Long seq;
+
+    /** 试题-题干 */
+    @Excel(name = "试题-题干")
+    private String title;
+
+    /** 选项A */
+    @Excel(name = "选项A")
+    private String optionA;
+
+    /** 选项B */
+    @Excel(name = "选项B")
+    private String optionB;
+
+    /** 选项C */
+    @Excel(name = "选项C")
+    private String optionC;
+
+    /** 选项D */
+    @Excel(name = "选项D")
+    private String optionD;
+
+    /** 选项E */
+    @Excel(name = "选项E")
+    private String optionE;
+
+    /** 选项值A */
+    @Excel(name = "选项值A")
+    private String valueA;
+
+    /** 选项值B */
+    @Excel(name = "选项值B")
+    private String valueB;
+
+    /** 选项值C */
+    @Excel(name = "选项值C")
+    private String valueC;
+
+    /** 选项值D */
+    @Excel(name = "选项值D")
+    private String valueD;
+
+    /** 选项值E */
+    @Excel(name = "选项值E")
+    private String valueE;
+
+    /** 统计类别 */
+    @Excel(name = "统计类别")
+    private String quesitonCateogry;
+
+    /** $column.columnComment */
+    @Excel(name = "统计类别")
+    private String answer1;
+
+    /** 非标准格式答案或含部分过程说明的答案 */
+    @Excel(name = "非标准格式答案或含部分过程说明的答案")
+    private String answer2;
+
+    /** 试题解析 */
+    @Excel(name = "试题解析")
+    private String parse;
+
+    /** 分值 */
+    @Excel(name = "分值")
+    private Long score;
+
+    /** 试题题型 单选 评分单选，评分多先 */
+    @Excel(name = "试题题型 单选 评分单选，评分多先")
+    private String qtpye;
+
+    public void setQuestionId(Long questionId) 
+    {
+        this.questionId = questionId;
+    }
+
+    public Long getQuestionId() 
+    {
+        return questionId;
+    }
+    public void setPaperId(Long paperId) 
+    {
+        this.paperId = paperId;
+    }
+
+    public Long getPaperId() 
+    {
+        return paperId;
+    }
+    public void setSeq(Long seq) 
+    {
+        this.seq = seq;
+    }
+
+    public Long getSeq() 
+    {
+        return seq;
+    }
+    public void setTitle(String title) 
+    {
+        this.title = title;
+    }
+
+    public String getTitle() 
+    {
+        return title;
+    }
+    public void setOptionA(String optionA) 
+    {
+        this.optionA = optionA;
+    }
+
+    public String getOptionA() 
+    {
+        return optionA;
+    }
+    public void setOptionB(String optionB) 
+    {
+        this.optionB = optionB;
+    }
+
+    public String getOptionB() 
+    {
+        return optionB;
+    }
+    public void setOptionC(String optionC) 
+    {
+        this.optionC = optionC;
+    }
+
+    public String getOptionC() 
+    {
+        return optionC;
+    }
+    public void setOptionD(String optionD) 
+    {
+        this.optionD = optionD;
+    }
+
+    public String getOptionD() 
+    {
+        return optionD;
+    }
+    public void setOptionE(String optionE) 
+    {
+        this.optionE = optionE;
+    }
+
+    public String getOptionE() 
+    {
+        return optionE;
+    }
+    public void setValueA(String valueA) 
+    {
+        this.valueA = valueA;
+    }
+
+    public String getValueA() 
+    {
+        return valueA;
+    }
+    public void setValueB(String valueB) 
+    {
+        this.valueB = valueB;
+    }
+
+    public String getValueB() 
+    {
+        return valueB;
+    }
+    public void setValueC(String valueC) 
+    {
+        this.valueC = valueC;
+    }
+
+    public String getValueC() 
+    {
+        return valueC;
+    }
+    public void setValueD(String valueD) 
+    {
+        this.valueD = valueD;
+    }
+
+    public String getValueD() 
+    {
+        return valueD;
+    }
+    public void setValueE(String valueE) 
+    {
+        this.valueE = valueE;
+    }
+
+    public String getValueE() 
+    {
+        return valueE;
+    }
+    public void setQuesitonCateogry(String quesitonCateogry) 
+    {
+        this.quesitonCateogry = quesitonCateogry;
+    }
+
+    public String getQuesitonCateogry() 
+    {
+        return quesitonCateogry;
+    }
+    public void setAnswer1(String answer1) 
+    {
+        this.answer1 = answer1;
+    }
+
+    public String getAnswer1() 
+    {
+        return answer1;
+    }
+    public void setAnswer2(String answer2) 
+    {
+        this.answer2 = answer2;
+    }
+
+    public String getAnswer2() 
+    {
+        return answer2;
+    }
+    public void setParse(String parse) 
+    {
+        this.parse = parse;
+    }
+
+    public String getParse() 
+    {
+        return parse;
+    }
+    public void setScore(Long score) 
+    {
+        this.score = score;
+    }
+
+    public Long getScore() 
+    {
+        return score;
+    }
+    public void setQtpye(String qtpye) 
+    {
+        this.qtpye = qtpye;
+    }
+
+    public String getQtpye() 
+    {
+        return qtpye;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("questionId", getQuestionId())
+            .append("paperId", getPaperId())
+            .append("seq", getSeq())
+            .append("title", getTitle())
+            .append("optionA", getOptionA())
+            .append("optionB", getOptionB())
+            .append("optionC", getOptionC())
+            .append("optionD", getOptionD())
+            .append("optionE", getOptionE())
+            .append("valueA", getValueA())
+            .append("valueB", getValueB())
+            .append("valueC", getValueC())
+            .append("valueD", getValueD())
+            .append("valueE", getValueE())
+            .append("quesitonCateogry", getQuesitonCateogry())
+            .append("answer1", getAnswer1())
+            .append("answer2", getAnswer2())
+            .append("parse", getParse())
+            .append("score", getScore())
+            .append("qtpye", getQtpye())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/sy/domain/SyTestSelectCategory.java

@@ -0,0 +1,108 @@
+package com.ruoyi.sy.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 测评选专业类对象 sy_test_select_category
+ * 
+ * @author mingxue
+ * @date 2022-03-02
+ */
+public class SyTestSelectCategory extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 选择id */
+    private Long id;
+
+    /** 应试学生id */
+    @Excel(name = "应试学生id")
+    private Long examineeId;
+
+    /** 用户编码 */
+    @Excel(name = "用户编码")
+    private String customerCode;
+
+    /** 专类类编码 */
+    @Excel(name = "专类类编码")
+    private String majorCategoryCode;
+
+    /** 1 有效 0 无效 */
+    @Excel(name = "1 有效 0 无效")
+    private Long state;
+
+    /** 次序 */
+    @Excel(name = "次序")
+    private Long ranking;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setExamineeId(Long examineeId) 
+    {
+        this.examineeId = examineeId;
+    }
+
+    public Long getExamineeId() 
+    {
+        return examineeId;
+    }
+    public void setCustomerCode(String customerCode) 
+    {
+        this.customerCode = customerCode;
+    }
+
+    public String getCustomerCode() 
+    {
+        return customerCode;
+    }
+    public void setMajorCategoryCode(String majorCategoryCode) 
+    {
+        this.majorCategoryCode = majorCategoryCode;
+    }
+
+    public String getMajorCategoryCode() 
+    {
+        return majorCategoryCode;
+    }
+    public void setState(Long state) 
+    {
+        this.state = state;
+    }
+
+    public Long getState() 
+    {
+        return state;
+    }
+    public void setRanking(Long ranking) 
+    {
+        this.ranking = ranking;
+    }
+
+    public Long getRanking() 
+    {
+        return ranking;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("examineeId", getExamineeId())
+            .append("customerCode", getCustomerCode())
+            .append("majorCategoryCode", getMajorCategoryCode())
+            .append("state", getState())
+            .append("ranking", getRanking())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/sy/domain/SyTestSelectMajor.java

@@ -0,0 +1,141 @@
+package com.ruoyi.sy.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 测评选专业对象 sy_test_select_major
+ * 
+ * @author mingxue
+ * @date 2022-03-02
+ */
+public class SyTestSelectMajor extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 选择id */
+    private Long id;
+
+    /** 测试学生id */
+    @Excel(name = "测试学生id")
+    private Long userId;
+
+    /** 用户编码 */
+    @Excel(name = "用户编码")
+    private String customerCode;
+
+    /** 三级专业代码 */
+    @Excel(name = "三级专业代码")
+    private String majorCode;
+
+    /** 三级专业名称 */
+    @Excel(name = "三级专业名称")
+    private String majorName;
+
+    /** 专类类编码 */
+    @Excel(name = "专类类编码")
+    private String majorCategoryCode;
+
+    /** 专类类名称 */
+    @Excel(name = "专类类名称")
+    private String majorCategoryName;
+
+    /** 1 有效 0 无效 */
+    @Excel(name = "1 有效 0 无效")
+    private Long state;
+
+    /** 次序 */
+    @Excel(name = "次序")
+    private Long ranking;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setUserId(Long userId)
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId()
+    {
+        return userId;
+    }
+    public void setCustomerCode(String customerCode) 
+    {
+        this.customerCode = customerCode;
+    }
+
+    public String getCustomerCode() 
+    {
+        return customerCode;
+    }
+    public void setMajorCode(String majorCode) 
+    {
+        this.majorCode = majorCode;
+    }
+
+    public String getMajorCode() 
+    {
+        return majorCode;
+    }
+    public void setMajorName(String majorName) {
+        this.majorName = majorName;
+    }
+
+    public String getMajorName() {
+        return majorName;
+    }
+    public void setMajorCategoryCode(String majorCategoryCode) {
+        this.majorCategoryCode = majorCategoryCode;
+    }
+
+    public String getMajorCategoryCode() {
+        return majorCategoryCode;
+    }
+    public void setMajorCategoryName(String majorCategoryName) {
+        this.majorCategoryName = majorCategoryName;
+    }
+
+    public String getMajorCategoryName() {
+        return majorCategoryName;
+    }
+    public void setState(Long state)
+    {
+        this.state = state;
+    }
+
+    public Long getState() 
+    {
+        return state;
+    }
+    public void setRanking(Long ranking) 
+    {
+        this.ranking = ranking;
+    }
+
+    public Long getRanking() 
+    {
+        return ranking;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("userId", getUserId())
+            .append("customerCode", getCustomerCode())
+            .append("majorCode", getMajorCode())
+            .append("state", getState())
+            .append("ranking", getRanking())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/sy/domain/SyVocational.java

@@ -0,0 +1,171 @@
+package com.ruoyi.sy.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 职业对象 sy_vocational
+ * 
+ * @author mingxue
+ * @date 2022-03-30
+ */
+public class SyVocational extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 编码 */
+    @Excel(name = "编码")
+    private String code;
+
+    /** 父编码 */
+    @Excel(name = "父编码")
+    private String parentCode;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String name;
+
+    private String type;
+
+    /** 层级 */
+    @Excel(name = "层级")
+    private Integer level;
+    /**职业类数量 子级数量**/
+    private Integer childCount;
+    /**职业数量 孙级数量**/
+    private Integer grandchildCount;
+
+    /** 祖级编码 */
+    @Excel(name = "祖级编码")
+    private String ancestors;
+
+    private List<SyVocational> children = new ArrayList<SyVocational>();
+
+    //冗余给Major的树结构使用
+    /** 修业年限 **/
+    private String learnYearArab;
+
+    public String getLearnYearArab() {
+        return learnYearArab;
+    }
+
+    public void setLearnYearArab(String learnYearArab) {
+        this.learnYearArab = learnYearArab;
+    }
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setCode(String code) 
+    {
+        this.code = code;
+    }
+
+    public String getCode() 
+    {
+        return code;
+    }
+    public SyVocational setParentCode(String parentCode)
+    {
+        this.parentCode = parentCode;
+        return this;
+    }
+
+    public String getParentCode() 
+    {
+        return parentCode;
+    }
+    public SyVocational setName(String name)
+    {
+        this.name = name;
+        return this;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public void setLevel(Integer level)
+    {
+        this.level = level;
+    }
+
+    public Integer getLevel()
+    {
+        return level;
+    }
+    public void setAncestors(String ancestors) 
+    {
+        this.ancestors = ancestors;
+    }
+
+    public String getAncestors() 
+    {
+        return ancestors;
+    }
+
+    public List<SyVocational> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<SyVocational> children) {
+        this.children = children;
+    }
+
+    public Integer getChildCount() {
+        return childCount;
+    }
+
+    public void setChildCount(Integer childCount) {
+        this.childCount = childCount;
+    }
+
+    public Integer getGrandchildCount() {
+        return grandchildCount;
+    }
+
+    public void setGrandchildCount(Integer grandchildCount) {
+        this.grandchildCount = grandchildCount;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("code", getCode())
+            .append("parentCode", getParentCode())
+            .append("name", getName())
+            .append("level", getLevel())
+            .append("createTime", getCreateTime())
+            .append("ancestors", getAncestors())
+            .append("children", getChildren())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/sy/domain/SyVocationalHitsLack.java

@@ -0,0 +1,136 @@
+package com.ruoyi.sy.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 职业热度与紧缺对象 sy_vocational_hits_lack
+ * 
+ * @author mingxue
+ * @date 2022-03-30
+ */
+public class SyVocationalHitsLack extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 编码 */
+    @Excel(name = "编码")
+    private String code;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String name;
+
+    /** 点击数 */
+    @Excel(name = "点击数")
+    private String hits;
+
+    /** 层级 */
+    @Excel(name = "层级")
+    private Long level;
+
+    /** 祖级详情 */
+    @Excel(name = "祖级详情")
+    private String levels;
+
+    /** 简介 */
+    @Excel(name = "简介")
+    private String summary;
+
+    /** 类型（1热门职业，2紧缺职业） */
+    @Excel(name = "类型", readConverterExp = "1=热门职业，2紧缺职业")
+    private Integer type;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setCode(String code) 
+    {
+        this.code = code;
+    }
+
+    public String getCode() 
+    {
+        return code;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setHits(String hits) 
+    {
+        this.hits = hits;
+    }
+
+    public String getHits() 
+    {
+        return hits;
+    }
+    public void setLevel(Long level) 
+    {
+        this.level = level;
+    }
+
+    public Long getLevel() 
+    {
+        return level;
+    }
+    public void setLevels(String levels) 
+    {
+        this.levels = levels;
+    }
+
+    public String getLevels() 
+    {
+        return levels;
+    }
+    public void setSummary(String summary) 
+    {
+        this.summary = summary;
+    }
+
+    public String getSummary() 
+    {
+        return summary;
+    }
+    public void setType(Integer type) 
+    {
+        this.type = type;
+    }
+
+    public Integer getType() 
+    {
+        return type;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("code", getCode())
+            .append("name", getName())
+            .append("hits", getHits())
+            .append("level", getLevel())
+            .append("levels", getLevels())
+            .append("summary", getSummary())
+            .append("createTime", getCreateTime())
+            .append("type", getType())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/sy/domain/SyVocationalOverview.java

@@ -0,0 +1,223 @@
+package com.ruoyi.sy.domain;
+
+import com.alibaba.fastjson2.JSONArray;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 职业概况对象 sy_vocational_overview
+ * 
+ * @author mingxue
+ * @date 2022-03-30
+ */
+public class SyVocationalOverview extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 编码 */
+    @Excel(name = "编码")
+    private String code;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String name;
+
+    /** 职业介绍 */
+    @Excel(name = "职业介绍")
+    private String description;
+
+    /** 相关岗位 */
+    @Excel(name = "相关岗位")
+    private String postJobs;
+
+    /** 相关专业 */
+    @Excel(name = "相关专业")
+    private String postMajors;
+
+    /** 工作 */
+    @Excel(name = "工作")
+    private String jobs;
+
+    /** 点击数 */
+    @Excel(name = "点击数")
+    private String hits;
+
+    /** level */
+    @Excel(name = "level")
+    private Long level;
+
+    /** level名称 */
+    @Excel(name = "level名称")
+    private String levelName;
+
+    /** levels */
+    @Excel(name = "levels")
+    private String levels;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private Long status;
+
+    /** 总结 */
+    @Excel(name = "总结")
+    private String summary;
+
+    /** 标识 */
+    @Excel(name = "标识")
+    private String tags;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setCode(String code) 
+    {
+        this.code = code;
+    }
+
+    public String getCode() 
+    {
+        return code;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setDescription(String description) 
+    {
+        this.description = description;
+    }
+
+    public String getDescription() 
+    {
+        return description;
+    }
+    public void setPostJobs(String postJobs) 
+    {
+        this.postJobs = postJobs;
+    }
+
+    public JSONArray getPostJobs()
+    {
+        return JSONArray.parseArray(postJobs);
+    }
+
+    public void setPostMajors(String postMajors) 
+    {
+        this.postMajors = postMajors;
+    }
+
+    public JSONArray getPostMajors()
+    {
+        return JSONArray.parseArray(postMajors);
+    }
+
+    public void setJobs(String jobs)
+    {
+        this.jobs = jobs;
+    }
+
+    public JSONArray getJobs()
+    {
+        return JSONArray.parseArray(jobs);
+    }
+    public void setHits(String hits) 
+    {
+        this.hits = hits;
+    }
+
+    public String getHits() 
+    {
+        return hits;
+    }
+    public void setLevel(Long level) 
+    {
+        this.level = level;
+    }
+
+    public Long getLevel() 
+    {
+        return level;
+    }
+    public void setLevelName(String levelName) 
+    {
+        this.levelName = levelName;
+    }
+
+    public String getLevelName() 
+    {
+        return levelName;
+    }
+    public void setLevels(String levels) 
+    {
+        this.levels = levels;
+    }
+
+    public JSONArray getLevels()
+    {
+        return JSONArray.parseArray(levels);
+    }
+    public void setStatus(Long status) 
+    {
+        this.status = status;
+    }
+
+    public Long getStatus() 
+    {
+        return status;
+    }
+    public void setSummary(String summary) 
+    {
+        this.summary = summary;
+    }
+
+    public String getSummary() 
+    {
+        return summary;
+    }
+    public void setTags(String tags) 
+    {
+        this.tags = tags;
+    }
+
+    public JSONArray getTags()
+    {
+        return JSONArray.parseArray(tags);
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("code", getCode())
+            .append("name", getName())
+            .append("description", getDescription())
+            .append("postJobs", getPostJobs())
+            .append("postMajors", getPostMajors())
+            .append("jobs", getJobs())
+            .append("hits", getHits())
+            .append("level", getLevel())
+            .append("levelName", getLevelName())
+            .append("levels", getLevels())
+            .append("status", getStatus())
+            .append("summary", getSummary())
+            .append("tags", getTags())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/sy/domain/SyVocationalPost.java

@@ -0,0 +1,106 @@
+package com.ruoyi.sy.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 就业岗位对象 sy_vocational_post
+ * 
+ * @author mingxue
+ * @date 2022-03-30
+ */
+public class SyVocationalPost extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 岗位名称 */
+    @Excel(name = "岗位名称")
+    private String name;
+    /** 职业编码 */
+    @Excel(name = "职业编码")
+    private String code;
+
+    /** 最高薪资（元/月） */
+    @Excel(name = "最高薪资", readConverterExp = "元=/月")
+    private String salaryMax;
+
+    /** 最低薪资（元/月） */
+    @Excel(name = "最低薪资", readConverterExp = "元=/月")
+    private String salaryMin;
+
+    /** 薪资单位 */
+    @Excel(name = "薪资单位")
+    private String salaryUnit;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setSalaryMax(String salaryMax) 
+    {
+        this.salaryMax = salaryMax;
+    }
+
+    public String getSalaryMax() 
+    {
+        return salaryMax;
+    }
+    public void setSalaryMin(String salaryMin) 
+    {
+        this.salaryMin = salaryMin;
+    }
+
+    public String getSalaryMin() 
+    {
+        return salaryMin;
+    }
+    public void setSalaryUnit(String salaryUnit) 
+    {
+        this.salaryUnit = salaryUnit;
+    }
+
+    public String getSalaryUnit() 
+    {
+        return salaryUnit;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("code", getCode())
+            .append("name", getName())
+            .append("salaryMax", getSalaryMax())
+            .append("salaryMin", getSalaryMin())
+            .append("salaryUnit", getSalaryUnit())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/sy/domain/SyVocationalPostDetail.java

@@ -0,0 +1,206 @@
+package com.ruoyi.sy.domain;
+
+import com.alibaba.fastjson.JSONArray;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 就业岗位详情对象 sy_vocational_post_detail
+ * 
+ * @author mingxue
+ * @date 2022-03-30
+ */
+public class SyVocationalPostDetail extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 岗位名称 */
+    @Excel(name = "岗位名称")
+    private String name;
+
+    /** 薪资情况（按趋势） */
+    @Excel(name = "薪资情况", readConverterExp = "按=趋势")
+    private String experience;
+
+    /** 薪资情况（分布） */
+    @Excel(name = "薪资情况", readConverterExp = "分=布")
+    private String salary;
+
+    /** 就业形式（按学历） */
+    @Excel(name = "就业形式", readConverterExp = "按=学历")
+    private String edu;
+
+    /** 就业形式（按经验） */
+    @Excel(name = "就业形式", readConverterExp = "按=经验")
+    private String exp;
+
+    /** 招聘需求量 */
+    @Excel(name = "招聘需求量")
+    private String demand;
+
+    /** 收入排行-按行业 */
+    @Excel(name = "收入排行-按行业")
+    private String industrySalary;
+
+    /** 收入排行-按地区 */
+    @Excel(name = "收入排行-按地区")
+    private String citySalary;
+
+    /** 平均薪资 */
+    @Excel(name = "平均薪资")
+    private String salaryAvg;
+
+    /** 数据描述 */
+    @Excel(name = "数据描述")
+    private String sampleDesc;
+
+    /** 职业数据来源 */
+    @Excel(name = "职业数据来源")
+    private String vocationalSource;
+
+    /** 薪资数据来源 */
+    @Excel(name = "薪资数据来源")
+    private String salarySource;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setExperience(String experience) 
+    {
+        this.experience = experience;
+    }
+
+    public JSONArray getExperience()
+    {
+        return JSONArray.parseArray(experience);
+    }
+    public void setSalary(String salary) 
+    {
+        this.salary = salary;
+    }
+
+    public JSONArray getSalary()
+    {
+        return JSONArray.parseArray(salary);
+    }
+    public void setEdu(String edu) 
+    {
+        this.edu = edu;
+    }
+
+    public JSONArray getEdu()
+    {
+        return JSONArray.parseArray(edu);
+    }
+    public void setExp(String exp) 
+    {
+        this.exp = exp;
+    }
+
+    public JSONArray getExp()
+    {
+        return JSONArray.parseArray(exp);
+    }
+    public void setDemand(String demand) 
+    {
+        this.demand = demand;
+    }
+
+    public JSONArray getDemand()
+    {
+        return JSONArray.parseArray(demand);
+    }
+    public void setIndustrySalary(String industrySalary) 
+    {
+        this.industrySalary = industrySalary;
+    }
+
+    public JSONArray getIndustrySalary()
+    {
+        return JSONArray.parseArray(industrySalary);
+    }
+    public void setCitySalary(String citySalary) 
+    {
+        this.citySalary = citySalary;
+    }
+
+    public JSONArray getCitySalary()
+    {
+        return JSONArray.parseArray(citySalary);
+    }
+    public void setSalaryAvg(String salaryAvg) 
+    {
+        this.salaryAvg = salaryAvg;
+    }
+
+    public String getSalaryAvg() 
+    {
+        return salaryAvg;
+    }
+    public void setSampleDesc(String sampleDesc) 
+    {
+        this.sampleDesc = sampleDesc;
+    }
+
+    public String getSampleDesc() 
+    {
+        return sampleDesc;
+    }
+    public void setVocationalSource(String vocationalSource) 
+    {
+        this.vocationalSource = vocationalSource;
+    }
+
+    public String getVocationalSource() 
+    {
+        return vocationalSource;
+    }
+    public void setSalarySource(String salarySource) 
+    {
+        this.salarySource = salarySource;
+    }
+
+    public String getSalarySource() 
+    {
+        return salarySource;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("name", getName())
+            .append("experience", getExperience())
+            .append("salary", getSalary())
+            .append("edu", getEdu())
+            .append("exp", getExp())
+            .append("demand", getDemand())
+            .append("industrySalary", getIndustrySalary())
+            .append("citySalary", getCitySalary())
+            .append("salaryAvg", getSalaryAvg())
+            .append("sampleDesc", getSampleDesc())
+            .append("vocationalSource", getVocationalSource())
+            .append("salarySource", getSalarySource())
+            .toString();
+    }
+}

ie-system/src/main/java/com/ruoyi/sy/mapper/SyKnowledgeInterstMajorMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.sy.mapper;
+
+import java.util.List;
+import com.ruoyi.sy.domain.SyKnowledgeInterstMajor;
+
+/**
+ * 知识兴趣测评Mapper接口
+ * 
+ * @author mingxue
+ * @date 2022-03-02
+ */
+public interface SyKnowledgeInterstMajorMapper 
+{
+    /**
+     * 查询知识兴趣测评
+     * 
+     * @param id 知识兴趣测评ID
+     * @return 知识兴趣测评
+     */
+    public SyKnowledgeInterstMajor selectSyKnowledgeInterstMajorById(Long id);
+
+    /**
+     * 查询知识兴趣测评列表
+     * 
+     * @param syKnowledgeInterstMajor 知识兴趣测评
+     * @return 知识兴趣测评集合
+     */
+    public List<SyKnowledgeInterstMajor> selectSyKnowledgeInterstMajorList(SyKnowledgeInterstMajor syKnowledgeInterstMajor);
+
+    /**
+     * 新增知识兴趣测评
+     * 
+     * @param syKnowledgeInterstMajor 知识兴趣测评
+     * @return 结果
+     */
+    public int insertSyKnowledgeInterstMajor(SyKnowledgeInterstMajor syKnowledgeInterstMajor);
+
+    /**
+     * 修改知识兴趣测评
+     * 
+     * @param syKnowledgeInterstMajor 知识兴趣测评
+     * @return 结果
+     */
+    public int updateSyKnowledgeInterstMajor(SyKnowledgeInterstMajor syKnowledgeInterstMajor);
+
+    /**
+     * 删除知识兴趣测评
+     * 
+     * @param id 知识兴趣测评ID
+     * @return 结果
+     */
+    public int deleteSyKnowledgeInterstMajorById(Long id);
+
+    /**
+     * 批量删除知识兴趣测评
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyKnowledgeInterstMajorByIds(Long[] ids);
+}

ie-system/src/main/java/com/ruoyi/sy/mapper/SyKnowledgeInterstTypeMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.sy.mapper;
+
+import java.util.List;
+import com.ruoyi.sy.domain.SyKnowledgeInterstType;
+
+/**
+ * 知识兴趣类型Mapper接口
+ * 
+ * @author mingxue
+ * @date 2022-03-02
+ */
+public interface SyKnowledgeInterstTypeMapper 
+{
+    /**
+     * 查询知识兴趣类型
+     * 
+     * @param id 知识兴趣类型ID
+     * @return 知识兴趣类型
+     */
+    public SyKnowledgeInterstType selectSyKnowledgeInterstTypeById(Long id);
+
+    /**
+     * 查询知识兴趣类型列表
+     * 
+     * @param syKnowledgeInterstType 知识兴趣类型
+     * @return 知识兴趣类型集合
+     */
+    public List<SyKnowledgeInterstType> selectSyKnowledgeInterstTypeList(SyKnowledgeInterstType syKnowledgeInterstType);
+
+    /**
+     * 新增知识兴趣类型
+     * 
+     * @param syKnowledgeInterstType 知识兴趣类型
+     * @return 结果
+     */
+    public int insertSyKnowledgeInterstType(SyKnowledgeInterstType syKnowledgeInterstType);
+
+    /**
+     * 修改知识兴趣类型
+     * 
+     * @param syKnowledgeInterstType 知识兴趣类型
+     * @return 结果
+     */
+    public int updateSyKnowledgeInterstType(SyKnowledgeInterstType syKnowledgeInterstType);
+
+    /**
+     * 删除知识兴趣类型
+     * 
+     * @param id 知识兴趣类型ID
+     * @return 结果
+     */
+    public int deleteSyKnowledgeInterstTypeById(Long id);
+
+    /**
+     * 批量删除知识兴趣类型
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyKnowledgeInterstTypeByIds(Long[] ids);
+}

ie-system/src/main/java/com/ruoyi/sy/mapper/SyMajorCareerProspectsMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.sy.mapper;
+
+import java.util.List;
+import com.ruoyi.sy.domain.SyMajorCareerProspects;
+
+/**
+ * 专业就业前景Mapper接口
+ * 
+ * @author mingxue
+ * @date 2022-04-09
+ */
+public interface SyMajorCareerProspectsMapper 
+{
+    /**
+     * 查询专业就业前景
+     * 
+     * @param id 专业就业前景ID
+     * @return 专业就业前景
+     */
+    public SyMajorCareerProspects selectSyMajorCareerProspectsById(Long id);
+    public SyMajorCareerProspects selectSyMajorCareerProspectsByCode(String code);
+    public List<SyMajorCareerProspects> selectSyMajorCareerProspectsByCodes(List<String> codes);
+
+    /**
+     * 查询专业就业前景列表
+     * 
+     * @param syMajorCareerProspects 专业就业前景
+     * @return 专业就业前景集合
+     */
+    public List<SyMajorCareerProspects> selectSyMajorCareerProspectsList(SyMajorCareerProspects syMajorCareerProspects);
+
+    /**
+     * 新增专业就业前景
+     * 
+     * @param syMajorCareerProspects 专业就业前景
+     * @return 结果
+     */
+    public int insertSyMajorCareerProspects(SyMajorCareerProspects syMajorCareerProspects);
+
+    /**
+     * 修改专业就业前景
+     * 
+     * @param syMajorCareerProspects 专业就业前景
+     * @return 结果
+     */
+    public int updateSyMajorCareerProspects(SyMajorCareerProspects syMajorCareerProspects);
+
+    /**
+     * 删除专业就业前景
+     * 
+     * @param id 专业就业前景ID
+     * @return 结果
+     */
+    public int deleteSyMajorCareerProspectsById(Long id);
+
+    /**
+     * 批量删除专业就业前景
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyMajorCareerProspectsByIds(Long[] ids);
+}

ie-system/src/main/java/com/ruoyi/sy/mapper/SyMajorCategoryMapper.java

@@ -0,0 +1,72 @@
+package com.ruoyi.sy.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.sy.domain.SyMajorCategory;
+
+/**
+ * 二级专业Mapper接口
+ * 
+ * @author mingxue
+ * @date 2022-03-02
+ */
+public interface SyMajorCategoryMapper 
+{
+    /**
+     * 查询二级专业
+     * 
+     * @param id 二级专业ID
+     * @return 二级专业
+     */
+    public SyMajorCategory selectSyMajorCategoryById(Long id);
+
+    public List<SyMajorCategory> selectSyMajorCategoryListByView(Map cond);
+    public List<SyMajorCategory> selectSyMajorCategoryListByOccupation(Map cond);
+    public List<SyMajorCategory> selectSyMajorCategoryListByKnowledge(Map cond);
+    public List<SyMajorCategory> selectSelectedMajorList(Map cond);
+    public List<SyMajorCategory> selectAllMajorList(Map cond);
+
+    public List<SyMajorCategory> selectUserSyMajorCategory(Map cond);
+    public List<SyMajorCategory> selectUserSyMajorMajor(Map cond);
+
+    /**
+     * 查询二级专业列表
+     * 
+     * @param syMajorCategory 二级专业
+     * @return 二级专业集合
+     */
+    public List<SyMajorCategory> selectSyMajorCategoryList(SyMajorCategory syMajorCategory);
+
+    /**
+     * 新增二级专业
+     * 
+     * @param syMajorCategory 二级专业
+     * @return 结果
+     */
+    public int insertSyMajorCategory(SyMajorCategory syMajorCategory);
+
+    /**
+     * 修改二级专业
+     * 
+     * @param syMajorCategory 二级专业
+     * @return 结果
+     */
+    public int updateSyMajorCategory(SyMajorCategory syMajorCategory);
+
+    /**
+     * 删除二级专业
+     * 
+     * @param id 二级专业ID
+     * @return 结果
+     */
+    public int deleteSyMajorCategoryById(Long id);
+
+    /**
+     * 批量删除二级专业
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyMajorCategoryByIds(Long[] ids);
+}

ie-system/src/main/java/com/ruoyi/sy/mapper/SyMajorMajorMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.sy.mapper;
+
+import java.util.List;
+import com.ruoyi.sy.domain.SyMajorMajor;
+
+/**
+ * 三级专业Mapper接口
+ * 
+ * @author mingxue
+ * @date 2022-03-02
+ */
+public interface SyMajorMajorMapper 
+{
+    /**
+     * 查询三级专业
+     * 
+     * @param id 三级专业ID
+     * @return 三级专业
+     */
+    public SyMajorMajor selectSyMajorMajorById(Long id);
+
+    /**
+     * 查询三级专业列表
+     * 
+     * @param syMajorMajor 三级专业
+     * @return 三级专业集合
+     */
+    public List<SyMajorMajor> selectSyMajorMajorList(SyMajorMajor syMajorMajor);
+
+    /**
+     * 新增三级专业
+     * 
+     * @param syMajorMajor 三级专业
+     * @return 结果
+     */
+    public int insertSyMajorMajor(SyMajorMajor syMajorMajor);
+
+    /**
+     * 修改三级专业
+     * 
+     * @param syMajorMajor 三级专业
+     * @return 结果
+     */
+    public int updateSyMajorMajor(SyMajorMajor syMajorMajor);
+
+    /**
+     * 删除三级专业
+     * 
+     * @param id 三级专业ID
+     * @return 结果
+     */
+    public int deleteSyMajorMajorById(Long id);
+
+    /**
+     * 批量删除三级专业
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyMajorMajorByIds(Long[] ids);
+}

ie-system/src/main/java/com/ruoyi/sy/mapper/SyMajorMapper.java

@@ -0,0 +1,67 @@
+package com.ruoyi.sy.mapper;
+
+import com.ruoyi.sy.domain.SyMajor;
+import com.ruoyi.sy.domain.SyMajor;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 专业Mapper接口
+ *
+ * @author mingxue
+ * @date 2022-04-27
+ */
+public interface SyMajorMapper
+{
+    /**
+     * 查询专业
+     *
+     * @param id 专业ID
+     * @return 专业
+     */
+    public SyMajor selectSyMajorById(Long id);
+    public SyMajor selectSyMajorByCode(@Param("examType") String examType, @Param("code") String code);
+    public List<SyMajor> selectSyMajorByLevel(@Param("examType") String examType, @Param("level") Integer level);
+
+    /**
+     * 查询专业列表
+     *
+     * @param syMajor 专业
+     * @return 专业集合
+     */
+    public List<SyMajor> selectSyMajorList(SyMajor syMajor);
+    public List<SyMajor> selectSyMajorAndChildrenByCode(SyMajor syMajor);
+
+    /**
+     * 新增专业
+     *
+     * @param syMajor 专业
+     * @return 结果
+     */
+    public int insertSyMajor(SyMajor syMajor);
+
+    /**
+     * 修改专业
+     *
+     * @param syMajor 专业
+     * @return 结果
+     */
+    public int updateSyMajor(SyMajor syMajor);
+
+    /**
+     * 删除专业
+     *
+     * @param id 专业ID
+     * @return 结果
+     */
+    public int deleteSyMajorById(Long id);
+
+    /**
+     * 批量删除专业
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyMajorByIds(Long[] ids);
+}

ie-system/src/main/java/com/ruoyi/sy/mapper/SyMajorOverviewMapper.java

@@ -0,0 +1,64 @@
+package com.ruoyi.sy.mapper;
+
+import java.util.List;
+import com.ruoyi.sy.domain.SyMajorOverview;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 三级专业概况Mapper接口
+ * 
+ * @author mingxue
+ * @date 2022-04-13
+ */
+public interface SyMajorOverviewMapper 
+{
+    /**
+     * 查询三级专业概况
+     * 
+     * @param id 三级专业概况ID
+     * @return 三级专业概况
+     */
+    public SyMajorOverview selectSyMajorOverviewById(Long id);
+    public SyMajorOverview selectSyMajorOverviewByCode(@Param("examType") String examType, @Param("code") String code);
+    public List<SyMajorOverview> selectSyMajorOverviewByCodes(@Param("examType") String examType, @Param("codes") List<String> codes);
+
+    /**
+     * 查询三级专业概况列表
+     * 
+     * @param syMajorOverview 三级专业概况
+     * @return 三级专业概况集合
+     */
+    public List<SyMajorOverview> selectSyMajorOverviewList(SyMajorOverview syMajorOverview);
+
+    /**
+     * 新增三级专业概况
+     * 
+     * @param syMajorOverview 三级专业概况
+     * @return 结果
+     */
+    public int insertSyMajorOverview(SyMajorOverview syMajorOverview);
+
+    /**
+     * 修改三级专业概况
+     * 
+     * @param syMajorOverview 三级专业概况
+     * @return 结果
+     */
+    public int updateSyMajorOverview(SyMajorOverview syMajorOverview);
+
+    /**
+     * 删除三级专业概况
+     * 
+     * @param id 三级专业概况ID
+     * @return 结果
+     */
+    public int deleteSyMajorOverviewById(Long id);
+
+    /**
+     * 批量删除三级专业概况
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyMajorOverviewByIds(Long[] ids);
+}

ie-system/src/main/java/com/ruoyi/sy/mapper/SyMajorSubjectMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.sy.mapper;
+
+import java.util.List;
+import com.ruoyi.sy.domain.SyMajorSubject;
+
+/**
+ * 专业Mapper接口
+ * 
+ * @author mingxue
+ * @date 2022-04-27
+ */
+public interface SyMajorSubjectMapper 
+{
+    /**
+     * 查询专业
+     * 
+     * @param id 专业ID
+     * @return 专业
+     */
+    public SyMajorSubject selectSyMajorSubjectById(Long id);
+
+    /**
+     * 查询专业列表
+     * 
+     * @param syMajorSubject 专业
+     * @return 专业集合
+     */
+    public List<SyMajorSubject> selectSyMajorSubjectList(SyMajorSubject syMajorSubject);
+
+    /**
+     * 新增专业
+     * 
+     * @param syMajorSubject 专业
+     * @return 结果
+     */
+    public int insertSyMajorSubject(SyMajorSubject syMajorSubject);
+
+    /**
+     * 修改专业
+     * 
+     * @param syMajorSubject 专业
+     * @return 结果
+     */
+    public int updateSyMajorSubject(SyMajorSubject syMajorSubject);
+
+    /**
+     * 删除专业
+     * 
+     * @param id 专业ID
+     * @return 结果
+     */
+    public int deleteSyMajorSubjectById(Long id);
+
+    /**
+     * 批量删除专业
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyMajorSubjectByIds(Long[] ids);
+}

ie-system/src/main/java/com/ruoyi/sy/mapper/SyMajorUniversityMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.sy.mapper;
+
+import java.util.List;
+import com.ruoyi.sy.domain.SyMajorUniversity;
+
+/**
+ * 专业开设院校Mapper接口
+ * 
+ * @author mingxue
+ * @date 2022-07-01
+ */
+public interface SyMajorUniversityMapper 
+{
+    /**
+     * 查询专业开设院校
+     * 
+     * @param id 专业开设院校ID
+     * @return 专业开设院校
+     */
+    public SyMajorUniversity selectSyMajorUniversityById(Long id);
+
+    /**
+     * 查询专业开设院校列表
+     * 
+     * @param syMajorUniversity 专业开设院校
+     * @return 专业开设院校集合
+     */
+    public List<SyMajorUniversity> selectSyMajorUniversityList(SyMajorUniversity syMajorUniversity);
+
+    /**
+     * 新增专业开设院校
+     * 
+     * @param syMajorUniversity 专业开设院校
+     * @return 结果
+     */
+    public int insertSyMajorUniversity(SyMajorUniversity syMajorUniversity);
+
+    /**
+     * 修改专业开设院校
+     * 
+     * @param syMajorUniversity 专业开设院校
+     * @return 结果
+     */
+    public int updateSyMajorUniversity(SyMajorUniversity syMajorUniversity);
+
+    /**
+     * 删除专业开设院校
+     * 
+     * @param id 专业开设院校ID
+     * @return 结果
+     */
+    public int deleteSyMajorUniversityById(Long id);
+
+    /**
+     * 批量删除专业开设院校
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyMajorUniversityByIds(Long[] ids);
+}

ie-system/src/main/java/com/ruoyi/sy/mapper/SyOccupationInterstMajorMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.sy.mapper;
+
+import java.util.List;
+import com.ruoyi.sy.domain.SyOccupationInterstMajor;
+
+/**
+ * 职业兴趣结论Mapper接口
+ * 
+ * @author mingxue
+ * @date 2022-03-02
+ */
+public interface SyOccupationInterstMajorMapper 
+{
+    /**
+     * 查询职业兴趣结论
+     * 
+     * @param id 职业兴趣结论ID
+     * @return 职业兴趣结论
+     */
+    public SyOccupationInterstMajor selectSyOccupationInterstMajorById(Long id);
+
+    /**
+     * 查询职业兴趣结论列表
+     * 
+     * @param syOccupationInterstMajor 职业兴趣结论
+     * @return 职业兴趣结论集合
+     */
+    public List<SyOccupationInterstMajor> selectSyOccupationInterstMajorList(SyOccupationInterstMajor syOccupationInterstMajor);
+
+    /**
+     * 新增职业兴趣结论
+     * 
+     * @param syOccupationInterstMajor 职业兴趣结论
+     * @return 结果
+     */
+    public int insertSyOccupationInterstMajor(SyOccupationInterstMajor syOccupationInterstMajor);
+
+    /**
+     * 修改职业兴趣结论
+     * 
+     * @param syOccupationInterstMajor 职业兴趣结论
+     * @return 结果
+     */
+    public int updateSyOccupationInterstMajor(SyOccupationInterstMajor syOccupationInterstMajor);
+
+    /**
+     * 删除职业兴趣结论
+     * 
+     * @param id 职业兴趣结论ID
+     * @return 结果
+     */
+    public int deleteSyOccupationInterstMajorById(Long id);
+
+    /**
+     * 批量删除职业兴趣结论
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyOccupationInterstMajorByIds(Long[] ids);
+}

ie-system/src/main/java/com/ruoyi/sy/mapper/SyOccupationInterstTypeMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.sy.mapper;
+
+import java.util.List;
+import com.ruoyi.sy.domain.SyOccupationInterstType;
+
+/**
+ * 职业兴趣类型Mapper接口
+ * 
+ * @author mingxue
+ * @date 2022-03-02
+ */
+public interface SyOccupationInterstTypeMapper 
+{
+    /**
+     * 查询职业兴趣类型
+     * 
+     * @param id 职业兴趣类型ID
+     * @return 职业兴趣类型
+     */
+    public SyOccupationInterstType selectSyOccupationInterstTypeById(Long id);
+
+    /**
+     * 查询职业兴趣类型列表
+     * 
+     * @param syOccupationInterstType 职业兴趣类型
+     * @return 职业兴趣类型集合
+     */
+    public List<SyOccupationInterstType> selectSyOccupationInterstTypeList(SyOccupationInterstType syOccupationInterstType);
+
+    /**
+     * 新增职业兴趣类型
+     * 
+     * @param syOccupationInterstType 职业兴趣类型
+     * @return 结果
+     */
+    public int insertSyOccupationInterstType(SyOccupationInterstType syOccupationInterstType);
+
+    /**
+     * 修改职业兴趣类型
+     * 
+     * @param syOccupationInterstType 职业兴趣类型
+     * @return 结果
+     */
+    public int updateSyOccupationInterstType(SyOccupationInterstType syOccupationInterstType);
+
+    /**
+     * 删除职业兴趣类型
+     * 
+     * @param id 职业兴趣类型ID
+     * @return 结果
+     */
+    public int deleteSyOccupationInterstTypeById(Long id);
+
+    /**
+     * 批量删除职业兴趣类型
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyOccupationInterstTypeByIds(Long[] ids);
+}

ie-system/src/main/java/com/ruoyi/sy/mapper/SyPhilosophyViewMajorMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.sy.mapper;
+
+import java.util.List;
+import com.ruoyi.sy.domain.SyPhilosophyViewMajor;
+
+/**
+ * 价值观专业Mapper接口
+ * 
+ * @author mingxue
+ * @date 2022-03-02
+ */
+public interface SyPhilosophyViewMajorMapper 
+{
+    /**
+     * 查询价值观专业
+     * 
+     * @param id 价值观专业ID
+     * @return 价值观专业
+     */
+    public SyPhilosophyViewMajor selectSyPhilosophyViewMajorById(Long id);
+
+    /**
+     * 查询价值观专业列表
+     * 
+     * @param syPhilosophyViewMajor 价值观专业
+     * @return 价值观专业集合
+     */
+    public List<SyPhilosophyViewMajor> selectSyPhilosophyViewMajorList(SyPhilosophyViewMajor syPhilosophyViewMajor);
+
+    /**
+     * 新增价值观专业
+     * 
+     * @param syPhilosophyViewMajor 价值观专业
+     * @return 结果
+     */
+    public int insertSyPhilosophyViewMajor(SyPhilosophyViewMajor syPhilosophyViewMajor);
+
+    /**
+     * 修改价值观专业
+     * 
+     * @param syPhilosophyViewMajor 价值观专业
+     * @return 结果
+     */
+    public int updateSyPhilosophyViewMajor(SyPhilosophyViewMajor syPhilosophyViewMajor);
+
+    /**
+     * 删除价值观专业
+     * 
+     * @param id 价值观专业ID
+     * @return 结果
+     */
+    public int deleteSyPhilosophyViewMajorById(Long id);
+
+    /**
+     * 批量删除价值观专业
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyPhilosophyViewMajorByIds(Long[] ids);
+}

ie-system/src/main/java/com/ruoyi/sy/mapper/SyPhilosophyViewTypeMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.sy.mapper;
+
+import java.util.List;
+import com.ruoyi.sy.domain.SyPhilosophyViewType;
+
+/**
+ * 价值观解读Mapper接口
+ * 
+ * @author mingxue
+ * @date 2022-03-02
+ */
+public interface SyPhilosophyViewTypeMapper 
+{
+    /**
+     * 查询价值观解读
+     * 
+     * @param id 价值观解读ID
+     * @return 价值观解读
+     */
+    public SyPhilosophyViewType selectSyPhilosophyViewTypeById(Long id);
+
+    /**
+     * 查询价值观解读列表
+     * 
+     * @param syPhilosophyViewType 价值观解读
+     * @return 价值观解读集合
+     */
+    public List<SyPhilosophyViewType> selectSyPhilosophyViewTypeList(SyPhilosophyViewType syPhilosophyViewType);
+
+    /**
+     * 新增价值观解读
+     * 
+     * @param syPhilosophyViewType 价值观解读
+     * @return 结果
+     */
+    public int insertSyPhilosophyViewType(SyPhilosophyViewType syPhilosophyViewType);
+
+    /**
+     * 修改价值观解读
+     * 
+     * @param syPhilosophyViewType 价值观解读
+     * @return 结果
+     */
+    public int updateSyPhilosophyViewType(SyPhilosophyViewType syPhilosophyViewType);
+
+    /**
+     * 删除价值观解读
+     * 
+     * @param id 价值观解读ID
+     * @return 结果
+     */
+    public int deleteSyPhilosophyViewTypeById(Long id);
+
+    /**
+     * 批量删除价值观解读
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyPhilosophyViewTypeByIds(Long[] ids);
+}

ie-system/src/main/java/com/ruoyi/sy/mapper/SyTestAnswersMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.sy.mapper;
+
+import java.util.List;
+import com.ruoyi.sy.domain.SyTestAnswers;
+
+/**
+ * 答题卡Mapper接口
+ * 
+ * @author mingxue
+ * @date 2022-03-02
+ */
+public interface SyTestAnswersMapper 
+{
+    /**
+     * 查询答题卡
+     * 
+     * @param answerId 答题卡ID
+     * @return 答题卡
+     */
+    public SyTestAnswers selectSyTestAnswersById(Long answerId);
+
+    /**
+     * 查询答题卡列表
+     * 
+     * @param syTestAnswers 答题卡
+     * @return 答题卡集合
+     */
+    public List<SyTestAnswers> selectSyTestAnswersList(SyTestAnswers syTestAnswers);
+
+    /**
+     * 新增答题卡
+     * 
+     * @param syTestAnswers 答题卡
+     * @return 结果
+     */
+    public int insertSyTestAnswers(SyTestAnswers syTestAnswers);
+
+    /**
+     * 修改答题卡
+     * 
+     * @param syTestAnswers 答题卡
+     * @return 结果
+     */
+    public int updateSyTestAnswers(SyTestAnswers syTestAnswers);
+
+    /**
+     * 删除答题卡
+     * 
+     * @param answerId 答题卡ID
+     * @return 结果
+     */
+    public int deleteSyTestAnswersById(Long answerId);
+
+    /**
+     * 批量删除答题卡
+     * 
+     * @param answerIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyTestAnswersByIds(Long[] answerIds);
+}

ie-system/src/main/java/com/ruoyi/sy/mapper/SyTestExamineeMapper.java

@@ -0,0 +1,65 @@
+package com.ruoyi.sy.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.sy.domain.SyTestExaminee;
+
+/**
+ * 测评人员Mapper接口
+ * 
+ * @author mingxue
+ * @date 2022-03-02
+ */
+public interface SyTestExamineeMapper 
+{
+    /**
+     * 查询测评人员
+     * 
+     * @param examineeId 测评人员ID
+     * @return 测评人员
+     */
+    public SyTestExaminee selectSyTestExamineeById(Long examineeId);
+
+    public List<SyTestExaminee> selectSyTestExamineeLatest(Map cond);
+
+    /**
+     * 查询测评人员列表
+     * 
+     * @param syTestExaminee 测评人员
+     * @return 测评人员集合
+     */
+    public List<SyTestExaminee> selectSyTestExamineeList(SyTestExaminee syTestExaminee);
+
+    /**
+     * 新增测评人员
+     * 
+     * @param syTestExaminee 测评人员
+     * @return 结果
+     */
+    public int insertSyTestExaminee(SyTestExaminee syTestExaminee);
+
+    /**
+     * 修改测评人员
+     * 
+     * @param syTestExaminee 测评人员
+     * @return 结果
+     */
+    public int updateSyTestExaminee(SyTestExaminee syTestExaminee);
+
+    /**
+     * 删除测评人员
+     * 
+     * @param examineeId 测评人员ID
+     * @return 结果
+     */
+    public int deleteSyTestExamineeById(Long examineeId);
+
+    /**
+     * 批量删除测评人员
+     * 
+     * @param examineeIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyTestExamineeByIds(Long[] examineeIds);
+}

ie-system/src/main/java/com/ruoyi/sy/mapper/SyTestPaperMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.sy.mapper;
+
+import java.util.List;
+import com.ruoyi.sy.domain.SyTestPaper;
+
+/**
+ * 选科测试卷Mapper接口
+ * 
+ * @author mingxue
+ * @date 2022-03-02
+ */
+public interface SyTestPaperMapper 
+{
+    /**
+     * 查询选科测试卷
+     * 
+     * @param paperId 选科测试卷ID
+     * @return 选科测试卷
+     */
+    public SyTestPaper selectSyTestPaperById(Long paperId);
+
+    /**
+     * 查询选科测试卷列表
+     * 
+     * @param syTestPaper 选科测试卷
+     * @return 选科测试卷集合
+     */
+    public List<SyTestPaper> selectSyTestPaperList(SyTestPaper syTestPaper);
+
+    /**
+     * 新增选科测试卷
+     * 
+     * @param syTestPaper 选科测试卷
+     * @return 结果
+     */
+    public int insertSyTestPaper(SyTestPaper syTestPaper);
+
+    /**
+     * 修改选科测试卷
+     * 
+     * @param syTestPaper 选科测试卷
+     * @return 结果
+     */
+    public int updateSyTestPaper(SyTestPaper syTestPaper);
+
+    /**
+     * 删除选科测试卷
+     * 
+     * @param paperId 选科测试卷ID
+     * @return 结果
+     */
+    public int deleteSyTestPaperById(Long paperId);
+
+    /**
+     * 批量删除选科测试卷
+     * 
+     * @param paperIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyTestPaperByIds(Long[] paperIds);
+}

ie-system/src/main/java/com/ruoyi/sy/mapper/SyTestQuestionMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.sy.mapper;
+
+import java.util.List;
+import com.ruoyi.sy.domain.SyTestQuestion;
+
+/**
+ * 组卷题目Mapper接口
+ * 
+ * @author mingxue
+ * @date 2022-03-02
+ */
+public interface SyTestQuestionMapper 
+{
+    /**
+     * 查询组卷题目
+     * 
+     * @param questionId 组卷题目ID
+     * @return 组卷题目
+     */
+    public SyTestQuestion selectSyTestQuestionById(Long questionId);
+
+    /**
+     * 查询组卷题目列表
+     * 
+     * @param syTestQuestion 组卷题目
+     * @return 组卷题目集合
+     */
+    public List<SyTestQuestion> selectSyTestQuestionList(SyTestQuestion syTestQuestion);
+
+    /**
+     * 新增组卷题目
+     * 
+     * @param syTestQuestion 组卷题目
+     * @return 结果
+     */
+    public int insertSyTestQuestion(SyTestQuestion syTestQuestion);
+
+    /**
+     * 修改组卷题目
+     * 
+     * @param syTestQuestion 组卷题目
+     * @return 结果
+     */
+    public int updateSyTestQuestion(SyTestQuestion syTestQuestion);
+
+    /**
+     * 删除组卷题目
+     * 
+     * @param questionId 组卷题目ID
+     * @return 结果
+     */
+    public int deleteSyTestQuestionById(Long questionId);
+
+    /**
+     * 批量删除组卷题目
+     * 
+     * @param questionIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyTestQuestionByIds(Long[] questionIds);
+}

ie-system/src/main/java/com/ruoyi/sy/mapper/SyTestSelectCategoryMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.sy.mapper;
+
+import java.util.List;
+import com.ruoyi.sy.domain.SyTestSelectCategory;
+
+/**
+ * 测评选专业类Mapper接口
+ * 
+ * @author mingxue
+ * @date 2022-03-02
+ */
+public interface SyTestSelectCategoryMapper 
+{
+    /**
+     * 查询测评选专业类
+     * 
+     * @param id 测评选专业类ID
+     * @return 测评选专业类
+     */
+    public SyTestSelectCategory selectSyTestSelectCategoryById(Long id);
+
+    /**
+     * 查询测评选专业类列表
+     * 
+     * @param syTestSelectCategory 测评选专业类
+     * @return 测评选专业类集合
+     */
+    public List<SyTestSelectCategory> selectSyTestSelectCategoryList(SyTestSelectCategory syTestSelectCategory);
+
+    /**
+     * 新增测评选专业类
+     * 
+     * @param syTestSelectCategory 测评选专业类
+     * @return 结果
+     */
+    public int insertSyTestSelectCategory(SyTestSelectCategory syTestSelectCategory);
+
+    /**
+     * 修改测评选专业类
+     * 
+     * @param syTestSelectCategory 测评选专业类
+     * @return 结果
+     */
+    public int updateSyTestSelectCategory(SyTestSelectCategory syTestSelectCategory);
+
+    /**
+     * 删除测评选专业类
+     * 
+     * @param id 测评选专业类ID
+     * @return 结果
+     */
+    public int deleteSyTestSelectCategoryById(Long id);
+
+    /**
+     * 批量删除测评选专业类
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyTestSelectCategoryByIds(Long[] ids);
+}

ie-system/src/main/java/com/ruoyi/sy/mapper/SyTestSelectMajorMapper.java

@@ -0,0 +1,66 @@
+package com.ruoyi.sy.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.sy.domain.SyTestSelectMajor;
+
+/**
+ * 测评选专业Mapper接口
+ * 
+ * @author mingxue
+ * @date 2022-03-02
+ */
+public interface SyTestSelectMajorMapper 
+{
+    /**
+     * 查询测评选专业
+     * 
+     * @param id 测评选专业ID
+     * @return 测评选专业
+     */
+    public SyTestSelectMajor selectSyTestSelectMajorById(Long id);
+
+    public List<SyTestSelectMajor> selectSyTestSelectMajorForRecommend(Map cond);
+
+
+    /**
+     * 查询测评选专业列表
+     * 
+     * @param syTestSelectMajor 测评选专业
+     * @return 测评选专业集合
+     */
+    public List<SyTestSelectMajor> selectSyTestSelectMajorList(SyTestSelectMajor syTestSelectMajor);
+
+    /**
+     * 新增测评选专业
+     * 
+     * @param syTestSelectMajor 测评选专业
+     * @return 结果
+     */
+    public int insertSyTestSelectMajor(SyTestSelectMajor syTestSelectMajor);
+
+    /**
+     * 修改测评选专业
+     * 
+     * @param syTestSelectMajor 测评选专业
+     * @return 结果
+     */
+    public int updateSyTestSelectMajor(SyTestSelectMajor syTestSelectMajor);
+
+    /**
+     * 删除测评选专业
+     * 
+     * @param id 测评选专业ID
+     * @return 结果
+     */
+    public int deleteSyTestSelectMajorById(Long id);
+
+    /**
+     * 批量删除测评选专业
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyTestSelectMajorByIds(Long[] ids);
+}

ie-system/src/main/java/com/ruoyi/sy/mapper/SyVocationalHitsLackMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.sy.mapper;
+
+import java.util.List;
+import com.ruoyi.sy.domain.SyVocationalHitsLack;
+
+/**
+ * 职业热度与紧缺Mapper接口
+ * 
+ * @author mingxue
+ * @date 2022-03-30
+ */
+public interface SyVocationalHitsLackMapper 
+{
+    /**
+     * 查询职业热度与紧缺
+     * 
+     * @param id 职业热度与紧缺ID
+     * @return 职业热度与紧缺
+     */
+    public SyVocationalHitsLack selectSyVocationalHitsLackById(Long id);
+
+    /**
+     * 查询职业热度与紧缺列表
+     * 
+     * @param syVocationalHitsLack 职业热度与紧缺
+     * @return 职业热度与紧缺集合
+     */
+    public List<SyVocationalHitsLack> selectSyVocationalHitsLackList(SyVocationalHitsLack syVocationalHitsLack);
+
+    /**
+     * 新增职业热度与紧缺
+     * 
+     * @param syVocationalHitsLack 职业热度与紧缺
+     * @return 结果
+     */
+    public int insertSyVocationalHitsLack(SyVocationalHitsLack syVocationalHitsLack);
+
+    /**
+     * 修改职业热度与紧缺
+     * 
+     * @param syVocationalHitsLack 职业热度与紧缺
+     * @return 结果
+     */
+    public int updateSyVocationalHitsLack(SyVocationalHitsLack syVocationalHitsLack);
+
+    /**
+     * 删除职业热度与紧缺
+     * 
+     * @param id 职业热度与紧缺ID
+     * @return 结果
+     */
+    public int deleteSyVocationalHitsLackById(Long id);
+
+    /**
+     * 批量删除职业热度与紧缺
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyVocationalHitsLackByIds(Long[] ids);
+}

ie-system/src/main/java/com/ruoyi/sy/mapper/SyVocationalMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.sy.mapper;
+
+import java.util.List;
+import com.ruoyi.sy.domain.SyVocational;
+
+/**
+ * 职业Mapper接口
+ * 
+ * @author mingxue
+ * @date 2022-03-30
+ */
+public interface SyVocationalMapper 
+{
+    /**
+     * 查询职业
+     * 
+     * @param id 职业ID
+     * @return 职业
+     */
+    public SyVocational selectSyVocationalById(Long id);
+
+    /**
+     * 查询职业列表
+     * 
+     * @param syVocational 职业
+     * @return 职业集合
+     */
+    public List<SyVocational> selectSyVocationalList(SyVocational syVocational);
+
+    /**
+     * 新增职业
+     * 
+     * @param syVocational 职业
+     * @return 结果
+     */
+    public int insertSyVocational(SyVocational syVocational);
+
+    /**
+     * 修改职业
+     * 
+     * @param syVocational 职业
+     * @return 结果
+     */
+    public int updateSyVocational(SyVocational syVocational);
+
+    /**
+     * 删除职业
+     * 
+     * @param id 职业ID
+     * @return 结果
+     */
+    public int deleteSyVocationalById(Long id);
+
+    /**
+     * 批量删除职业
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyVocationalByIds(Long[] ids);
+}

ie-system/src/main/java/com/ruoyi/sy/mapper/SyVocationalOverviewMapper.java

@@ -0,0 +1,62 @@
+package com.ruoyi.sy.mapper;
+
+import java.util.List;
+import com.ruoyi.sy.domain.SyVocationalOverview;
+
+/**
+ * 职业概况Mapper接口
+ * 
+ * @author mingxue
+ * @date 2022-03-30
+ */
+public interface SyVocationalOverviewMapper 
+{
+    /**
+     * 查询职业概况
+     * 
+     * @param id 职业概况ID
+     * @return 职业概况
+     */
+    public SyVocationalOverview selectSyVocationalOverviewById(Long id);
+
+    /**
+     * 查询职业概况列表
+     * 
+     * @param syVocationalOverview 职业概况
+     * @return 职业概况集合
+     */
+    public List<SyVocationalOverview> selectSyVocationalOverviewList(SyVocationalOverview syVocationalOverview);
+    public SyVocationalOverview selectSyVocationalOverviewByCode(String code);
+
+    /**
+     * 新增职业概况
+     * 
+     * @param syVocationalOverview 职业概况
+     * @return 结果
+     */
+    public int insertSyVocationalOverview(SyVocationalOverview syVocationalOverview);
+
+    /**
+     * 修改职业概况
+     * 
+     * @param syVocationalOverview 职业概况
+     * @return 结果
+     */
+    public int updateSyVocationalOverview(SyVocationalOverview syVocationalOverview);
+
+    /**
+     * 删除职业概况
+     * 
+     * @param id 职业概况ID
+     * @return 结果
+     */
+    public int deleteSyVocationalOverviewById(Long id);
+
+    /**
+     * 批量删除职业概况
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyVocationalOverviewByIds(Long[] ids);
+}

ie-system/src/main/java/com/ruoyi/sy/mapper/SyVocationalPostDetailMapper.java

@@ -0,0 +1,62 @@
+package com.ruoyi.sy.mapper;
+
+import java.util.List;
+import com.ruoyi.sy.domain.SyVocationalPostDetail;
+
+/**
+ * 就业岗位详情Mapper接口
+ * 
+ * @author mingxue
+ * @date 2022-03-30
+ */
+public interface SyVocationalPostDetailMapper 
+{
+    /**
+     * 查询就业岗位详情
+     * 
+     * @param id 就业岗位详情ID
+     * @return 就业岗位详情
+     */
+    public SyVocationalPostDetail selectSyVocationalPostDetailById(Long id);
+    public SyVocationalPostDetail selectSyVocationalPostDetailByName(String name);
+
+    /**
+     * 查询就业岗位详情列表
+     * 
+     * @param syVocationalPostDetail 就业岗位详情
+     * @return 就业岗位详情集合
+     */
+    public List<SyVocationalPostDetail> selectSyVocationalPostDetailList(SyVocationalPostDetail syVocationalPostDetail);
+
+    /**
+     * 新增就业岗位详情
+     * 
+     * @param syVocationalPostDetail 就业岗位详情
+     * @return 结果
+     */
+    public int insertSyVocationalPostDetail(SyVocationalPostDetail syVocationalPostDetail);
+
+    /**
+     * 修改就业岗位详情
+     * 
+     * @param syVocationalPostDetail 就业岗位详情
+     * @return 结果
+     */
+    public int updateSyVocationalPostDetail(SyVocationalPostDetail syVocationalPostDetail);
+
+    /**
+     * 删除就业岗位详情
+     * 
+     * @param id 就业岗位详情ID
+     * @return 结果
+     */
+    public int deleteSyVocationalPostDetailById(Long id);
+
+    /**
+     * 批量删除就业岗位详情
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyVocationalPostDetailByIds(Long[] ids);
+}