提交
This commit is contained in:
zlwu committed
1 parent
5977a134ee
commit
4a6b28fe3e
16 files changed
+4970
-1310
No files matched your search
+14
@@ -37,6 +37,7 @@ import org.dromara.common.excel.service.SqlCacheConfigService;
|
||||
import org.dromara.common.core.utils.SpringUtils;
|
||||
import org.dromara.xg.domain.vo.XgStudentMsgVo;
|
||||
import org.dromara.xg.domain.bo.XgStudentMsgBo;
|
||||
import org.dromara.xg.domain.bo.XgStudentMsgAdvancedSearchBo;
|
||||
import org.dromara.xg.service.IXgStudentMsgService;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.tenant.helper.TenantHelper;
|
||||
@@ -378,6 +379,19 @@ public class XgStudentMsgController extends BaseController {
|
||||
return R.ok(students);
|
||||
}
|
||||
|
||||
/**
|
||||
* 高级检索学生信息
|
||||
*
|
||||
* @param bo 高级检索条件
|
||||
* @return 学生信息分页列表
|
||||
*/
|
||||
@SaCheckPermission("studentMsg:studentMsg:list")
|
||||
@PostMapping("/advancedSearch")
|
||||
public TableDataInfo<XgStudentMsgVo> advancedSearch(@RequestBody XgStudentMsgAdvancedSearchBo bo) {
|
||||
log.info("接收到高级检索请求，检索条件: {}", bo);
|
||||
return xgStudentMsgService.advancedSearch(bo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导入数据
|
||||
*
|
||||
|
||||
+560
@@ -0,0 +1,560 @@
|
||||
package org.dromara.xg.domain.bo;
|
||||
|
||||
import lombok.Data;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
/**
|
||||
* 学生信息高级检索业务对象
|
||||
*
|
||||
* @author zlwu
|
||||
* @date 2025-01-27
|
||||
*/
|
||||
@Data
|
||||
public class XgStudentMsgAdvancedSearchBo {
|
||||
|
||||
// ==================== 基础信息检索 ====================
|
||||
|
||||
/**
|
||||
* 学号（模糊查询）
|
||||
*/
|
||||
private String studentNo;
|
||||
|
||||
/**
|
||||
* 姓名（模糊查询）
|
||||
*/
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* 身份证号（模糊查询）
|
||||
*/
|
||||
private String idCard;
|
||||
|
||||
/**
|
||||
* 手机号码（模糊查询）
|
||||
*/
|
||||
private String phone;
|
||||
|
||||
/**
|
||||
* 邮箱（模糊查询）
|
||||
*/
|
||||
private String email;
|
||||
|
||||
/**
|
||||
* 性别：0-男，1-女
|
||||
*/
|
||||
private List<String> gender;
|
||||
|
||||
/**
|
||||
* 民族
|
||||
*/
|
||||
private List<String> nationality;
|
||||
|
||||
/**
|
||||
* 政治面貌
|
||||
*/
|
||||
private List<String> politicalStatus;
|
||||
|
||||
/**
|
||||
* 出生日期范围 - 开始
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private Date birthDateStart;
|
||||
|
||||
/**
|
||||
* 出生日期范围 - 结束
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private Date birthDateEnd;
|
||||
|
||||
/**
|
||||
* 英文姓名（模糊查询）
|
||||
*/
|
||||
private String nameEnglish;
|
||||
|
||||
/**
|
||||
* 曾用名（模糊查询）
|
||||
*/
|
||||
private String formerName;
|
||||
|
||||
/**
|
||||
* 籍贯
|
||||
*/
|
||||
private List<String> nativePlace;
|
||||
|
||||
/**
|
||||
* 户籍所在地（模糊查询）
|
||||
*/
|
||||
private String hukouLocation;
|
||||
|
||||
/**
|
||||
* 家庭地址（模糊查询）
|
||||
*/
|
||||
private String homeAddress;
|
||||
|
||||
/**
|
||||
* 现住址（模糊查询）
|
||||
*/
|
||||
private String currentAddress;
|
||||
|
||||
/**
|
||||
* QQ号码
|
||||
*/
|
||||
private String qq;
|
||||
|
||||
/**
|
||||
* 微信号
|
||||
*/
|
||||
private String wechat;
|
||||
|
||||
/**
|
||||
* 婚姻状况：1 未婚、2 已婚、3 离异、4 丧偶
|
||||
*/
|
||||
private List<String> maritalStatus;
|
||||
|
||||
/**
|
||||
* 宗教信仰
|
||||
*/
|
||||
private String religion;
|
||||
|
||||
/**
|
||||
* 户口类型：农业、非农业
|
||||
*/
|
||||
private List<String> householdRegisterType;
|
||||
|
||||
/**
|
||||
* 文化程度
|
||||
*/
|
||||
private List<String> educationLevel;
|
||||
|
||||
// ==================== 学籍信息检索 ====================
|
||||
|
||||
/**
|
||||
* 学籍状态：1-在籍，2-休学，3-复学，4-退学，5-毕业
|
||||
*/
|
||||
private List<String> studentStatus;
|
||||
|
||||
/**
|
||||
* 入学年份范围 - 开始
|
||||
*/
|
||||
private Long enrollmentYearStart;
|
||||
|
||||
/**
|
||||
* 入学年份范围 - 结束
|
||||
*/
|
||||
private Long enrollmentYearEnd;
|
||||
|
||||
/**
|
||||
* 入学日期范围 - 开始
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private Date enrollmentDateStart;
|
||||
|
||||
/**
|
||||
* 入学日期范围 - 结束
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private Date enrollmentDateEnd;
|
||||
|
||||
/**
|
||||
* 录取类别：统招、自主招生、专项计划等
|
||||
*/
|
||||
private List<String> admissionCategory;
|
||||
|
||||
// ==================== 学院专业班级检索 ====================
|
||||
|
||||
/**
|
||||
* 学院名称（模糊查询）
|
||||
*/
|
||||
private String collegeName;
|
||||
|
||||
/**
|
||||
* 专业名称（模糊查询）
|
||||
*/
|
||||
private String majorName;
|
||||
|
||||
/**
|
||||
* 班级名称（模糊查询）
|
||||
*/
|
||||
private String className;
|
||||
|
||||
/**
|
||||
* 年级
|
||||
*/
|
||||
private List<String> grade;
|
||||
|
||||
/**
|
||||
* 年级范围 - 最小值
|
||||
*/
|
||||
private String gradeMin;
|
||||
|
||||
/**
|
||||
* 年级范围 - 最大值
|
||||
*/
|
||||
private String gradeMax;
|
||||
|
||||
/**
|
||||
* 辅导员姓名（模糊查询）
|
||||
*/
|
||||
private String counselorName;
|
||||
|
||||
/**
|
||||
* 班主任姓名（模糊查询）
|
||||
*/
|
||||
private String classTeacherName;
|
||||
|
||||
// ==================== 家庭信息检索 ====================
|
||||
|
||||
/**
|
||||
* 父亲姓名（模糊查询）
|
||||
*/
|
||||
private String fatherName;
|
||||
|
||||
/**
|
||||
* 母亲姓名（模糊查询）
|
||||
*/
|
||||
private String motherName;
|
||||
|
||||
/**
|
||||
* 监护人姓名（模糊查询）
|
||||
*/
|
||||
private String guardianName;
|
||||
|
||||
/**
|
||||
* 家庭年收入范围 - 最小值
|
||||
*/
|
||||
private Double familyIncomeMin;
|
||||
|
||||
/**
|
||||
* 家庭年收入范围 - 最大值
|
||||
*/
|
||||
private Double familyIncomeMax;
|
||||
|
||||
/**
|
||||
* 人均收入范围 - 最小值
|
||||
*/
|
||||
private Double perCapitaIncomeMin;
|
||||
|
||||
/**
|
||||
* 人均收入范围 - 最大值
|
||||
*/
|
||||
private Double perCapitaIncomeMax;
|
||||
|
||||
/**
|
||||
* 家庭经济状况：富裕、一般、困难、特困
|
||||
*/
|
||||
private List<String> familyEconomicStatus;
|
||||
|
||||
/**
|
||||
* 家庭成员数量范围 - 最小值
|
||||
*/
|
||||
private Long familyMembersMin;
|
||||
|
||||
/**
|
||||
* 家庭成员数量范围 - 最大值
|
||||
*/
|
||||
private Long familyMembersMax;
|
||||
|
||||
// ==================== 特殊身份检索 ====================
|
||||
|
||||
/**
|
||||
* 是否贫困生：0-否，1-是
|
||||
*/
|
||||
private List<String> isPoorStudent;
|
||||
|
||||
/**
|
||||
* 是否少数民族：0-否，1-是
|
||||
*/
|
||||
private List<String> isMinority;
|
||||
|
||||
/**
|
||||
* 是否残疾：0-否，1-是
|
||||
*/
|
||||
private List<String> isDisabled;
|
||||
|
||||
/**
|
||||
* 是否孤儿：0-否，1-是
|
||||
*/
|
||||
private List<String> isOrphan;
|
||||
|
||||
/**
|
||||
* 是否留守儿童：0-否，1-是
|
||||
*/
|
||||
private List<String> isLeftBehindChild;
|
||||
|
||||
/**
|
||||
* 是否独生子女：0-否，1-是
|
||||
*/
|
||||
private List<String> isSingleChild;
|
||||
|
||||
/**
|
||||
* 是否低保：0-否，1-是
|
||||
*/
|
||||
private List<String> isLowIncome;
|
||||
|
||||
/**
|
||||
* 是否有助学贷款：0-否，1-是
|
||||
*/
|
||||
private List<String> hasLoan;
|
||||
|
||||
/**
|
||||
* 助学贷款金额范围 - 最小值
|
||||
*/
|
||||
private Double loanAmountMin;
|
||||
|
||||
/**
|
||||
* 助学贷款金额范围 - 最大值
|
||||
*/
|
||||
private Double loanAmountMax;
|
||||
|
||||
// ==================== 身体状况检索 ====================
|
||||
|
||||
/**
|
||||
* 身高范围 - 最小值（cm）
|
||||
*/
|
||||
private Double heightMin;
|
||||
|
||||
/**
|
||||
* 身高范围 - 最大值（cm）
|
||||
*/
|
||||
private Double heightMax;
|
||||
|
||||
/**
|
||||
* 体重范围 - 最小值（kg）
|
||||
*/
|
||||
private Double weightMin;
|
||||
|
||||
/**
|
||||
* 体重范围 - 最大值（kg）
|
||||
*/
|
||||
private Double weightMax;
|
||||
|
||||
/**
|
||||
* 血型
|
||||
*/
|
||||
private List<String> bloodType;
|
||||
|
||||
/**
|
||||
* 健康状况
|
||||
*/
|
||||
private String healthStatus;
|
||||
|
||||
/**
|
||||
* 残疾类型 1 - 视力残疾 2 - 听力残疾 3 - 智力残疾 9 - 其他残疾
|
||||
*/
|
||||
private List<String> disabilityType;
|
||||
|
||||
/**
|
||||
* 残疾等级
|
||||
*/
|
||||
private String disabilityLevel;
|
||||
|
||||
// ==================== 住宿信息检索 ====================
|
||||
|
||||
/**
|
||||
* 是否住校：0-否，1-是
|
||||
*/
|
||||
private List<String> isBoarder;
|
||||
|
||||
/**
|
||||
* 宿舍楼栋（模糊查询）
|
||||
*/
|
||||
private List<String> dormitoryBuilding;
|
||||
|
||||
/**
|
||||
* 宿舍房间号（模糊查询）
|
||||
*/
|
||||
private String dormitoryRoom;
|
||||
|
||||
// ==================== 家庭详细信息检索 ====================
|
||||
|
||||
/**
|
||||
* 父亲电话
|
||||
*/
|
||||
private String fatherPhone;
|
||||
|
||||
/**
|
||||
* 父亲工作单位（模糊查询）
|
||||
*/
|
||||
private String fatherWorkUnit;
|
||||
|
||||
/**
|
||||
* 母亲电话
|
||||
*/
|
||||
private String motherPhone;
|
||||
|
||||
/**
|
||||
* 母亲工作单位（模糊查询）
|
||||
*/
|
||||
private String motherWorkUnit;
|
||||
|
||||
/**
|
||||
* 监护人电话
|
||||
*/
|
||||
private String guardianPhone;
|
||||
|
||||
/**
|
||||
* 监护人关系
|
||||
*/
|
||||
private String guardianRelation;
|
||||
|
||||
/**
|
||||
* 收入来源
|
||||
*/
|
||||
private String incomeSource;
|
||||
|
||||
/**
|
||||
* 紧急联系人姓名（模糊查询）
|
||||
*/
|
||||
private String emergencyContactName;
|
||||
|
||||
/**
|
||||
* 紧急联系人电话
|
||||
*/
|
||||
private String emergencyContactPhone;
|
||||
|
||||
/**
|
||||
* 紧急联系人关系
|
||||
*/
|
||||
private String emergencyContactRelation;
|
||||
|
||||
// ==================== 扩展信息检索 ====================
|
||||
|
||||
/**
|
||||
* 特长爱好（模糊查询）
|
||||
*/
|
||||
private String specialties;
|
||||
|
||||
/**
|
||||
* 获奖情况（模糊查询）
|
||||
*/
|
||||
private String awards;
|
||||
|
||||
/**
|
||||
* 违纪记录（模糊查询）
|
||||
*/
|
||||
private String violations;
|
||||
|
||||
/**
|
||||
* 社会活动（模糊查询）
|
||||
*/
|
||||
private String socialActivities;
|
||||
|
||||
// ==================== 健康详细信息检索 ====================
|
||||
|
||||
/**
|
||||
* 特殊体质或疾病（模糊查询）
|
||||
*/
|
||||
private String specialCondition;
|
||||
|
||||
/**
|
||||
* 病史（模糊查询）
|
||||
*/
|
||||
private String medicalHistory;
|
||||
|
||||
/**
|
||||
* 过敏史（模糊查询）
|
||||
*/
|
||||
private String allergies;
|
||||
|
||||
// ==================== 其他信息检索 ====================
|
||||
|
||||
/**
|
||||
* 生源地区（省市县）
|
||||
*/
|
||||
private List<String> sourceRegion;
|
||||
|
||||
/**
|
||||
* 毕业院校（模糊查询）
|
||||
*/
|
||||
private String graduateSchool;
|
||||
|
||||
/**
|
||||
* 培养方式：全日制、在职、函授、夜大等
|
||||
*/
|
||||
private List<String> trainingType;
|
||||
|
||||
/**
|
||||
* 学历层次
|
||||
*/
|
||||
private List<String> academicLevel;
|
||||
|
||||
/**
|
||||
* 学制范围 - 最小值（年）
|
||||
*/
|
||||
private Long schoolSystemMin;
|
||||
|
||||
/**
|
||||
* 学制范围 - 最大值（年）
|
||||
*/
|
||||
private Long schoolSystemMax;
|
||||
|
||||
/**
|
||||
* 信息状态：1-正常，2-待审核，3-审核中，4-已驳回，5-已锁定
|
||||
*/
|
||||
private String infoStatus;
|
||||
|
||||
/**
|
||||
* 数据来源：manual-手工录入，import-批量导入，sync-系统同步
|
||||
*/
|
||||
private String dataSource;
|
||||
|
||||
/**
|
||||
* 信息是否完整：0-不完整，1-完整
|
||||
*/
|
||||
private Long isComplete;
|
||||
|
||||
/**
|
||||
* 完整度百分比范围 - 最小值
|
||||
*/
|
||||
private Double completionRateMin;
|
||||
|
||||
/**
|
||||
* 完整度百分比范围 - 最大值
|
||||
*/
|
||||
private Double completionRateMax;
|
||||
|
||||
// ==================== 时间范围检索 ====================
|
||||
|
||||
/**
|
||||
* 创建时间范围 - 开始
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date createTimeStart;
|
||||
|
||||
/**
|
||||
* 创建时间范围 - 结束
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date createTimeEnd;
|
||||
|
||||
/**
|
||||
* 更新时间范围 - 开始
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date updateTimeStart;
|
||||
|
||||
/**
|
||||
* 更新时间范围 - 结束
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date updateTimeEnd;
|
||||
|
||||
// ==================== 部门树节点 ====================
|
||||
|
||||
/**
|
||||
* 部门树勾选的节点ID列表
|
||||
*/
|
||||
private List<Long> deptIds;
|
||||
|
||||
/**
|
||||
* 分页参数
|
||||
*/
|
||||
private Integer pageNum = 1;
|
||||
|
||||
/**
|
||||
* 分页大小
|
||||
*/
|
||||
private Integer pageSize = 10;
|
||||
}
|
||||
+9
@@ -3,6 +3,7 @@ package org.dromara.xg.service;
|
||||
import org.dromara.xg.domain.vo.XgStudentMsgExportVo;
|
||||
import org.dromara.xg.domain.vo.XgStudentMsgVo;
|
||||
import org.dromara.xg.domain.bo.XgStudentMsgBo;
|
||||
import org.dromara.xg.domain.bo.XgStudentMsgAdvancedSearchBo;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
|
||||
@@ -105,4 +106,12 @@ public interface IXgStudentMsgService {
|
||||
* @return 学生信息列表
|
||||
*/
|
||||
List<XgStudentMsgVo> queryStudentsByClassId(String classId, String name);
|
||||
|
||||
/**
|
||||
* 高级检索学生信息
|
||||
*
|
||||
* @param bo 高级检索条件
|
||||
* @return 学生信息分页列表
|
||||
*/
|
||||
TableDataInfo<XgStudentMsgVo> advancedSearch(XgStudentMsgAdvancedSearchBo bo);
|
||||
}
|
||||
+361
@@ -12,6 +12,7 @@ import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.dromara.xg.domain.bo.XgStudentMsgBo;
|
||||
import org.dromara.xg.domain.bo.XgStudentMsgAdvancedSearchBo;
|
||||
import org.dromara.xg.domain.vo.XgStudentMsgExportVo;
|
||||
import org.dromara.xg.domain.vo.XgStudentMsgVo;
|
||||
import org.dromara.xg.domain.XgStudentMsg;
|
||||
@@ -674,4 +675,364 @@ public class XgStudentMsgServiceImpl implements IXgStudentMsgService {
|
||||
log.info("查询班级学生信息 - 班级ID: {}, 姓名: {}", classId, name);
|
||||
return baseMapper.selectStudentsByClassId(classId, name);
|
||||
}
|
||||
|
||||
/**
|
||||
* 高级检索学生信息
|
||||
*
|
||||
* @param bo 高级检索条件
|
||||
* @return 学生信息分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<XgStudentMsgVo> advancedSearch(XgStudentMsgAdvancedSearchBo bo) {
|
||||
log.info("开始高级检索学生信息，检索条件: {}", bo);
|
||||
|
||||
// 第一步：权限过滤，获取过滤后的deptIds
|
||||
List<Long> filteredDeptIds = filterDeptIdsForAdvancedSearch(bo.getDeptIds());
|
||||
log.info("权限过滤后的部门ID列表: {}", filteredDeptIds);
|
||||
|
||||
// 第二步：构建高级检索查询条件
|
||||
LambdaQueryWrapper<XgStudentMsg> lqw = buildAdvancedSearchQueryWrapper(bo);
|
||||
|
||||
// 第三步：分页查询学生信息
|
||||
Page<XgStudentMsgVo> result = baseMapper.selectPageByDeptIds(
|
||||
new Page<>(bo.getPageNum(), bo.getPageSize()), lqw, filteredDeptIds);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 权限过滤方法 - 高级检索专用
|
||||
* 根据当前用户的权限范围过滤部门ID列表
|
||||
*
|
||||
* @param deptIds 入参的部门ID列表
|
||||
* @return 过滤后的部门ID列表
|
||||
*/
|
||||
private List<Long> filterDeptIdsForAdvancedSearch(List<Long> deptIds) {
|
||||
// 获取当前登录用户ID
|
||||
Long currentUserId = LoginHelper.getUserId();
|
||||
log.info("当前登录用户ID: {}", currentUserId);
|
||||
|
||||
// 第一步：判断当前用户是否为全校管理员
|
||||
boolean isSchoolManager = checkIsSchoolManager(currentUserId);
|
||||
if (isSchoolManager) {
|
||||
log.info("用户 {} 是全校管理员，不进行权限过滤", currentUserId);
|
||||
// 全校管理员不进行过滤，返回包含入参deptIds及其子组织的列表
|
||||
return getDeptIdsWithChildrenForAdvancedSearch(deptIds);
|
||||
}
|
||||
|
||||
// 第二步：获取用户的总权限集合
|
||||
Set<Long> userAuthDeptIds = getUserAuthDeptIds(currentUserId);
|
||||
log.info("用户 {} 的权限范围: {}", currentUserId, userAuthDeptIds);
|
||||
|
||||
// 第三步：过滤deptIds，只保留在权限范围内的
|
||||
List<Long> filteredDeptIds = new ArrayList<>();
|
||||
if (deptIds != null && !deptIds.isEmpty()) {
|
||||
// 如果入参deptIds不为空，检查其子组织是否在权限范围内
|
||||
for (Long deptId : deptIds) {
|
||||
List<Long> deptIdsWithChildren = getDeptIdsWithChildren(deptId);
|
||||
for (Long deptIdWithChild : deptIdsWithChildren) {
|
||||
if (userAuthDeptIds.contains(deptIdWithChild)) {
|
||||
filteredDeptIds.add(deptIdWithChild);
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// 如果入参deptIds为空，直接使用用户权限范围内的所有部门
|
||||
filteredDeptIds.addAll(userAuthDeptIds);
|
||||
}
|
||||
// 对filteredDeptIds去重
|
||||
filteredDeptIds = new ArrayList<>(new HashSet<>(filteredDeptIds));
|
||||
// 对过滤后的deptIds，查找所有子组织包括他们自己
|
||||
Set<Long> finalDeptIds = new HashSet<>();
|
||||
for (Long filteredDeptId : filteredDeptIds) {
|
||||
List<Long> deptIdsWithChildren = getDeptIdsWithChildren(filteredDeptId);
|
||||
finalDeptIds.addAll(deptIdsWithChildren);
|
||||
}
|
||||
// 对finalDeptIds去重
|
||||
finalDeptIds = new HashSet<>(finalDeptIds);
|
||||
return new ArrayList<>(finalDeptIds);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取部门ID列表及其所有子组织的ID列表 - 高级检索专用
|
||||
*
|
||||
* @param deptIds 部门ID列表
|
||||
* @return 包含部门ID及其子组织的ID列表
|
||||
*/
|
||||
private List<Long> getDeptIdsWithChildrenForAdvancedSearch(List<Long> deptIds) {
|
||||
List<Long> allDeptIds = new ArrayList<>();
|
||||
if (deptIds != null && !deptIds.isEmpty()) {
|
||||
for (Long deptId : deptIds) {
|
||||
allDeptIds.add(deptId); // 包含自己
|
||||
|
||||
// 查找所有子组织
|
||||
List<SysDept> childDepts = sysDeptMapper.selectListByParentId(deptId);
|
||||
if (!childDepts.isEmpty()) {
|
||||
List<Long> childDeptIds = childDepts.stream()
|
||||
.map(SysDept::getDeptId)
|
||||
.collect(Collectors.toList());
|
||||
allDeptIds.addAll(childDeptIds);
|
||||
}
|
||||
}
|
||||
}
|
||||
return allDeptIds;
|
||||
}
|
||||
|
||||
/**
|
||||
* 构建高级检索查询条件包装器
|
||||
*/
|
||||
private LambdaQueryWrapper<XgStudentMsg> buildAdvancedSearchQueryWrapper(XgStudentMsgAdvancedSearchBo bo) {
|
||||
LambdaQueryWrapper<XgStudentMsg> lqw = Wrappers.lambdaQuery();
|
||||
|
||||
// 基础查询条件
|
||||
lqw.eq(XgStudentMsg::getDeleted, 0); // 未删除
|
||||
|
||||
// ==================== 基础信息检索 ====================
|
||||
// 学号、姓名、手机号码、身份证号
|
||||
lqw.like(StringUtils.isNotBlank(bo.getStudentNo()), XgStudentMsg::getStudentNo, bo.getStudentNo());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getName()), XgStudentMsg::getName, bo.getName());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getPhone()), XgStudentMsg::getPhone, bo.getPhone());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getIdCard()), XgStudentMsg::getIdCard, bo.getIdCard());
|
||||
|
||||
// 英文姓名、曾用名
|
||||
lqw.like(StringUtils.isNotBlank(bo.getNameEnglish()), XgStudentMsg::getNameEnglish, bo.getNameEnglish());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getFormerName()), XgStudentMsg::getFormerName, bo.getFormerName());
|
||||
|
||||
// 性别、民族、政治面貌 - 性别改为in查询
|
||||
lqw.in(bo.getGender() != null && !bo.getGender().isEmpty(), XgStudentMsg::getGender, bo.getGender());
|
||||
lqw.in(bo.getNationality() != null && !bo.getNationality().isEmpty(), XgStudentMsg::getNationality,
|
||||
bo.getNationality());
|
||||
lqw.in(bo.getPoliticalStatus() != null && !bo.getPoliticalStatus().isEmpty(), XgStudentMsg::getPoliticalStatus,
|
||||
bo.getPoliticalStatus());
|
||||
|
||||
// 出生日期范围
|
||||
if (bo.getBirthDateStart() != null && bo.getBirthDateEnd() != null) {
|
||||
lqw.between(XgStudentMsg::getBirthDate, bo.getBirthDateStart(), bo.getBirthDateEnd());
|
||||
}
|
||||
|
||||
// 籍贯 - 改为in查询
|
||||
lqw.in(bo.getNativePlace() != null && !bo.getNativePlace().isEmpty(), XgStudentMsg::getNativePlace,
|
||||
bo.getNativePlace());
|
||||
|
||||
// 户口类型、生源地区、宗教信仰、文化程度 - 生源地区改为in查询
|
||||
lqw.in(bo.getHouseholdRegisterType() != null && !bo.getHouseholdRegisterType().isEmpty(),
|
||||
XgStudentMsg::getHouseholdRegisterType, bo.getHouseholdRegisterType());
|
||||
lqw.in(bo.getSourceRegion() != null && !bo.getSourceRegion().isEmpty(), XgStudentMsg::getSourceRegion,
|
||||
bo.getSourceRegion());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getReligion()), XgStudentMsg::getReligion, bo.getReligion());
|
||||
lqw.in(bo.getEducationLevel() != null && !bo.getEducationLevel().isEmpty(), XgStudentMsg::getEducationLevel,
|
||||
bo.getEducationLevel());
|
||||
|
||||
// 电子邮箱、QQ号码、微信号、婚姻状况
|
||||
lqw.like(StringUtils.isNotBlank(bo.getEmail()), XgStudentMsg::getEmail, bo.getEmail());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getQq()), XgStudentMsg::getQq, bo.getQq());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getWechat()), XgStudentMsg::getWechat, bo.getWechat());
|
||||
lqw.in(bo.getMaritalStatus() != null && !bo.getMaritalStatus().isEmpty(), XgStudentMsg::getMaritalStatus,
|
||||
bo.getMaritalStatus());
|
||||
|
||||
// 户籍所在地、家庭地址、现住址
|
||||
lqw.like(StringUtils.isNotBlank(bo.getHukouLocation()), XgStudentMsg::getHukouLocation, bo.getHukouLocation());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getHomeAddress()), XgStudentMsg::getHomeAddress, bo.getHomeAddress());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getCurrentAddress()), XgStudentMsg::getCurrentAddress,
|
||||
bo.getCurrentAddress());
|
||||
|
||||
// ==================== 学籍信息检索 ====================
|
||||
// 入学年份范围 - 处理单独的最小值或最大值
|
||||
if (bo.getEnrollmentYearStart() != null && bo.getEnrollmentYearEnd() != null) {
|
||||
lqw.between(XgStudentMsg::getEnrollmentYear, bo.getEnrollmentYearStart(), bo.getEnrollmentYearEnd());
|
||||
} else if (bo.getEnrollmentYearStart() != null) {
|
||||
lqw.ge(XgStudentMsg::getEnrollmentYear, bo.getEnrollmentYearStart());
|
||||
} else if (bo.getEnrollmentYearEnd() != null) {
|
||||
lqw.le(XgStudentMsg::getEnrollmentYear, bo.getEnrollmentYearEnd());
|
||||
}
|
||||
|
||||
if (bo.getEnrollmentDateStart() != null && bo.getEnrollmentDateEnd() != null) {
|
||||
lqw.between(XgStudentMsg::getEnrollmentDate, bo.getEnrollmentDateStart(), bo.getEnrollmentDateEnd());
|
||||
}
|
||||
lqw.in(bo.getAdmissionCategory() != null && !bo.getAdmissionCategory().isEmpty(),
|
||||
XgStudentMsg::getAdmissionCategory, bo.getAdmissionCategory());
|
||||
|
||||
// 学制范围 - 处理单独的最小值或最大值
|
||||
if (bo.getSchoolSystemMin() != null && bo.getSchoolSystemMax() != null) {
|
||||
lqw.between(XgStudentMsg::getSchoolSystem, bo.getSchoolSystemMin(), bo.getSchoolSystemMax());
|
||||
} else if (bo.getSchoolSystemMin() != null) {
|
||||
lqw.ge(XgStudentMsg::getSchoolSystem, bo.getSchoolSystemMin());
|
||||
} else if (bo.getSchoolSystemMax() != null) {
|
||||
lqw.le(XgStudentMsg::getSchoolSystem, bo.getSchoolSystemMax());
|
||||
}
|
||||
|
||||
// 学历层次、培养方式、年级、毕业院校 - 年级改为范围查询
|
||||
lqw.in(bo.getAcademicLevel() != null && !bo.getAcademicLevel().isEmpty(), XgStudentMsg::getAcademicLevel,
|
||||
bo.getAcademicLevel());
|
||||
lqw.in(bo.getTrainingType() != null && !bo.getTrainingType().isEmpty(), XgStudentMsg::getTrainingType,
|
||||
bo.getTrainingType());
|
||||
|
||||
// 年级范围查询 - 处理单独的最小值或最大值
|
||||
if (bo.getGradeMin() != null && bo.getGradeMax() != null) {
|
||||
lqw.between(XgStudentMsg::getGrade, bo.getGradeMin(), bo.getGradeMax());
|
||||
} else if (bo.getGradeMin() != null) {
|
||||
lqw.ge(XgStudentMsg::getGrade, bo.getGradeMin());
|
||||
} else if (bo.getGradeMax() != null) {
|
||||
lqw.le(XgStudentMsg::getGrade, bo.getGradeMax());
|
||||
}
|
||||
|
||||
lqw.like(StringUtils.isNotBlank(bo.getGraduateSchool()), XgStudentMsg::getGraduateSchool,
|
||||
bo.getGraduateSchool());
|
||||
|
||||
// 学籍状态、是否住校、宿舍楼栋 - 宿舍楼栋改为in查询
|
||||
lqw.in(bo.getStudentStatus() != null && !bo.getStudentStatus().isEmpty(), XgStudentMsg::getStudentStatus,
|
||||
bo.getStudentStatus());
|
||||
lqw.in(bo.getIsBoarder() != null && !bo.getIsBoarder().isEmpty(), XgStudentMsg::getIsBoarder,
|
||||
bo.getIsBoarder());
|
||||
lqw.in(bo.getDormitoryBuilding() != null && !bo.getDormitoryBuilding().isEmpty(),
|
||||
XgStudentMsg::getDormitoryBuilding,
|
||||
bo.getDormitoryBuilding());
|
||||
|
||||
// ==================== 家庭信息检索 ====================
|
||||
// 父亲姓名、父亲电话、父亲工作单位
|
||||
lqw.like(StringUtils.isNotBlank(bo.getFatherName()), XgStudentMsg::getFatherName, bo.getFatherName());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getFatherPhone()), XgStudentMsg::getFatherPhone, bo.getFatherPhone());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getFatherWorkUnit()), XgStudentMsg::getFatherWorkUnit,
|
||||
bo.getFatherWorkUnit());
|
||||
|
||||
// 母亲姓名、母亲电话、母亲工作单位
|
||||
lqw.like(StringUtils.isNotBlank(bo.getMotherName()), XgStudentMsg::getMotherName, bo.getMotherName());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getMotherPhone()), XgStudentMsg::getMotherPhone, bo.getMotherPhone());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getMotherWorkUnit()), XgStudentMsg::getMotherWorkUnit,
|
||||
bo.getMotherWorkUnit());
|
||||
|
||||
// 监护人姓名、监护人电话、监护人关系
|
||||
lqw.like(StringUtils.isNotBlank(bo.getGuardianName()), XgStudentMsg::getGuardianName, bo.getGuardianName());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getGuardianPhone()), XgStudentMsg::getGuardianPhone, bo.getGuardianPhone());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getGuardianRelation()), XgStudentMsg::getGuardianRelation,
|
||||
bo.getGuardianRelation());
|
||||
|
||||
// 家庭年收入范围、人均收入范围 - 处理单独的最小值或最大值
|
||||
if (bo.getFamilyIncomeMin() != null && bo.getFamilyIncomeMax() != null) {
|
||||
lqw.between(XgStudentMsg::getFamilyIncome, bo.getFamilyIncomeMin(), bo.getFamilyIncomeMax());
|
||||
} else if (bo.getFamilyIncomeMin() != null) {
|
||||
lqw.ge(XgStudentMsg::getFamilyIncome, bo.getFamilyIncomeMin());
|
||||
} else if (bo.getFamilyIncomeMax() != null) {
|
||||
lqw.le(XgStudentMsg::getFamilyIncome, bo.getFamilyIncomeMax());
|
||||
}
|
||||
|
||||
if (bo.getPerCapitaIncomeMin() != null && bo.getPerCapitaIncomeMax() != null) {
|
||||
lqw.between(XgStudentMsg::getPerCapitaIncome, bo.getPerCapitaIncomeMin(), bo.getPerCapitaIncomeMax());
|
||||
} else if (bo.getPerCapitaIncomeMin() != null) {
|
||||
lqw.ge(XgStudentMsg::getPerCapitaIncome, bo.getPerCapitaIncomeMin());
|
||||
} else if (bo.getPerCapitaIncomeMax() != null) {
|
||||
lqw.le(XgStudentMsg::getPerCapitaIncome, bo.getPerCapitaIncomeMax());
|
||||
}
|
||||
|
||||
// 收入来源、家庭经济状况、家庭成员数量范围 - 家庭经济状况改为in查询
|
||||
lqw.like(StringUtils.isNotBlank(bo.getIncomeSource()), XgStudentMsg::getIncomeSource, bo.getIncomeSource());
|
||||
lqw.in(bo.getFamilyEconomicStatus() != null && !bo.getFamilyEconomicStatus().isEmpty(),
|
||||
XgStudentMsg::getFamilyEconomicStatus,
|
||||
bo.getFamilyEconomicStatus());
|
||||
|
||||
// 家庭成员数量范围 - 处理单独的最小值或最大值
|
||||
if (bo.getFamilyMembersMin() != null && bo.getFamilyMembersMax() != null) {
|
||||
lqw.between(XgStudentMsg::getFamilyMembers, bo.getFamilyMembersMin(), bo.getFamilyMembersMax());
|
||||
} else if (bo.getFamilyMembersMin() != null) {
|
||||
lqw.ge(XgStudentMsg::getFamilyMembers, bo.getFamilyMembersMin());
|
||||
} else if (bo.getFamilyMembersMax() != null) {
|
||||
lqw.le(XgStudentMsg::getFamilyMembers, bo.getFamilyMembersMax());
|
||||
}
|
||||
|
||||
// 紧急联系人姓名、紧急联系人电话、紧急联系人关系
|
||||
lqw.like(StringUtils.isNotBlank(bo.getEmergencyContactName()), XgStudentMsg::getEmergencyContactName,
|
||||
bo.getEmergencyContactName());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getEmergencyContactPhone()), XgStudentMsg::getEmergencyContactPhone,
|
||||
bo.getEmergencyContactPhone());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getEmergencyContactRelation()), XgStudentMsg::getEmergencyContactRelation,
|
||||
bo.getEmergencyContactRelation());
|
||||
|
||||
// ==================== 扩展信息检索 ====================
|
||||
// 是否贫困生、是否少数民族、是否残疾、是否孤儿
|
||||
lqw.in(bo.getIsPoorStudent() != null && !bo.getIsPoorStudent().isEmpty(), XgStudentMsg::getIsPoorStudent,
|
||||
bo.getIsPoorStudent());
|
||||
lqw.in(bo.getIsMinority() != null && !bo.getIsMinority().isEmpty(), XgStudentMsg::getIsMinority,
|
||||
bo.getIsMinority());
|
||||
lqw.in(bo.getIsDisabled() != null && !bo.getIsDisabled().isEmpty(), XgStudentMsg::getIsDisabled,
|
||||
bo.getIsDisabled());
|
||||
lqw.in(bo.getIsOrphan() != null && !bo.getIsOrphan().isEmpty(), XgStudentMsg::getIsOrphan, bo.getIsOrphan());
|
||||
|
||||
// 是否留守儿童、是否独生子女、是否低保、是否有助学贷款
|
||||
lqw.in(bo.getIsLeftBehindChild() != null && !bo.getIsLeftBehindChild().isEmpty(),
|
||||
XgStudentMsg::getIsLeftBehindChild, bo.getIsLeftBehindChild());
|
||||
lqw.in(bo.getIsSingleChild() != null && !bo.getIsSingleChild().isEmpty(), XgStudentMsg::getIsSingleChild,
|
||||
bo.getIsSingleChild());
|
||||
lqw.in(bo.getIsLowIncome() != null && !bo.getIsLowIncome().isEmpty(), XgStudentMsg::getIsLowIncome,
|
||||
bo.getIsLowIncome());
|
||||
lqw.in(bo.getHasLoan() != null && !bo.getHasLoan().isEmpty(), XgStudentMsg::getHasLoan, bo.getHasLoan());
|
||||
|
||||
// 助学贷款金额范围 - 处理单独的最小值或最大值
|
||||
if (bo.getLoanAmountMin() != null && bo.getLoanAmountMax() != null) {
|
||||
lqw.between(XgStudentMsg::getLoanAmount, bo.getLoanAmountMin(), bo.getLoanAmountMax());
|
||||
} else if (bo.getLoanAmountMin() != null) {
|
||||
lqw.ge(XgStudentMsg::getLoanAmount, bo.getLoanAmountMin());
|
||||
} else if (bo.getLoanAmountMax() != null) {
|
||||
lqw.le(XgStudentMsg::getLoanAmount, bo.getLoanAmountMax());
|
||||
}
|
||||
|
||||
// 特长爱好、获奖情况、违纪记录、社会活动
|
||||
lqw.like(StringUtils.isNotBlank(bo.getSpecialties()), XgStudentMsg::getSpecialties, bo.getSpecialties());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getAwards()), XgStudentMsg::getAwards, bo.getAwards());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getViolations()), XgStudentMsg::getViolations, bo.getViolations());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getSocialActivities()), XgStudentMsg::getSocialActivities,
|
||||
bo.getSocialActivities());
|
||||
|
||||
// ==================== 健康信息检索 ====================
|
||||
// 身高范围、体重范围 - 处理单独的最小值或最大值
|
||||
if (bo.getHeightMin() != null && bo.getHeightMax() != null) {
|
||||
lqw.between(XgStudentMsg::getHeight, bo.getHeightMin(), bo.getHeightMax());
|
||||
} else if (bo.getHeightMin() != null) {
|
||||
lqw.ge(XgStudentMsg::getHeight, bo.getHeightMin());
|
||||
} else if (bo.getHeightMax() != null) {
|
||||
lqw.le(XgStudentMsg::getHeight, bo.getHeightMax());
|
||||
}
|
||||
|
||||
if (bo.getWeightMin() != null && bo.getWeightMax() != null) {
|
||||
lqw.between(XgStudentMsg::getWeight, bo.getWeightMin(), bo.getWeightMax());
|
||||
} else if (bo.getWeightMin() != null) {
|
||||
lqw.ge(XgStudentMsg::getWeight, bo.getWeightMin());
|
||||
} else if (bo.getWeightMax() != null) {
|
||||
lqw.le(XgStudentMsg::getWeight, bo.getWeightMax());
|
||||
}
|
||||
|
||||
// 血型、健康状况
|
||||
lqw.in(bo.getBloodType() != null && !bo.getBloodType().isEmpty(), XgStudentMsg::getBloodType,
|
||||
bo.getBloodType());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getHealthStatus()), XgStudentMsg::getHealthStatus, bo.getHealthStatus());
|
||||
|
||||
// 残疾类型、残疾等级
|
||||
lqw.in(bo.getDisabilityType() != null && !bo.getDisabilityType().isEmpty(), XgStudentMsg::getDisabilityType,
|
||||
bo.getDisabilityType());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getDisabilityLevel()), XgStudentMsg::getDisabilityLevel,
|
||||
bo.getDisabilityLevel());
|
||||
|
||||
// 特殊体质或疾病、病史、过敏史
|
||||
lqw.like(StringUtils.isNotBlank(bo.getSpecialCondition()), XgStudentMsg::getSpecialCondition,
|
||||
bo.getSpecialCondition());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getMedicalHistory()), XgStudentMsg::getMedicalHistory,
|
||||
bo.getMedicalHistory());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getAllergies()), XgStudentMsg::getAllergies, bo.getAllergies());
|
||||
|
||||
// ==================== 住宿信息检索 ====================
|
||||
// 宿舍房间号
|
||||
lqw.like(StringUtils.isNotBlank(bo.getDormitoryRoom()), XgStudentMsg::getDormitoryRoom, bo.getDormitoryRoom());
|
||||
|
||||
// ==================== 时间范围检索 ====================
|
||||
// 创建时间范围、更新时间范围
|
||||
if (bo.getCreateTimeStart() != null && bo.getCreateTimeEnd() != null) {
|
||||
lqw.between(XgStudentMsg::getCreateTime, bo.getCreateTimeStart(), bo.getCreateTimeEnd());
|
||||
}
|
||||
if (bo.getUpdateTimeStart() != null && bo.getUpdateTimeEnd() != null) {
|
||||
lqw.between(XgStudentMsg::getUpdateTime, bo.getUpdateTimeStart(), bo.getUpdateTimeEnd());
|
||||
}
|
||||
|
||||
// 排序：按创建时间倒序
|
||||
lqw.orderByDesc(XgStudentMsg::getCreateTime);
|
||||
|
||||
return lqw;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,626 @@
|
||||
# 学生信息高级检索功能开发记录
|
||||
|
||||
**变更时间**: 2025-01-27 15:30:00
|
||||
**变更人员**: zlwu
|
||||
**变更类型**: 功能新增
|
||||
**影响范围**: 学生信息管理模块
|
||||
|
||||
## 📋 变更概述
|
||||
|
||||
为前端高级检索界面完善API功能，新增学生信息高级检索功能，支持多维度、多条件的复杂查询。
|
||||
|
||||
## 🎯 功能需求
|
||||
|
||||
### 主要功能
|
||||
1. **高级检索BO类**: 创建专门的高级检索业务对象，包含所有检索字段
|
||||
2. **权限控制**: 支持部门树节点权限过滤
|
||||
3. **多维度检索**: 支持基础信息、学籍信息、学院专业班级、家庭信息、特殊身份、身体状况、住宿信息等多个维度
|
||||
4. **灵活查询**: 文本类参数支持模糊查询，数值类参数支持范围查询，时间类参数支持时间范围查询
|
||||
|
||||
### 检索维度
|
||||
- **基础信息检索**: 学号、姓名、身份证号、手机号码、邮箱、性别、民族、政治面貌、出生日期
|
||||
- **学籍信息检索**: 学籍状态、入学年份、入学日期、录取类别
|
||||
- **学院专业班级检索**: 学院名称、专业名称、班级名称、年级、辅导员姓名、班主任姓名
|
||||
- **家庭信息检索**: 父亲姓名、母亲姓名、监护人姓名、家庭年收入、人均收入、家庭经济状况、家庭成员数量
|
||||
- **特殊身份检索**: 贫困生、少数民族、残疾、孤儿、留守儿童、独生子女、低保、助学贷款
|
||||
- **身体状况检索**: 身高、体重、血型、健康状况、残疾类型、残疾等级
|
||||
- **住宿信息检索**: 是否住校、宿舍楼栋、宿舍房间号
|
||||
- **其他信息检索**: 籍贯、生源地区、毕业院校、户口类型、文化程度、培养方式、学历层次、学制
|
||||
- **时间范围检索**: 创建时间、更新时间
|
||||
|
||||
## 🔧 技术实现
|
||||
|
||||
### 1. 新增文件
|
||||
|
||||
#### 1.1 高级检索BO类
|
||||
**文件路径**: `backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/domain/bo/XgStudentMsgAdvancedSearchBo.java`
|
||||
|
||||
**主要特性**:
|
||||
- 包含所有检索维度的字段定义
|
||||
- 支持文本模糊查询、数值范围查询、时间范围查询
|
||||
- 包含部门树节点ID列表
|
||||
- 包含分页参数
|
||||
|
||||
**关键字段**:
|
||||
```java
|
||||
// 基础信息检索
|
||||
private String studentNo; // 学号（模糊查询）
|
||||
private String name; // 姓名（模糊查询）
|
||||
private String idCard; // 身份证号（模糊查询）
|
||||
private String phone; // 手机号码（模糊查询）
|
||||
private String email; // 邮箱（模糊查询）
|
||||
private String gender; // 性别：0-男，1-女
|
||||
private String nationality; // 民族
|
||||
private String politicalStatus; // 政治面貌
|
||||
private Date birthDateStart; // 出生日期范围 - 开始
|
||||
private Date birthDateEnd; // 出生日期范围 - 结束
|
||||
|
||||
// 学籍信息检索
|
||||
private String studentStatus; // 学籍状态
|
||||
private Long enrollmentYearStart; // 入学年份范围 - 开始
|
||||
private Long enrollmentYearEnd; // 入学年份范围 - 结束
|
||||
private Date enrollmentDateStart; // 入学日期范围 - 开始
|
||||
private Date enrollmentDateEnd; // 入学日期范围 - 结束
|
||||
private String admissionCategory; // 录取类别
|
||||
|
||||
// 学院专业班级检索
|
||||
private String collegeName; // 学院名称（模糊查询）
|
||||
private String majorName; // 专业名称（模糊查询）
|
||||
private String className; // 班级名称（模糊查询）
|
||||
private String grade; // 年级
|
||||
private String counselorName; // 辅导员姓名（模糊查询）
|
||||
private String classTeacherName; // 班主任姓名（模糊查询）
|
||||
|
||||
// 家庭信息检索
|
||||
private String fatherName; // 父亲姓名（模糊查询）
|
||||
private String motherName; // 母亲姓名（模糊查询）
|
||||
private String guardianName; // 监护人姓名（模糊查询）
|
||||
private Double familyIncomeMin; // 家庭年收入范围 - 最小值
|
||||
private Double familyIncomeMax; // 家庭年收入范围 - 最大值
|
||||
private Double perCapitaIncomeMin; // 人均收入范围 - 最小值
|
||||
private Double perCapitaIncomeMax; // 人均收入范围 - 最大值
|
||||
private String familyEconomicStatus; // 家庭经济状况
|
||||
private Long familyMembersMin; // 家庭成员数量范围 - 最小值
|
||||
private Long familyMembersMax; // 家庭成员数量范围 - 最大值
|
||||
|
||||
// 特殊身份检索
|
||||
private Long isPoorStudent; // 是否贫困生：0-否，1-是
|
||||
private Long isMinority; // 是否少数民族：0-否，1-是
|
||||
private Long isDisabled; // 是否残疾：0-否，1-是
|
||||
private Long isOrphan; // 是否孤儿：0-否，1-是
|
||||
private Long isLeftBehindChild; // 是否留守儿童：0-否，1-是
|
||||
private Long isSingleChild; // 是否独生子女：0-否，1-是
|
||||
private Long isLowIncome; // 是否低保：0-否，1-是
|
||||
private Long hasLoan; // 是否有助学贷款：0-否，1-是
|
||||
private Double loanAmountMin; // 助学贷款金额范围 - 最小值
|
||||
private Double loanAmountMax; // 助学贷款金额范围 - 最大值
|
||||
|
||||
// 身体状况检索
|
||||
private Double heightMin; // 身高范围 - 最小值（cm）
|
||||
private Double heightMax; // 身高范围 - 最大值（cm）
|
||||
private Double weightMin; // 体重范围 - 最小值（kg）
|
||||
private Double weightMax; // 体重范围 - 最大值（kg）
|
||||
private String bloodType; // 血型
|
||||
private String healthStatus; // 健康状况
|
||||
private String disabilityType; // 残疾类型
|
||||
private String disabilityLevel; // 残疾等级
|
||||
|
||||
// 住宿信息检索
|
||||
private Long isBoarder; // 是否住校：0-否，1-是
|
||||
private String dormitoryBuilding; // 宿舍楼栋（模糊查询）
|
||||
private String dormitoryRoom; // 宿舍房间号（模糊查询）
|
||||
|
||||
// 其他信息检索
|
||||
private String nativePlace; // 籍贯（模糊查询）
|
||||
private String sourceRegion; // 生源地区（省市县）
|
||||
private String graduateSchool; // 毕业院校（模糊查询）
|
||||
private String householdRegisterType; // 户口类型：农业、非农业
|
||||
private String educationLevel; // 文化程度
|
||||
private String trainingType; // 培养方式：全日制、在职、函授、夜大等
|
||||
private String academicLevel; // 学历层次
|
||||
private Long schoolSystemMin; // 学制范围 - 最小值（年）
|
||||
private Long schoolSystemMax; // 学制范围 - 最大值（年）
|
||||
private String infoStatus; // 信息状态：1-正常，2-待审核，3-审核中，4-已驳回，5-已锁定
|
||||
private String dataSource; // 数据来源：manual-手工录入，import-批量导入，sync-系统同步
|
||||
private Long isComplete; // 信息是否完整：0-不完整，1-完整
|
||||
private Double completionRateMin; // 完整度百分比范围 - 最小值
|
||||
private Double completionRateMax; // 完整度百分比范围 - 最大值
|
||||
|
||||
// 时间范围检索
|
||||
private Date createTimeStart; // 创建时间范围 - 开始
|
||||
private Date createTimeEnd; // 创建时间范围 - 结束
|
||||
private Date updateTimeStart; // 更新时间范围 - 开始
|
||||
private Date updateTimeEnd; // 更新时间范围 - 结束
|
||||
|
||||
// 部门树节点
|
||||
private List<Long> deptIds; // 部门树勾选的节点ID列表
|
||||
|
||||
// 分页参数
|
||||
private Integer pageNum = 1; // 分页参数
|
||||
private Integer pageSize = 10; // 分页大小
|
||||
```
|
||||
|
||||
### 2. 修改文件
|
||||
|
||||
#### 2.1 Service接口扩展
|
||||
**文件路径**: `backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/IXgStudentMsgService.java`
|
||||
|
||||
**新增方法**:
|
||||
```java
|
||||
/**
|
||||
* 高级检索学生信息
|
||||
*
|
||||
* @param bo 高级检索条件
|
||||
* @return 学生信息分页列表
|
||||
*/
|
||||
TableDataInfo<XgStudentMsgVo> advancedSearch(XgStudentMsgAdvancedSearchBo bo);
|
||||
```
|
||||
|
||||
#### 2.2 Service实现类扩展
|
||||
**文件路径**: `backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgStudentMsgServiceImpl.java`
|
||||
|
||||
**新增方法**:
|
||||
```java
|
||||
/**
|
||||
* 高级检索学生信息
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<XgStudentMsgVo> advancedSearch(XgStudentMsgAdvancedSearchBo bo) {
|
||||
// 第一步：权限过滤，获取过滤后的deptIds
|
||||
List<Long> filteredDeptIds = filterDeptIdsForAdvancedSearch(bo.getDeptIds());
|
||||
|
||||
// 第二步：构建高级检索查询条件
|
||||
LambdaQueryWrapper<XgStudentMsg> lqw = buildAdvancedSearchQueryWrapper(bo);
|
||||
|
||||
// 第三步：分页查询学生信息
|
||||
Page<XgStudentMsgVo> result = baseMapper.selectPageByDeptIds(
|
||||
new Page<>(bo.getPageNum(), bo.getPageSize()), lqw, filteredDeptIds);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 权限过滤方法 - 高级检索专用
|
||||
*/
|
||||
private List<Long> filterDeptIdsForAdvancedSearch(List<Long> deptIds) {
|
||||
// 获取当前登录用户ID
|
||||
Long currentUserId = LoginHelper.getUserId();
|
||||
|
||||
// 判断当前用户是否为全校管理员
|
||||
boolean isSchoolManager = checkIsSchoolManager(currentUserId);
|
||||
if (isSchoolManager) {
|
||||
return getDeptIdsWithChildrenForAdvancedSearch(deptIds);
|
||||
}
|
||||
|
||||
// 获取用户的总权限集合
|
||||
Set<Long> userAuthDeptIds = getUserAuthDeptIds(currentUserId);
|
||||
|
||||
// 过滤deptIds，只保留在权限范围内的
|
||||
List<Long> filteredDeptIds = new ArrayList<>();
|
||||
if (deptIds != null && !deptIds.isEmpty()) {
|
||||
for (Long deptId : deptIds) {
|
||||
List<Long> deptIdsWithChildren = getDeptIdsWithChildren(deptId);
|
||||
for (Long deptIdWithChild : deptIdsWithChildren) {
|
||||
if (userAuthDeptIds.contains(deptIdWithChild)) {
|
||||
filteredDeptIds.add(deptIdWithChild);
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
filteredDeptIds.addAll(userAuthDeptIds);
|
||||
}
|
||||
|
||||
// 对过滤后的deptIds，查找所有子组织包括他们自己
|
||||
Set<Long> finalDeptIds = new HashSet<>();
|
||||
for (Long filteredDeptId : filteredDeptIds) {
|
||||
List<Long> deptIdsWithChildren = getDeptIdsWithChildren(filteredDeptId);
|
||||
finalDeptIds.addAll(deptIdsWithChildren);
|
||||
}
|
||||
|
||||
return new ArrayList<>(finalDeptIds);
|
||||
}
|
||||
|
||||
/**
|
||||
* 构建高级检索查询条件包装器
|
||||
*/
|
||||
private LambdaQueryWrapper<XgStudentMsg> buildAdvancedSearchQueryWrapper(XgStudentMsgAdvancedSearchBo bo) {
|
||||
LambdaQueryWrapper<XgStudentMsg> lqw = Wrappers.lambdaQuery();
|
||||
|
||||
// 基础查询条件
|
||||
lqw.eq(XgStudentMsg::getDeleted, 0); // 未删除
|
||||
|
||||
// ==================== 基础信息检索 ====================
|
||||
// 文本类参数使用like查询
|
||||
lqw.like(StringUtils.isNotBlank(bo.getStudentNo()), XgStudentMsg::getStudentNo, bo.getStudentNo());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getName()), XgStudentMsg::getName, bo.getName());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getIdCard()), XgStudentMsg::getIdCard, bo.getIdCard());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getPhone()), XgStudentMsg::getPhone, bo.getPhone());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getEmail()), XgStudentMsg::getEmail, bo.getEmail());
|
||||
|
||||
// 精确匹配参数
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getGender()), XgStudentMsg::getGender, bo.getGender());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getNationality()), XgStudentMsg::getNationality, bo.getNationality());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getPoliticalStatus()), XgStudentMsg::getPoliticalStatus, bo.getPoliticalStatus());
|
||||
|
||||
// 时间范围查询
|
||||
if (bo.getBirthDateStart() != null && bo.getBirthDateEnd() != null) {
|
||||
lqw.between(XgStudentMsg::getBirthDate, bo.getBirthDateStart(), bo.getBirthDateEnd());
|
||||
}
|
||||
|
||||
// ==================== 学籍信息检索 ====================
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getStudentStatus()), XgStudentMsg::getStudentStatus, bo.getStudentStatus());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getAdmissionCategory()), XgStudentMsg::getAdmissionCategory, bo.getAdmissionCategory());
|
||||
|
||||
// 数值范围查询
|
||||
if (bo.getEnrollmentYearStart() != null && bo.getEnrollmentYearEnd() != null) {
|
||||
lqw.between(XgStudentMsg::getEnrollmentYear, bo.getEnrollmentYearStart(), bo.getEnrollmentYearEnd());
|
||||
}
|
||||
|
||||
// 时间范围查询
|
||||
if (bo.getEnrollmentDateStart() != null && bo.getEnrollmentDateEnd() != null) {
|
||||
lqw.between(XgStudentMsg::getEnrollmentDate, bo.getEnrollmentDateStart(), bo.getEnrollmentDateEnd());
|
||||
}
|
||||
|
||||
// ==================== 学院专业班级检索 ====================
|
||||
lqw.like(StringUtils.isNotBlank(bo.getCollegeName()), XgStudentMsg::getCollegeName, bo.getCollegeName());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getMajorName()), XgStudentMsg::getMajorName, bo.getMajorName());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getClassName()), XgStudentMsg::getClassName, bo.getClassName());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getGrade()), XgStudentMsg::getGrade, bo.getGrade());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getCounselorName()), XgStudentMsg::getCounselorName, bo.getCounselorName());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getClassTeacherName()), XgStudentMsg::getClassTeacherName, bo.getClassTeacherName());
|
||||
|
||||
// ==================== 家庭信息检索 ====================
|
||||
lqw.like(StringUtils.isNotBlank(bo.getFatherName()), XgStudentMsg::getFatherName, bo.getFatherName());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getMotherName()), XgStudentMsg::getMotherName, bo.getMotherName());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getGuardianName()), XgStudentMsg::getGuardianName, bo.getGuardianName());
|
||||
|
||||
// 数值范围查询
|
||||
if (bo.getFamilyIncomeMin() != null && bo.getFamilyIncomeMax() != null) {
|
||||
lqw.between(XgStudentMsg::getFamilyIncome, bo.getFamilyIncomeMin(), bo.getFamilyIncomeMax());
|
||||
}
|
||||
if (bo.getPerCapitaIncomeMin() != null && bo.getPerCapitaIncomeMax() != null) {
|
||||
lqw.between(XgStudentMsg::getPerCapitaIncome, bo.getPerCapitaIncomeMin(), bo.getPerCapitaIncomeMax());
|
||||
}
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getFamilyEconomicStatus()), XgStudentMsg::getFamilyEconomicStatus, bo.getFamilyEconomicStatus());
|
||||
if (bo.getFamilyMembersMin() != null && bo.getFamilyMembersMax() != null) {
|
||||
lqw.between(XgStudentMsg::getFamilyMembers, bo.getFamilyMembersMin(), bo.getFamilyMembersMax());
|
||||
}
|
||||
|
||||
// ==================== 特殊身份检索 ====================
|
||||
lqw.eq(bo.getIsPoorStudent() != null, XgStudentMsg::getIsPoorStudent, bo.getIsPoorStudent());
|
||||
lqw.eq(bo.getIsMinority() != null, XgStudentMsg::getIsMinority, bo.getIsMinority());
|
||||
lqw.eq(bo.getIsDisabled() != null, XgStudentMsg::getIsDisabled, bo.getIsDisabled());
|
||||
lqw.eq(bo.getIsOrphan() != null, XgStudentMsg::getIsOrphan, bo.getIsOrphan());
|
||||
lqw.eq(bo.getIsLeftBehindChild() != null, XgStudentMsg::getIsLeftBehindChild, bo.getIsLeftBehindChild());
|
||||
lqw.eq(bo.getIsSingleChild() != null, XgStudentMsg::getIsSingleChild, bo.getIsSingleChild());
|
||||
lqw.eq(bo.getIsLowIncome() != null, XgStudentMsg::getIsLowIncome, bo.getIsLowIncome());
|
||||
lqw.eq(bo.getHasLoan() != null, XgStudentMsg::getHasLoan, bo.getHasLoan());
|
||||
if (bo.getLoanAmountMin() != null && bo.getLoanAmountMax() != null) {
|
||||
lqw.between(XgStudentMsg::getLoanAmount, bo.getLoanAmountMin(), bo.getLoanAmountMax());
|
||||
}
|
||||
|
||||
// ==================== 身体状况检索 ====================
|
||||
if (bo.getHeightMin() != null && bo.getHeightMax() != null) {
|
||||
lqw.between(XgStudentMsg::getHeight, bo.getHeightMin(), bo.getHeightMax());
|
||||
}
|
||||
if (bo.getWeightMin() != null && bo.getWeightMax() != null) {
|
||||
lqw.between(XgStudentMsg::getWeight, bo.getWeightMin(), bo.getWeightMax());
|
||||
}
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getBloodType()), XgStudentMsg::getBloodType, bo.getBloodType());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getHealthStatus()), XgStudentMsg::getHealthStatus, bo.getHealthStatus());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getDisabilityType()), XgStudentMsg::getDisabilityType, bo.getDisabilityType());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getDisabilityLevel()), XgStudentMsg::getDisabilityLevel, bo.getDisabilityLevel());
|
||||
|
||||
// ==================== 住宿信息检索 ====================
|
||||
lqw.eq(bo.getIsBoarder() != null, XgStudentMsg::getIsBoarder, bo.getIsBoarder());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getDormitoryBuilding()), XgStudentMsg::getDormitoryBuilding, bo.getDormitoryBuilding());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getDormitoryRoom()), XgStudentMsg::getDormitoryRoom, bo.getDormitoryRoom());
|
||||
|
||||
// ==================== 其他信息检索 ====================
|
||||
lqw.like(StringUtils.isNotBlank(bo.getNativePlace()), XgStudentMsg::getNativePlace, bo.getNativePlace());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSourceRegion()), XgStudentMsg::getSourceRegion, bo.getSourceRegion());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getGraduateSchool()), XgStudentMsg::getGraduateSchool, bo.getGraduateSchool());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getHouseholdRegisterType()), XgStudentMsg::getHouseholdRegisterType, bo.getHouseholdRegisterType());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getEducationLevel()), XgStudentMsg::getEducationLevel, bo.getEducationLevel());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getTrainingType()), XgStudentMsg::getTrainingType, bo.getTrainingType());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getAcademicLevel()), XgStudentMsg::getAcademicLevel, bo.getAcademicLevel());
|
||||
if (bo.getSchoolSystemMin() != null && bo.getSchoolSystemMax() != null) {
|
||||
lqw.between(XgStudentMsg::getSchoolSystem, bo.getSchoolSystemMin(), bo.getSchoolSystemMax());
|
||||
}
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getInfoStatus()), XgStudentMsg::getInfoStatus, bo.getInfoStatus());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getDataSource()), XgStudentMsg::getDataSource, bo.getDataSource());
|
||||
lqw.eq(bo.getIsComplete() != null, XgStudentMsg::getIsComplete, bo.getIsComplete());
|
||||
if (bo.getCompletionRateMin() != null && bo.getCompletionRateMax() != null) {
|
||||
lqw.between(XgStudentMsg::getCompletionRate, bo.getCompletionRateMin(), bo.getCompletionRateMax());
|
||||
}
|
||||
|
||||
// ==================== 时间范围检索 ====================
|
||||
if (bo.getCreateTimeStart() != null && bo.getCreateTimeEnd() != null) {
|
||||
lqw.between(XgStudentMsg::getCreateTime, bo.getCreateTimeStart(), bo.getCreateTimeEnd());
|
||||
}
|
||||
if (bo.getUpdateTimeStart() != null && bo.getUpdateTimeEnd() != null) {
|
||||
lqw.between(XgStudentMsg::getUpdateTime, bo.getUpdateTimeStart(), bo.getUpdateTimeEnd());
|
||||
}
|
||||
|
||||
// 排序：按创建时间倒序
|
||||
lqw.orderByDesc(XgStudentMsg::getCreateTime);
|
||||
|
||||
return lqw;
|
||||
}
|
||||
```
|
||||
|
||||
#### 2.3 Controller新增API
|
||||
**文件路径**: `backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentMsgController.java`
|
||||
|
||||
**新增API方法**:
|
||||
```java
|
||||
/**
|
||||
* 高级检索学生信息
|
||||
*
|
||||
* @param bo 高级检索条件
|
||||
* @return 学生信息分页列表
|
||||
*/
|
||||
@SaCheckPermission("studentMsg:studentMsg:list")
|
||||
@PostMapping("/advancedSearch")
|
||||
public TableDataInfo<XgStudentMsgVo> advancedSearch(@RequestBody XgStudentMsgAdvancedSearchBo bo) {
|
||||
log.info("接收到高级检索请求，检索条件: {}", bo);
|
||||
return xgStudentMsgService.advancedSearch(bo);
|
||||
}
|
||||
```
|
||||
|
||||
## 🔍 查询逻辑说明
|
||||
|
||||
### 1. 查询类型分类
|
||||
|
||||
#### 1.1 文本类参数 - 模糊查询
|
||||
使用 `LIKE` 操作符进行模糊匹配：
|
||||
- 学号、姓名、身份证号、手机号码、邮箱
|
||||
- 学院名称、专业名称、班级名称、辅导员姓名、班主任姓名
|
||||
- 父亲姓名、母亲姓名、监护人姓名
|
||||
- 宿舍楼栋、宿舍房间号
|
||||
- 籍贯、毕业院校
|
||||
|
||||
#### 1.2 数值类参数 - 范围查询
|
||||
使用 `BETWEEN` 操作符进行范围查询：
|
||||
- 入学年份：`enrollmentYearStart` 到 `enrollmentYearEnd`
|
||||
- 家庭年收入：`familyIncomeMin` 到 `familyIncomeMax`
|
||||
- 人均收入：`perCapitaIncomeMin` 到 `perCapitaIncomeMax`
|
||||
- 家庭成员数量：`familyMembersMin` 到 `familyMembersMax`
|
||||
- 助学贷款金额：`loanAmountMin` 到 `loanAmountMax`
|
||||
- 身高：`heightMin` 到 `heightMax`
|
||||
- 体重：`weightMin` 到 `weightMax`
|
||||
- 学制：`schoolSystemMin` 到 `schoolSystemMax`
|
||||
- 完整度百分比：`completionRateMin` 到 `completionRateMax`
|
||||
|
||||
#### 1.3 时间类参数 - 时间范围查询
|
||||
使用 `BETWEEN` 操作符进行时间范围查询：
|
||||
- 出生日期：`birthDateStart` 到 `birthDateEnd`
|
||||
- 入学日期：`enrollmentDateStart` 到 `enrollmentDateEnd`
|
||||
- 创建时间：`createTimeStart` 到 `createTimeEnd`
|
||||
- 更新时间：`updateTimeStart` 到 `updateTimeEnd`
|
||||
|
||||
#### 1.4 枚举类参数 - 精确匹配
|
||||
使用 `=` 操作符进行精确匹配：
|
||||
- 性别、民族、政治面貌、学籍状态、录取类别
|
||||
- 年级、家庭经济状况、血型、健康状况
|
||||
- 残疾类型、残疾等级、户口类型、文化程度
|
||||
- 培养方式、学历层次、信息状态、数据来源
|
||||
- 各种是否标识（贫困生、少数民族、残疾等）
|
||||
|
||||
### 2. 权限控制逻辑
|
||||
|
||||
#### 2.1 全校管理员权限
|
||||
- 不进行权限过滤
|
||||
- 可以查看所有部门的学生信息
|
||||
- 返回包含入参deptIds及其子组织的列表
|
||||
|
||||
#### 2.2 普通用户权限
|
||||
- 获取用户的总权限集合
|
||||
- 过滤deptIds，只保留在权限范围内的
|
||||
- 如果入参deptIds为空，直接使用用户权限范围内的所有部门
|
||||
- 对过滤后的deptIds，查找所有子组织包括他们自己
|
||||
|
||||
### 3. 查询优化
|
||||
|
||||
#### 3.1 条件构建优化
|
||||
- 使用 `StringUtils.isNotBlank()` 进行空值检查
|
||||
- 只有非空参数才会添加到查询条件中
|
||||
- 避免无效的查询条件影响性能
|
||||
|
||||
#### 3.2 排序优化
|
||||
- 默认按创建时间倒序排列
|
||||
- 确保查询结果的一致性和可预测性
|
||||
|
||||
## 📊 API接口规范
|
||||
|
||||
### 请求信息
|
||||
- **接口路径**: `POST /studentMsg/studentMsg/advancedSearch`
|
||||
- **权限要求**: `studentMsg:studentMsg:list`
|
||||
- **请求方式**: POST
|
||||
- **Content-Type**: application/json
|
||||
|
||||
### 请求参数
|
||||
```json
|
||||
{
|
||||
"studentNo": "2021001",
|
||||
"name": "张三",
|
||||
"gender": "0",
|
||||
"studentStatus": "1",
|
||||
"collegeName": "计算机学院",
|
||||
"isPoorStudent": 1,
|
||||
"heightMin": 160,
|
||||
"heightMax": 180,
|
||||
"deptIds": [1001, 1002, 1003],
|
||||
"pageNum": 1,
|
||||
"pageSize": 10
|
||||
}
|
||||
```
|
||||
|
||||
### 响应格式
|
||||
```json
|
||||
{
|
||||
"code": 200,
|
||||
"msg": "操作成功",
|
||||
"rows": [
|
||||
{
|
||||
"id": 1234567890,
|
||||
"studentNo": "2021001",
|
||||
"name": "张三",
|
||||
"gender": "0",
|
||||
"phone": "13800138000",
|
||||
"email": "zhangsan@example.com",
|
||||
"studentStatus": "1",
|
||||
"collegeName": "计算机学院",
|
||||
"majorName": "软件工程",
|
||||
"className": "软件2101班",
|
||||
"isPoorStudent": 1,
|
||||
"height": 175.0,
|
||||
"weight": 65.0,
|
||||
"createTime": "2025-01-27 15:30:00",
|
||||
"updateTime": "2025-01-27 15:30:00"
|
||||
}
|
||||
],
|
||||
"total": 1
|
||||
}
|
||||
```
|
||||
|
||||
## ✅ 测试验证
|
||||
|
||||
### 1. 功能测试
|
||||
- [x] 基础信息检索测试
|
||||
- [x] 学籍信息检索测试
|
||||
- [x] 学院专业班级检索测试
|
||||
- [x] 家庭信息检索测试
|
||||
- [x] 特殊身份检索测试
|
||||
- [x] 身体状况检索测试
|
||||
- [x] 住宿信息检索测试
|
||||
- [x] 其他信息检索测试
|
||||
- [x] 时间范围检索测试
|
||||
|
||||
### 2. 权限测试
|
||||
- [x] 全校管理员权限测试
|
||||
- [x] 普通用户权限测试
|
||||
- [x] 部门树节点权限过滤测试
|
||||
|
||||
### 3. 性能测试
|
||||
- [x] 大数据量查询性能测试
|
||||
- [x] 复杂条件组合查询测试
|
||||
- [x] 分页查询性能测试
|
||||
|
||||
## 🚀 部署说明
|
||||
|
||||
### 1. 编译部署
|
||||
```bash
|
||||
# 编译项目
|
||||
mvn clean compile
|
||||
|
||||
# 打包项目
|
||||
mvn clean package
|
||||
|
||||
# 启动服务
|
||||
java -jar ruoyi-admin.jar
|
||||
```
|
||||
|
||||
### 2. 数据库验证
|
||||
- 确保 `xg_student_msg` 表结构完整
|
||||
- 确保相关索引已创建
|
||||
- 确保权限相关表数据正确
|
||||
|
||||
### 3. 接口验证
|
||||
```bash
|
||||
# 测试高级检索接口
|
||||
curl -X POST http://localhost:8080/studentMsg/studentMsg/advancedSearch \
|
||||
-H "Content-Type: application/json" \
|
||||
-H "Authorization: Bearer YOUR_TOKEN" \
|
||||
-d '{
|
||||
"name": "张三",
|
||||
"pageNum": 1,
|
||||
"pageSize": 10
|
||||
}'
|
||||
```
|
||||
|
||||
## 📝 注意事项
|
||||
|
||||
### 1. 性能考虑
|
||||
- 大量数据查询时建议使用分页
|
||||
- 复杂条件组合可能影响查询性能
|
||||
- 建议在常用查询字段上创建索引
|
||||
|
||||
### 2. 权限安全
|
||||
- 严格遵循权限控制逻辑
|
||||
- 确保用户只能查看有权限的数据
|
||||
- 定期检查权限配置的正确性
|
||||
|
||||
### 3. 数据一致性
|
||||
- 确保查询条件的数据类型匹配
|
||||
- 注意时间格式的统一性
|
||||
- 验证枚举值的有效性
|
||||
|
||||
## 🔄 后续优化
|
||||
|
||||
### 1. 功能扩展
|
||||
- 支持更多检索维度
|
||||
- 增加检索条件保存功能
|
||||
- 支持检索结果导出
|
||||
|
||||
### 2. 性能优化
|
||||
- 添加查询缓存机制
|
||||
- 优化数据库索引
|
||||
- 实现异步查询处理
|
||||
|
||||
### 3. 用户体验
|
||||
- 提供检索条件模板
|
||||
- 增加检索历史记录
|
||||
- 优化前端交互体验
|
||||
|
||||
---
|
||||
|
||||
**变更完成时间**: 2025-01-27 17:00:00
|
||||
**变更状态**: ✅ 已完成
|
||||
**测试状态**: ✅ 已通过
|
||||
**部署状态**: ⏳ 待部署
|
||||
|
||||
## 📝 后续完善记录
|
||||
|
||||
### 2025-01-27 16:30:00 - 完善检索条件配置
|
||||
|
||||
#### 完善内容
|
||||
1. **补充BO类缺失字段**：
|
||||
- 英文姓名、曾用名
|
||||
- 户籍所在地、家庭地址、现住址
|
||||
- QQ号码、微信号、婚姻状况
|
||||
- 宗教信仰
|
||||
- 父亲电话、父亲工作单位
|
||||
- 母亲电话、母亲工作单位
|
||||
- 监护人电话、监护人关系
|
||||
- 收入来源
|
||||
- 紧急联系人姓名、电话、关系
|
||||
- 特长爱好、获奖情况、违纪记录、社会活动
|
||||
- 特殊体质或疾病、病史、过敏史
|
||||
|
||||
2. **完善查询条件构建方法**：
|
||||
- 按照前端界面顺序重新组织查询条件
|
||||
- 基础信息 → 学籍信息 → 家庭信息 → 扩展信息 → 健康信息 → 时间范围
|
||||
- 修正查询类型：文本类使用like，数值类使用between，枚举类使用eq
|
||||
- 添加详细的注释说明每个检索条件的作用
|
||||
|
||||
#### 技术改进
|
||||
- 修复了BO类中重复字段定义的问题
|
||||
- 优化了查询条件的组织结构，提高代码可读性
|
||||
- 确保所有前端界面的检索条件都有对应的后端处理逻辑
|
||||
|
||||
### 2025-01-27 17:00:00 - 支持下拉框多选功能
|
||||
|
||||
#### 完善内容
|
||||
1. **修改BO类字段类型**：
|
||||
- 将多选下拉框字段从String改为List<String>或List<Long>
|
||||
- 涉及字段：民族、政治面貌、户口类型、文化程度、婚姻状况、录取类别、学历层次、培养方式、学籍状态、是否住校、各种特殊身份标识、血型、残疾类型
|
||||
|
||||
2. **修改查询条件构建方法**：
|
||||
- 将多选字段的查询方式从eq改为in
|
||||
- 使用`bo.getField() != null && !bo.getField().isEmpty()`进行空值检查
|
||||
- 支持多选值的OR查询逻辑
|
||||
|
||||
#### 技术改进
|
||||
- 支持前端多选下拉框的数据传递
|
||||
- 优化了多选字段的查询性能
|
||||
- 确保查询条件的准确性和完整性
|
||||
@@ -419,3 +419,289 @@ const handleFileError = (error: any) => {
|
||||
## 备注
|
||||
|
||||
本次修改遵循了项目的前端开发规范，使用了Element Plus的ElMessage组件实现loading效果，保持了代码风格的一致性。
|
||||
|
||||
# 学生花名册页面左侧树加载API实现 - 变更记录
|
||||
|
||||
**变更时间**: 2025-01-27 15:30:00
|
||||
**变更人员**: Cursor AI
|
||||
**变更类型**: 功能实现
|
||||
|
||||
## 📋 变更概述
|
||||
|
||||
为学生花名册页面(`web/src/views/xg/xsjcxx/stuRoster/index.vue`)的左侧部门树实现API加载功能，与学生信息管理页面的getDeptTree API保持一致。
|
||||
|
||||
## 🔧 具体变更内容
|
||||
|
||||
### 1. 创建API文件
|
||||
- **新增文件**: `web/src/api/xg/xsjcxx/stuRoster/index.ts`
|
||||
- 实现 `XgDeptTreeSelect` 方法，调用 `/xgStudentManagerSource/studentManagerSource/currentUserAuthTree` 接口
|
||||
- 实现 `deptTreeSelect` 方法，调用 `/system/dept/treeselect` 接口作为备选
|
||||
- 实现 `listStudentRoster` 方法，调用 `/studentMsg/studentMsg/list` 接口
|
||||
- 实现 `exportStudentRoster` 方法，调用 `/studentMsg/studentMsg/export` 接口
|
||||
|
||||
### 2. 创建类型定义文件
|
||||
- **新增文件**: `web/src/api/xg/xsjcxx/stuRoster/types.ts`
|
||||
- 定义 `XgDeptTreeVO` 部门树节点类型
|
||||
- 定义 `R` 通用响应类型
|
||||
- 定义 `TableDataInfo` 分页数据信息类型
|
||||
- 定义 `StudentRosterQuery` 查询参数类型
|
||||
- 定义 `StudentRosterVO` 学生花名册数据类型
|
||||
|
||||
### 3. 修改学生花名册页面
|
||||
- **文件**: `web/src/views/xg/xsjcxx/stuRoster/index.vue`
|
||||
- 添加API导入: `import api from '@/api/xg/xsjcxx/stuRoster/index'`
|
||||
- 实现 `getDeptTree` 方法，与学生信息管理页面保持一致
|
||||
- 修改 `getList` 方法，使用真实API替代模拟数据
|
||||
- 修改 `handleExport` 方法，使用真实导出API
|
||||
- 删除静态部门树数据，改为动态加载
|
||||
- 删除模拟数据生成代码
|
||||
- 在 `onMounted` 中先调用 `getDeptTree()` 再调用 `getList()`
|
||||
|
||||
## 🔄 API实现细节
|
||||
|
||||
### getDeptTree方法实现
|
||||
```typescript
|
||||
const getDeptTree = async () => {
|
||||
try {
|
||||
const res = await api.XgDeptTreeSelect(101);
|
||||
if (res.data && Array.isArray(res.data)) {
|
||||
deptOptions.value = res.data;
|
||||
} else {
|
||||
console.warn('部门树数据格式不符合预期');
|
||||
const backup = await api.deptTreeSelect();
|
||||
deptOptions.value = backup.data.data;
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('获取部门树失败:', error);
|
||||
try {
|
||||
const backup = await api.deptTreeSelect();
|
||||
deptOptions.value = backup.data.data;
|
||||
} catch (backupError) {
|
||||
console.error('备选API也失败:', backupError);
|
||||
ElMessage.error('获取部门树失败，请重试');
|
||||
}
|
||||
}
|
||||
};
|
||||
```
|
||||
|
||||
### API接口映射
|
||||
- **主要接口**: `/xgStudentManagerSource/studentManagerSource/currentUserAuthTree`
|
||||
- **备选接口**: `/system/dept/treeselect`
|
||||
- **学生列表接口**: `/studentMsg/studentMsg/list`
|
||||
- **导出接口**: `/studentMsg/studentMsg/export`
|
||||
|
||||
## ✅ 变更验证
|
||||
|
||||
### 功能验证
|
||||
- [x] 部门树能够从API动态加载
|
||||
- [x] 学生列表能够从API获取数据
|
||||
- [x] 导出功能能够正常工作
|
||||
- [x] 错误处理机制完善
|
||||
|
||||
### 代码质量
|
||||
- [x] API接口与学生信息管理页面保持一致
|
||||
- [x] 类型定义完整
|
||||
- [x] 错误处理完善
|
||||
- [x] 代码结构清晰
|
||||
|
||||
## 📝 注意事项
|
||||
|
||||
1. **API一致性**: 学生花名册页面的getDeptTree方法与学生信息管理页面完全一致
|
||||
2. **错误处理**: 实现了主API失败时的备选API机制
|
||||
3. **数据格式**: 支持两种不同的API返回格式
|
||||
4. **性能优化**: 删除了大量静态数据，改为动态加载
|
||||
|
||||
## 🔗 相关文件
|
||||
|
||||
- `web/src/views/xg/xsjcxx/stuRoster/index.vue` - 学生花名册页面
|
||||
- `web/src/api/xg/xsjcxx/stuRoster/index.ts` - API接口文件
|
||||
- `web/src/api/xg/xsjcxx/stuRoster/types.ts` - 类型定义文件
|
||||
- `web/src/views/xg/xsjcxx/studentMsg/studentMsg/index.vue` - 参考的学生信息管理页面
|
||||
|
||||
---
|
||||
|
||||
**变更完成时间**: 2025-01-27 15:30:00
|
||||
**状态**: ✅ 已完成
|
||||
|
||||
# 代码调整记录 - 2025-01-27
|
||||
|
||||
## 修改概述
|
||||
在高级检索界面中为籍贯和生源地区字段添加API数据获取功能，替换原有的字典数据源。
|
||||
|
||||
## 修改文件
|
||||
- `web/src/views/xg/xsjcxx/stuRoster/components/AdvancedSearchDialog.vue`
|
||||
|
||||
## 具体修改内容
|
||||
|
||||
### 1. 导入依赖
|
||||
- 添加 `onMounted` 生命周期钩子导入
|
||||
- 添加 `ElMessage` 消息提示组件导入
|
||||
- 添加 `request` HTTP请求工具导入
|
||||
|
||||
### 2. 响应式数据
|
||||
- 新增 `regionOptions` 响应式数组，用于存储行政区划数据
|
||||
- 移除 `xg_source_region` 字典数据依赖
|
||||
|
||||
### 3. 模板修改
|
||||
- 将籍贯字段的数据源从 `xg_native_place` 字典改为 `regionOptions` API数据
|
||||
- 将生源地区字段的数据源从 `xg_source_region` 字典改为 `regionOptions` API数据
|
||||
- 修改选项的key、label、value属性映射：
|
||||
- `key`: `item.id`
|
||||
- `label`: `item.name`
|
||||
- `value`: `item.id`
|
||||
|
||||
### 4. 方法实现
|
||||
- 新增 `getRegionTree` 异步方法：
|
||||
- 调用 `/system/SysRegion/tree` API接口
|
||||
- 获取行政区划树形数据
|
||||
- 错误处理和用户提示
|
||||
|
||||
### 5. 生命周期
|
||||
- 在 `onMounted` 钩子中调用 `getRegionTree` 方法
|
||||
- 确保组件挂载时自动获取行政区划数据
|
||||
|
||||
## 技术实现要点
|
||||
|
||||
### API接口
|
||||
- **接口地址**: `/system/SysRegion/tree`
|
||||
- **请求方式**: GET
|
||||
- **返回格式**: 树形结构的行政区划数据
|
||||
|
||||
### 数据结构
|
||||
```typescript
|
||||
interface RegionItem {
|
||||
id: string | number; // 区域ID
|
||||
name: string; // 区域名称
|
||||
// 其他树形结构字段...
|
||||
}
|
||||
```
|
||||
|
||||
### 错误处理
|
||||
- 使用 try-catch 捕获API请求异常
|
||||
- 控制台输出详细错误信息
|
||||
- 用户友好的错误提示消息
|
||||
|
||||
## 影响范围
|
||||
- 高级检索对话框中的籍贯选择功能
|
||||
- 高级检索对话框中的生源地区选择功能
|
||||
- 用户可以选择真实的行政区划数据而不是字典数据
|
||||
- 提升了数据的准确性和实用性
|
||||
|
||||
## 测试建议
|
||||
1. 打开高级检索对话框
|
||||
2. 验证籍贯下拉选项是否正确加载
|
||||
3. 测试多选功能是否正常
|
||||
4. 检查网络异常时的错误提示
|
||||
|
||||
## 相关文档
|
||||
- 参考实现：`web/src/views/xg/xsjcxx/stuPersonalMsg/index.vue` 中的 `getRegionTree` 方法
|
||||
- API文档：行政区划管理相关接口
|
||||
|
||||
---
|
||||
**修改时间**: 2025-01-27
|
||||
**修改人**: Cursor AI
|
||||
**状态**: 已完成
|
||||
|
||||
# 代码调整记录 - 2025-01-27
|
||||
|
||||
## 修改概述
|
||||
将学生花名册API从基础的list接口改为使用高级搜索接口，以支持更丰富的查询功能。
|
||||
|
||||
## 修改详情
|
||||
|
||||
### 1. 前端API接口修改
|
||||
**文件**: `web/src/api/xg/xsjcxx/stuRoster/index.ts`
|
||||
|
||||
**修改内容**:
|
||||
- 将 `listStudentRoster` 方法的请求方式从 `GET` 改为 `POST`
|
||||
- 将请求URL从 `/studentMsg/studentMsg/list` 改为 `/studentMsg/studentMsg/advancedSearch`
|
||||
- 将请求参数从 `params` 改为 `data`（POST请求体）
|
||||
- 添加了新的类型导入 `XgStudentMsgAdvancedSearchQuery`
|
||||
|
||||
**修改前**:
|
||||
```typescript
|
||||
export function listStudentRoster(query?: any): AxiosPromise<R<TableDataInfo<any[]>>> {
|
||||
return request({
|
||||
url: '/studentMsg/studentMsg/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
});
|
||||
}
|
||||
```
|
||||
|
||||
**修改后**:
|
||||
```typescript
|
||||
export function listStudentRoster(query?: XgStudentMsgAdvancedSearchQuery): AxiosPromise<R<TableDataInfo<any[]>>> {
|
||||
return request({
|
||||
url: '/studentMsg/studentMsg/advancedSearch',
|
||||
method: 'post',
|
||||
data: query
|
||||
});
|
||||
}
|
||||
```
|
||||
|
||||
### 2. 类型定义扩展
|
||||
**文件**: `web/src/api/xg/xsjcxx/stuRoster/types.ts`
|
||||
|
||||
**新增内容**:
|
||||
- 添加了 `XgStudentMsgAdvancedSearchQuery` 接口类型定义
|
||||
- 包含了完整的 advancedSearch 接口支持的所有查询参数
|
||||
- 涵盖了基础信息、学籍信息、学院专业班级、家庭信息、特殊身份、身体状况、住宿信息等多个维度的检索条件
|
||||
|
||||
**新增类型结构**:
|
||||
```typescript
|
||||
export interface XgStudentMsgAdvancedSearchQuery {
|
||||
// 基础信息检索
|
||||
studentNo?: string;
|
||||
name?: string;
|
||||
idCard?: string;
|
||||
phone?: string;
|
||||
email?: string;
|
||||
gender?: string[];
|
||||
// ... 更多字段
|
||||
|
||||
// 分页参数
|
||||
pageNum?: number;
|
||||
pageSize?: number;
|
||||
}
|
||||
```
|
||||
|
||||
## 技术要点
|
||||
|
||||
### 1. 接口兼容性
|
||||
- 保持了原有的函数签名，只是改变了内部实现
|
||||
- 新的查询参数类型是扩展的，向后兼容原有的简单查询参数
|
||||
|
||||
### 2. 请求方式变更
|
||||
- 从 GET 请求改为 POST 请求，支持更复杂的查询条件
|
||||
- 参数传递方式从 URL 参数改为请求体，避免 URL 过长的问题
|
||||
|
||||
### 3. 类型安全
|
||||
- 添加了完整的 TypeScript 类型定义
|
||||
- 提供了更好的开发体验和代码提示
|
||||
|
||||
## 影响范围
|
||||
|
||||
### 1. 前端调用方
|
||||
- 使用 `listStudentRoster` 方法的组件需要确保传递的参数符合新的类型定义
|
||||
- 原有的简单查询参数仍然可以正常工作
|
||||
|
||||
### 2. 后端接口
|
||||
- 后端 `XgStudentMsgController.advancedSearch` 方法已经实现
|
||||
- 支持完整的查询条件处理
|
||||
|
||||
## 验证建议
|
||||
|
||||
1. **功能测试**: 验证学生花名册列表页面是否正常加载
|
||||
2. **查询测试**: 测试各种查询条件组合是否正常工作
|
||||
3. **类型检查**: 确保 TypeScript 编译无错误
|
||||
4. **向后兼容**: 验证原有的简单查询是否仍然有效
|
||||
|
||||
## 相关文档
|
||||
- 后端接口文档: `docs/开发文档/API/学生信息管理API.md`
|
||||
- 高级搜索功能说明: 参考 `XgStudentMsgAdvancedSearchBo` 类的完整字段说明
|
||||
|
||||
---
|
||||
**修改时间**: 2025-01-27 14:30:00
|
||||
**修改人**: Cursor AI
|
||||
**修改原因**: 提升学生信息查询功能，支持更丰富的高级搜索条件
|
||||
@@ -0,0 +1,184 @@
|
||||
# 学生详情弹窗集成修改记录
|
||||
|
||||
**修改时间**: 2025-01-27 16:00:00
|
||||
**修改人员**: AI Assistant
|
||||
**修改类型**: 功能增强
|
||||
|
||||
## 修改概述
|
||||
|
||||
将学生详情弹窗(`StudentDetailDialog.vue`)从独立页面改造为可复用的弹窗组件，支持从学生花名册页面的列表视图和卡片视图中传递学生ID并显示详细信息。
|
||||
|
||||
## 修改内容
|
||||
|
||||
### 1. 学生详情弹窗组件改造
|
||||
|
||||
**文件**: `web/src/views/xg/xsjcxx/stuRoster/components/StudentDetailDialog.vue`
|
||||
|
||||
#### 1.1 模板结构修改
|
||||
- 将原有的独立页面结构包装在`el-dialog`组件中
|
||||
- 添加弹窗标题、宽度、关闭行为等配置
|
||||
- 保持原有的Tab页结构和表单布局
|
||||
|
||||
#### 1.2 Props和Emits定义
|
||||
```typescript
|
||||
// 定义props
|
||||
interface Props {
|
||||
visible: boolean;
|
||||
studentId?: number | null;
|
||||
}
|
||||
|
||||
const props = withDefaults(defineProps<Props>(), {
|
||||
visible: false,
|
||||
studentId: null
|
||||
});
|
||||
|
||||
// 定义emits
|
||||
const emit = defineEmits<{
|
||||
'update:visible': [value: boolean];
|
||||
}>();
|
||||
|
||||
// 计算属性：控制弹窗显示
|
||||
const dialogVisible = computed({
|
||||
get: () => props.visible,
|
||||
set: (value) => emit('update:visible', value)
|
||||
});
|
||||
```
|
||||
|
||||
#### 1.3 API调用修改
|
||||
- 修改`getPersonalInfoData`方法，支持传入学生ID参数
|
||||
- 使用正确的API路径：`/studentMsg/studentMsg/personalInfo`
|
||||
- 通过查询参数`userId`传递学生ID
|
||||
|
||||
```typescript
|
||||
/** 获取学生个人信息 */
|
||||
const getPersonalInfoData = async (studentId?: number) => {
|
||||
if (!studentId) {
|
||||
ElMessage.warning('学生ID不能为空');
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
loading.value = true;
|
||||
const response = await request({
|
||||
url: '/studentMsg/studentMsg/personalInfo',
|
||||
method: 'get',
|
||||
params: { userId: studentId }
|
||||
});
|
||||
// ... 处理响应数据
|
||||
} catch (error) {
|
||||
console.error('获取个人信息失败:', error);
|
||||
ElMessage.error('获取个人信息失败，请稍后重试');
|
||||
} finally {
|
||||
loading.value = false;
|
||||
}
|
||||
};
|
||||
```
|
||||
|
||||
#### 1.4 数据监听机制
|
||||
- 添加`watch`监听器，监听`props.visible`和`props.studentId`的变化
|
||||
- 当弹窗打开且有学生ID时，自动获取学生信息
|
||||
- 在获取新数据前重置表单数据
|
||||
|
||||
```typescript
|
||||
// 监听学生ID变化，当弹窗打开且有学生ID时获取数据
|
||||
watch(
|
||||
() => [props.visible, props.studentId],
|
||||
async ([visible, studentId]) => {
|
||||
if (visible && studentId && typeof studentId === 'number') {
|
||||
// 重置表单数据
|
||||
Object.keys(form).forEach((key) => {
|
||||
const value = form[key];
|
||||
if (typeof value === 'string') {
|
||||
(form as any)[key] = '';
|
||||
} else if (typeof value === 'number') {
|
||||
(form as any)[key] = undefined;
|
||||
} else if (typeof value === 'boolean') {
|
||||
(form as any)[key] = undefined;
|
||||
}
|
||||
});
|
||||
|
||||
// 获取学生个人信息
|
||||
await getPersonalInfoData(studentId);
|
||||
}
|
||||
},
|
||||
{ immediate: true }
|
||||
);
|
||||
```
|
||||
|
||||
### 2. 主页面集成
|
||||
|
||||
**文件**: `web/src/views/xg/xsjcxx/stuRoster/index.vue`
|
||||
|
||||
#### 2.1 详情弹窗状态管理
|
||||
```typescript
|
||||
// 详情弹窗
|
||||
const detailDialog = reactive({
|
||||
visible: false,
|
||||
studentId: null as number | null
|
||||
});
|
||||
```
|
||||
|
||||
#### 2.2 查看详情方法
|
||||
```typescript
|
||||
const handleDetail = (row: any) => {
|
||||
detailDialog.studentId = row.id;
|
||||
detailDialog.visible = true;
|
||||
};
|
||||
```
|
||||
|
||||
#### 2.3 组件使用
|
||||
```vue
|
||||
<!-- 学生详情弹窗 -->
|
||||
<student-detail-dialog
|
||||
:visible="detailDialog.visible"
|
||||
:student-id="detailDialog.studentId"
|
||||
@update:visible="(val) => (detailDialog.visible = val)"
|
||||
/>
|
||||
```
|
||||
|
||||
### 3. 触发方式
|
||||
|
||||
#### 3.1 列表视图
|
||||
- 在操作列中添加"查看详情"按钮
|
||||
- 点击按钮调用`handleDetail(row)`方法
|
||||
|
||||
#### 3.2 卡片视图
|
||||
- 卡片支持双击事件
|
||||
- 双击卡片调用`handleDetail(item)`方法
|
||||
- 添加视觉提示："双击查看详情"
|
||||
|
||||
## 功能特点
|
||||
|
||||
1. **响应式设计**: 弹窗支持不同屏幕尺寸的响应式布局
|
||||
2. **数据隔离**: 每次打开弹窗都会重置表单数据，避免数据混淆
|
||||
3. **错误处理**: 完善的错误提示和异常处理机制
|
||||
4. **用户体验**: 加载状态提示，操作反馈及时
|
||||
5. **代码复用**: 组件化设计，可在其他页面复用
|
||||
|
||||
## 技术要点
|
||||
|
||||
1. **Vue 3 Composition API**: 使用`defineProps`、`defineEmits`、`computed`等现代Vue 3特性
|
||||
2. **TypeScript支持**: 完整的类型定义和类型安全
|
||||
3. **响应式数据**: 使用`reactive`和`ref`管理组件状态
|
||||
4. **生命周期管理**: 合理使用`onMounted`和`watch`监听器
|
||||
5. **API集成**: 正确调用后端API并处理响应数据
|
||||
|
||||
## 测试验证
|
||||
|
||||
1. **列表视图测试**: 点击"查看详情"按钮，弹窗正常打开并显示学生信息
|
||||
2. **卡片视图测试**: 双击学生卡片，弹窗正常打开并显示学生信息
|
||||
3. **数据验证**: 确认显示的学生信息与列表/卡片中的基本信息一致
|
||||
4. **错误处理**: 测试无效学生ID的情况，确认错误提示正常
|
||||
5. **响应式测试**: 在不同屏幕尺寸下测试弹窗显示效果
|
||||
|
||||
## 注意事项
|
||||
|
||||
1. **API路径**: 确保后端API路径`/studentMsg/studentMsg/personalInfo`正确配置
|
||||
2. **权限控制**: 确认用户有访问学生个人信息的权限
|
||||
3. **数据格式**: 注意API返回的数据格式与表单字段的映射关系
|
||||
4. **性能优化**: 避免频繁的API调用，合理使用缓存机制
|
||||
5. **用户体验**: 提供清晰的加载状态和错误提示
|
||||
|
||||
---
|
||||
|
||||
**修改完成**: 学生详情弹窗已成功集成到学生花名册页面，支持从列表视图和卡片视图查看学生详细信息。
|
||||
@@ -1,74 +1,54 @@
|
||||
# 代码调整记录 - 2025-01-27
|
||||
|
||||
## 修改时间
|
||||
2025-01-27 14:30:00
|
||||
## 修复内容
|
||||
|
||||
## 修改人员
|
||||
wuzilong
|
||||
|
||||
## 修改内容
|
||||
|
||||
### 高级检索弹出框学籍信息优化
|
||||
### 高级检索界面多选下拉框参数传递格式修复
|
||||
|
||||
**文件**: `web/src/views/xg/xsjcxx/stuRoster/components/AdvancedSearchDialog.vue`
|
||||
|
||||
**问题描述**:
|
||||
- 高级检索界面中，检索按钮调用后台API时，对于下拉框的多选传的参数是 `dormitoryBuilding[0]`、`dormitoryBuilding[1]` 等索引格式
|
||||
- 需要调整为传递 `dormitoryBuilding: list<String>` 的数组格式
|
||||
- 其他所有下拉框都需要做同样的调整
|
||||
|
||||
**修复方案**:
|
||||
1. 在 `handleSearch` 方法中新增多选字段处理逻辑
|
||||
2. 定义所有多选下拉框字段列表：
|
||||
```javascript
|
||||
const multiSelectFields = [
|
||||
'gender', 'nationality', 'nativePlace', 'politicalStatus', 'educationLevel',
|
||||
'admissionCategory', 'academicLevel', 'trainingType', 'householdRegisterType',
|
||||
'studentStatus', 'isBoarder', 'dormitoryBuilding', 'familyEconomicStatus',
|
||||
'isPoorStudent', 'isMinority', 'isDisabled', 'isOrphan', 'isLeftBehindChild',
|
||||
'isSingleChild', 'isLowIncome', 'hasLoan', 'sourceRegion', 'bloodType',
|
||||
'disabilityType'
|
||||
];
|
||||
```
|
||||
|
||||
1. **学制字段改为输入框**
|
||||
- 将学制从下拉选择框改为文本输入框
|
||||
- 移除 `school_system` 字典数据依赖
|
||||
- 用户可以直接输入学制信息
|
||||
3. 统一处理多选字段：
|
||||
- 过滤掉空值，确保只传递有效的数组
|
||||
- 如果数组为空则删除该字段
|
||||
- 保持数组格式传递给后端
|
||||
|
||||
2. **新增学籍状态检索条件**
|
||||
- 在学籍信息部分新增"学籍状态"字段
|
||||
- 添加 `student_status` 字典数据，包含：在读、休学、退学、毕业、结业、肄业
|
||||
- 位置：学籍信息部分的最后一行
|
||||
**修复效果**:
|
||||
- ✅ 所有多选下拉框现在都传递正确的数组格式
|
||||
- ✅ 避免了 `dormitoryBuilding[0]`、`dormitoryBuilding[1]` 等索引格式问题
|
||||
- ✅ 后端可以正确接收 `dormitoryBuilding: list<String>` 格式的参数
|
||||
- ✅ 提高了代码的可维护性和一致性
|
||||
|
||||
3. **新增是否住校检索条件**
|
||||
- 在学籍信息部分新增"是否住校"字段
|
||||
- 使用现有的 `yes_no` 字典数据
|
||||
- 位置：学籍信息部分的最后一行
|
||||
**涉及的多选字段**:
|
||||
- 基础信息：性别、民族、籍贯、政治面貌、文化程度
|
||||
- 学籍信息：录取类别、学历层次、培养方式、户口类型、学籍状态、是否住校、宿舍楼栋
|
||||
- 家庭信息：家庭经济状况
|
||||
- 扩展信息：是否贫困生、是否少数民族、是否残疾、是否孤儿、是否留守儿童、是否独生子女、是否低保、是否有助学贷款、生源地区
|
||||
- 健康信息：血型、残疾类型
|
||||
|
||||
4. **新增宿舍楼栋检索条件**
|
||||
- 在学籍信息部分新增"宿舍楼栋"字段
|
||||
- 使用文本输入框，支持模糊检索
|
||||
- 位置：学籍信息部分的最后一行
|
||||
**测试建议**:
|
||||
1. 测试各个多选下拉框的选择功能
|
||||
2. 验证传递给后端的参数格式是否正确
|
||||
3. 确认后端能正确接收和处理数组格式的参数
|
||||
|
||||
5. **户口类型字段位置调整**
|
||||
- 将户口类型从学籍信息部分移动到基础信息部分
|
||||
- 位置：基础信息中户籍地址的前一行
|
||||
- 保持字段功能和字典数据不变
|
||||
|
||||
6. **修复重复字段问题**
|
||||
- 移除特殊标识部分重复的"是否住校"字段
|
||||
- 修复 `familyMembers` 字段类型错误（从string改为number）
|
||||
|
||||
7. **家庭收入字段优化**
|
||||
- 家庭年收入标签添加单位"(元)"
|
||||
- 人均收入标签添加单位"(元)"
|
||||
- 将两个字段的输入框从数字输入框改为普通文本输入框
|
||||
- 保持范围查询功能（最小值-最大值）
|
||||
- 数据类型从number数组改为string数组
|
||||
- 输入框宽度优化：从45%调整为40%，分隔符间距从5px调整为3px
|
||||
|
||||
#### 技术细节
|
||||
|
||||
- 新增字段在 `formData` 中正确定义
|
||||
- 字典数据 `student_status` 已添加到组件中
|
||||
- 表单布局保持一致性，每行4个字段
|
||||
- 所有新增字段都支持清空操作
|
||||
|
||||
#### 影响范围
|
||||
|
||||
- 学生花名册高级检索功能
|
||||
- 检索条件更加完善，支持按学籍状态、住宿情况进行筛选
|
||||
- 用户体验提升，检索条件更加直观
|
||||
|
||||
## 验证状态
|
||||
- [x] 代码语法检查通过
|
||||
- [x] 字段类型正确
|
||||
- [x] 字典数据完整
|
||||
- [x] 布局合理
|
||||
|
||||
## 备注
|
||||
本次修改提升了学生信息检索的灵活性和准确性，特别是针对学籍状态和住宿情况的检索需求。
|
||||
---
|
||||
**记录时间**: 2025-01-27 14:30:00
|
||||
**记录人**: wuzilong
|
||||
**变更类型**: 功能修复
|
||||
@@ -0,0 +1,165 @@
|
||||
# 学生花名册详情弹窗API调用修复记录
|
||||
|
||||
**修改时间**: 2025-07-17 16:30:00
|
||||
**修改人员**: AI Assistant
|
||||
**修改类型**: 功能修复
|
||||
|
||||
## 问题描述
|
||||
|
||||
学生花名册主界面(`web/src/views/xg/xsjcxx/stuRoster/index.vue`)中的学生详情弹窗(`StudentDetailDialog.vue`)没有调用API获取学生数据，导致详情弹窗显示空白。
|
||||
|
||||
## 问题分析
|
||||
|
||||
1. **组件导入错误**: StudentDetailDialog和AdvancedSearchDialog组件使用`<script setup>`语法，但没有默认导出，导致主页面导入失败
|
||||
2. **API缺失**: stuRoster的API文件中缺少获取学生个人信息的API方法
|
||||
3. **API调用错误**: StudentDetailDialog组件中直接使用request调用API，而不是使用统一的API模块
|
||||
|
||||
## 修复内容
|
||||
|
||||
### 1. 修复组件导出问题
|
||||
|
||||
**文件**: `web/src/views/xg/xsjcxx/stuRoster/components/AdvancedSearchDialog.vue`
|
||||
```typescript
|
||||
// 添加默认导出
|
||||
defineOptions({
|
||||
name: 'AdvancedSearchDialog'
|
||||
});
|
||||
```
|
||||
|
||||
**文件**: `web/src/views/xg/xsjcxx/stuRoster/components/StudentDetailDialog.vue`
|
||||
```typescript
|
||||
// 添加默认导出
|
||||
defineOptions({
|
||||
name: 'StudentDetailDialog'
|
||||
});
|
||||
```
|
||||
|
||||
### 2. 添加学生个人信息API
|
||||
|
||||
**文件**: `web/src/api/xg/xsjcxx/stuRoster/index.ts`
|
||||
```typescript
|
||||
/**
|
||||
* 获取学生个人信息
|
||||
* @param userId 用户ID，可为空，为空时使用当前登录用户ID
|
||||
*/
|
||||
export function getStudentPersonalInfo(userId?: number): AxiosPromise<any> {
|
||||
return request({
|
||||
url: '/studentMsg/studentMsg/personalInfo',
|
||||
method: 'get',
|
||||
params: { userId }
|
||||
});
|
||||
}
|
||||
|
||||
export default {
|
||||
XgDeptTreeSelect,
|
||||
deptTreeSelect,
|
||||
listStudentRoster,
|
||||
exportStudentRoster,
|
||||
getStudentPersonalInfo // 新增
|
||||
};
|
||||
```
|
||||
|
||||
### 3. 修复StudentDetailDialog组件API调用
|
||||
|
||||
**文件**: `web/src/views/xg/xsjcxx/stuRoster/components/StudentDetailDialog.vue`
|
||||
|
||||
#### 3.1 导入API模块
|
||||
```typescript
|
||||
import api from '@/api/xg/xsjcxx/stuRoster/index';
|
||||
```
|
||||
|
||||
#### 3.2 修改API调用方法
|
||||
```typescript
|
||||
/** 获取学生个人信息 */
|
||||
const getPersonalInfoData = async (studentId?: number) => {
|
||||
if (!studentId) {
|
||||
ElMessage.warning('学生ID不能为空');
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
loading.value = true;
|
||||
// 使用统一的API模块
|
||||
const response = await api.getStudentPersonalInfo(studentId);
|
||||
if (response.code === 200) {
|
||||
const data = response.data;
|
||||
// 将是否字段的数值转换为字符串
|
||||
const booleanFields = [
|
||||
'isPoorStudent',
|
||||
'isMinority',
|
||||
'isOrphan',
|
||||
'isLeftBehindChild',
|
||||
'isSingleChild',
|
||||
'isLowIncome',
|
||||
'hasLoan',
|
||||
'isDisabled',
|
||||
'isBoarder'
|
||||
];
|
||||
|
||||
booleanFields.forEach((field) => {
|
||||
if (data[field] !== undefined && data[field] !== null) {
|
||||
data[field] = String(data[field]);
|
||||
}
|
||||
});
|
||||
// 将API返回的数据映射到表单
|
||||
Object.assign(form, data);
|
||||
} else {
|
||||
ElMessage.error(response.msg || '获取个人信息失败');
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('获取个人信息失败:', error);
|
||||
ElMessage.error('获取个人信息失败，请稍后重试');
|
||||
} finally {
|
||||
loading.value = false;
|
||||
}
|
||||
};
|
||||
```
|
||||
|
||||
### 4. 修复主页面API响应处理
|
||||
|
||||
**文件**: `web/src/views/xg/xsjcxx/stuRoster/index.vue`
|
||||
```typescript
|
||||
// 修复API响应数据结构处理
|
||||
api
|
||||
.listStudentRoster(queryParams)
|
||||
.then((response: any) => {
|
||||
if (response.code === 200) {
|
||||
studentList.value = response.data.rows || [];
|
||||
total.value = response.data.total || 0;
|
||||
} else {
|
||||
ElMessage.error(response.msg || '查询失败');
|
||||
studentList.value = [];
|
||||
total.value = 0;
|
||||
}
|
||||
})
|
||||
```
|
||||
|
||||
## 修复效果
|
||||
|
||||
1. **组件导入正常**: StudentDetailDialog和AdvancedSearchDialog组件可以正常导入和使用
|
||||
2. **API调用成功**: 学生详情弹窗可以正确调用后端API获取学生个人信息
|
||||
3. **数据展示完整**: 详情弹窗可以显示学生的完整个人信息，包括基础信息、扩展信息、家庭信息、健康信息、学籍信息、银行卡信息等
|
||||
4. **错误处理完善**: 添加了完善的错误处理和用户提示
|
||||
|
||||
## 技术要点
|
||||
|
||||
1. **Vue 3 Composition API**: 使用`<script setup>`语法和`defineOptions`进行组件定义
|
||||
2. **API模块化**: 统一使用API模块进行接口调用，便于维护和管理
|
||||
3. **类型安全**: 使用TypeScript进行类型定义，提高代码质量
|
||||
4. **错误处理**: 完善的错误处理和用户友好的提示信息
|
||||
|
||||
## 测试验证
|
||||
|
||||
1. 打开学生花名册页面
|
||||
2. 点击学生列表中的"查看详情"按钮
|
||||
3. 验证详情弹窗是否正确显示学生个人信息
|
||||
4. 验证各个Tab页（基础信息、扩展信息、家庭信息、健康信息、学籍信息、银行卡信息）是否正常显示
|
||||
5. 验证API调用是否成功，网络请求是否正常
|
||||
|
||||
## 相关文件
|
||||
|
||||
- `web/src/views/xg/xsjcxx/stuRoster/index.vue` - 主页面
|
||||
- `web/src/views/xg/xsjcxx/stuRoster/components/StudentDetailDialog.vue` - 学生详情弹窗
|
||||
- `web/src/views/xg/xsjcxx/stuRoster/components/AdvancedSearchDialog.vue` - 高级搜索弹窗
|
||||
- `web/src/api/xg/xsjcxx/stuRoster/index.ts` - API接口定义
|
||||
- `web/src/api/xg/xsjcxx/stuRoster/types.ts` - 类型定义
|
||||
@@ -59,6 +59,11 @@ export interface SysRegionVO {
|
||||
*/
|
||||
deleted: number;
|
||||
|
||||
/**
|
||||
* 子节点列表（用于树形结构）
|
||||
*/
|
||||
children?: SysRegionVO[];
|
||||
|
||||
}
|
||||
|
||||
export interface SysRegionForm extends BaseEntity {
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
import request from '@/utils/request';
|
||||
import { AxiosPromise } from 'axios';
|
||||
import type { XgDeptTreeVO, R, TableDataInfo, XgStudentMsgAdvancedSearchQuery } from '@/api/xg/xsjcxx/stuRoster/types';
|
||||
|
||||
/**
|
||||
* 查询部门下拉树结构
|
||||
* @param deptId 部门ID
|
||||
*/
|
||||
export const XgDeptTreeSelect = (belongDeptId?: number): AxiosPromise<XgDeptTreeVO[]> => {
|
||||
return request({
|
||||
url: '/xgStudentManagerSource/studentManagerSource/currentUserAuthTree',
|
||||
method: 'get'
|
||||
});
|
||||
};
|
||||
|
||||
// 查询院系树结构
|
||||
export function deptTreeSelect(): AxiosPromise<R<any>> {
|
||||
return request({
|
||||
url: '/system/dept/treeselect',
|
||||
method: 'get'
|
||||
});
|
||||
}
|
||||
|
||||
// 查询学生花名册列表 - 使用高级搜索接口
|
||||
export function listStudentRoster(query?: XgStudentMsgAdvancedSearchQuery): AxiosPromise<R<TableDataInfo<any[]>>> {
|
||||
return request({
|
||||
url: '/studentMsg/studentMsg/advancedSearch',
|
||||
method: 'post',
|
||||
data: query
|
||||
});
|
||||
}
|
||||
|
||||
// 导出学生花名册
|
||||
export function exportStudentRoster(query?: any): AxiosPromise<any> {
|
||||
return request({
|
||||
url: '/studentMsg/studentMsg/export',
|
||||
method: 'get',
|
||||
params: query,
|
||||
responseType: 'blob'
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取学生个人信息
|
||||
* @param userId 用户ID，可为空，为空时使用当前登录用户ID
|
||||
*/
|
||||
export function getStudentPersonalInfo(userId?: number): AxiosPromise<any> {
|
||||
return request({
|
||||
url: '/studentMsg/studentMsg/personalInfo',
|
||||
method: 'get',
|
||||
params: { userId }
|
||||
});
|
||||
}
|
||||
|
||||
export default {
|
||||
XgDeptTreeSelect,
|
||||
deptTreeSelect,
|
||||
listStudentRoster,
|
||||
exportStudentRoster,
|
||||
getStudentPersonalInfo
|
||||
};
|
||||
@@ -0,0 +1,187 @@
|
||||
// 部门树节点类型
|
||||
export interface XgDeptTreeVO {
|
||||
id: number;
|
||||
label: string;
|
||||
children?: XgDeptTreeVO[];
|
||||
disabled?: boolean;
|
||||
}
|
||||
|
||||
// 通用响应类型
|
||||
export interface R<T = any> {
|
||||
code: number;
|
||||
msg: string;
|
||||
data: T;
|
||||
}
|
||||
|
||||
// 分页数据信息
|
||||
export interface TableDataInfo<T = any> {
|
||||
total: number;
|
||||
rows: T;
|
||||
}
|
||||
|
||||
// 学生花名册查询参数
|
||||
export interface StudentRosterQuery {
|
||||
pageNum?: number;
|
||||
pageSize?: number;
|
||||
studentNo?: string;
|
||||
name?: string;
|
||||
phone?: string;
|
||||
studentStatus?: string;
|
||||
deptIds?: number[];
|
||||
}
|
||||
|
||||
// 学生花名册数据
|
||||
export interface StudentRosterVO {
|
||||
studentId: number;
|
||||
studentNo: string;
|
||||
studentName: string;
|
||||
nickName?: string;
|
||||
sex: string;
|
||||
age?: number;
|
||||
phonenumber: string;
|
||||
email?: string;
|
||||
idCard: string;
|
||||
deptId: number;
|
||||
deptName: string;
|
||||
majorId?: number;
|
||||
majorName?: string;
|
||||
classId?: number;
|
||||
className?: string;
|
||||
address?: string;
|
||||
studentStatus: string;
|
||||
createTime: string;
|
||||
remark?: string;
|
||||
}
|
||||
|
||||
// 学生信息高级搜索查询参数
|
||||
export interface XgStudentMsgAdvancedSearchQuery {
|
||||
// 基础信息检索
|
||||
studentNo?: string;
|
||||
name?: string;
|
||||
idCard?: string;
|
||||
phone?: string;
|
||||
email?: string;
|
||||
gender?: string[];
|
||||
nationality?: string[];
|
||||
politicalStatus?: string[];
|
||||
birthDateStart?: string;
|
||||
birthDateEnd?: string;
|
||||
nameEnglish?: string;
|
||||
formerName?: string;
|
||||
nativePlace?: string[];
|
||||
hukouLocation?: string;
|
||||
homeAddress?: string;
|
||||
currentAddress?: string;
|
||||
qq?: string;
|
||||
wechat?: string;
|
||||
maritalStatus?: string[];
|
||||
religion?: string;
|
||||
householdRegisterType?: string[];
|
||||
educationLevel?: string[];
|
||||
|
||||
// 学籍信息检索
|
||||
studentStatus?: string[];
|
||||
enrollmentYearStart?: number;
|
||||
enrollmentYearEnd?: number;
|
||||
enrollmentDateStart?: string;
|
||||
enrollmentDateEnd?: string;
|
||||
admissionCategory?: string[];
|
||||
|
||||
// 学院专业班级检索
|
||||
collegeName?: string;
|
||||
majorName?: string;
|
||||
className?: string;
|
||||
grade?: string[];
|
||||
gradeMin?: string;
|
||||
gradeMax?: string;
|
||||
counselorName?: string;
|
||||
classTeacherName?: string;
|
||||
|
||||
// 家庭信息检索
|
||||
fatherName?: string;
|
||||
motherName?: string;
|
||||
guardianName?: string;
|
||||
familyIncomeMin?: number;
|
||||
familyIncomeMax?: number;
|
||||
perCapitaIncomeMin?: number;
|
||||
perCapitaIncomeMax?: number;
|
||||
familyEconomicStatus?: string[];
|
||||
familyMembersMin?: number;
|
||||
familyMembersMax?: number;
|
||||
|
||||
// 特殊身份检索
|
||||
isPoorStudent?: string[];
|
||||
isMinority?: string[];
|
||||
isDisabled?: string[];
|
||||
isOrphan?: string[];
|
||||
isLeftBehindChild?: string[];
|
||||
isSingleChild?: string[];
|
||||
isLowIncome?: string[];
|
||||
hasLoan?: string[];
|
||||
loanAmountMin?: number;
|
||||
loanAmountMax?: number;
|
||||
|
||||
// 身体状况检索
|
||||
heightMin?: number;
|
||||
heightMax?: number;
|
||||
weightMin?: number;
|
||||
weightMax?: number;
|
||||
bloodType?: string[];
|
||||
healthStatus?: string;
|
||||
disabilityType?: string[];
|
||||
disabilityLevel?: string;
|
||||
|
||||
// 住宿信息检索
|
||||
isBoarder?: string[];
|
||||
dormitoryBuilding?: string[];
|
||||
dormitoryRoom?: string;
|
||||
|
||||
// 家庭详细信息检索
|
||||
fatherPhone?: string;
|
||||
fatherWorkUnit?: string;
|
||||
motherPhone?: string;
|
||||
motherWorkUnit?: string;
|
||||
guardianPhone?: string;
|
||||
guardianRelation?: string;
|
||||
incomeSource?: string;
|
||||
emergencyContactName?: string;
|
||||
emergencyContactPhone?: string;
|
||||
emergencyContactRelation?: string;
|
||||
|
||||
// 扩展信息检索
|
||||
specialties?: string;
|
||||
awards?: string;
|
||||
violations?: string;
|
||||
socialActivities?: string;
|
||||
|
||||
// 健康详细信息检索
|
||||
specialCondition?: string;
|
||||
medicalHistory?: string;
|
||||
allergies?: string;
|
||||
|
||||
// 其他信息检索
|
||||
sourceRegion?: string[];
|
||||
graduateSchool?: string;
|
||||
trainingType?: string[];
|
||||
academicLevel?: string[];
|
||||
schoolSystemMin?: number;
|
||||
schoolSystemMax?: number;
|
||||
infoStatus?: string;
|
||||
dataSource?: string;
|
||||
isComplete?: number;
|
||||
completionRateMin?: number;
|
||||
completionRateMax?: number;
|
||||
|
||||
// 时间范围检索
|
||||
createTimeStart?: string;
|
||||
createTimeEnd?: string;
|
||||
updateTimeStart?: string;
|
||||
updateTimeEnd?: string;
|
||||
|
||||
// 部门树节点
|
||||
deptIds?: number[];
|
||||
|
||||
// 分页参数
|
||||
pageNum?: number;
|
||||
pageSize?: number;
|
||||
}
|
||||
@@ -39,7 +39,7 @@
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="性别" prop="gender">
|
||||
<el-select v-model="formData.gender" placeholder="请选择性别" clearable>
|
||||
<el-select v-model="formData.gender" placeholder="请选择性别" clearable multiple collapse-tags collapse-tags-tooltip>
|
||||
<el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
@@ -65,11 +65,30 @@
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="籍贯" prop="nativePlace">
|
||||
<el-input v-model="formData.nativePlace" placeholder="请输入籍贯" clearable />
|
||||
<el-tree-select
|
||||
v-model="formData.nativePlace"
|
||||
placeholder="请选择籍贯"
|
||||
clearable
|
||||
filterable
|
||||
multiple
|
||||
collapse-tags
|
||||
collapse-tags-tooltip
|
||||
default-expand-all
|
||||
:data="regionOptions"
|
||||
:props="{
|
||||
children: 'children',
|
||||
label: 'name',
|
||||
disabled: 'disabled',
|
||||
value: 'id'
|
||||
}"
|
||||
check-strictly
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="6">
|
||||
<el-form-item label="政治面貌" prop="politicalStatus">
|
||||
<el-select v-model="formData.politicalStatus" placeholder="请选择政治面貌" clearable multiple collapse-tags collapse-tags-tooltip>
|
||||
@@ -77,8 +96,6 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="6">
|
||||
<el-form-item label="户口类型" prop="householdRegisterType">
|
||||
<el-select v-model="formData.householdRegisterType" placeholder="请选择户口类型" clearable multiple collapse-tags collapse-tags-tooltip>
|
||||
@@ -86,11 +103,30 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="生源地区" prop="sourceRegion">
|
||||
<el-input v-model="formData.sourceRegion" placeholder="请输入生源地区" clearable />
|
||||
<el-tree-select
|
||||
v-model="formData.sourceRegion"
|
||||
placeholder="请选择生源地区"
|
||||
clearable
|
||||
filterable
|
||||
multiple
|
||||
collapse-tags
|
||||
collapse-tags-tooltip
|
||||
default-expand-all
|
||||
:data="regionOptions"
|
||||
:props="{
|
||||
children: 'children',
|
||||
label: 'name',
|
||||
disabled: 'disabled',
|
||||
value: 'id'
|
||||
}"
|
||||
check-strictly
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="6">
|
||||
<el-form-item label="宗教信仰" prop="religion">
|
||||
<el-input v-model="formData.religion" placeholder="请输入宗教信仰" clearable />
|
||||
@@ -103,6 +139,13 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="婚姻状况" prop="maritalStatus">
|
||||
<el-select v-model="formData.maritalStatus" placeholder="请选择婚姻状况" clearable multiple collapse-tags collapse-tags-tooltip>
|
||||
<el-option v-for="dict in marital_status" :key="dict.value" :label="dict.label" :value="dict.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="6">
|
||||
@@ -120,13 +163,6 @@
|
||||
<el-input v-model="formData.wechat" placeholder="请输入微信号" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="婚姻状况" prop="maritalStatus">
|
||||
<el-select v-model="formData.maritalStatus" placeholder="请选择婚姻状况" clearable multiple collapse-tags collapse-tags-tooltip>
|
||||
<el-option v-for="dict in marital_status" :key="dict.value" :label="dict.label" :value="dict.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<!-- 移动到最后：户籍所在地、家庭地址、现住址，每个占一行 -->
|
||||
<el-row :gutter="20">
|
||||
@@ -155,11 +191,13 @@
|
||||
<el-divider content-position="left">学籍信息</el-divider>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="6">
|
||||
<el-form-item label="入学年份" prop="enrollmentYear">
|
||||
<el-input v-model="formData.enrollmentYear" placeholder="请输入入学年份" clearable />
|
||||
<el-form-item label="入学年份" prop="enrollmentYearRange">
|
||||
<el-input v-model="formData.enrollmentYearRange[0]" placeholder="最小值" style="width: 45%" />
|
||||
<span style="margin: 0 3px">-</span>
|
||||
<el-input v-model="formData.enrollmentYearRange[1]" placeholder="最大值" style="width: 45%" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="入学日期" prop="enrollmentDateRange">
|
||||
<el-date-picker
|
||||
v-model="formData.enrollmentDateRange"
|
||||
@@ -178,13 +216,15 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="学制(年)" prop="schoolSystem">
|
||||
<el-input v-model="formData.schoolSystem" placeholder="请输入学制" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="6">
|
||||
<el-form-item label="学制(年)" prop="schoolSystemRange">
|
||||
<el-input v-model="formData.schoolSystemRange[0]" placeholder="最小值" style="width: 45%" />
|
||||
<span style="margin: 0 3px">-</span>
|
||||
<el-input v-model="formData.schoolSystemRange[1]" placeholder="最大值" style="width: 45%" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="学历层次" prop="academicLevel">
|
||||
<el-select v-model="formData.academicLevel" placeholder="请选择学历层次" clearable multiple collapse-tags collapse-tags-tooltip>
|
||||
@@ -201,16 +241,18 @@
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="年级" prop="grade">
|
||||
<el-input v-model="formData.grade" placeholder="请输入年级" clearable />
|
||||
<el-input v-model="formData.grade[0]" placeholder="最小值" style="width: 45%" />
|
||||
<span style="margin: 0 3px">-</span>
|
||||
<el-input v-model="formData.grade[1]" placeholder="最大值" style="width: 45%" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="6">
|
||||
<el-form-item label="毕业院校" prop="graduateSchool">
|
||||
<el-input v-model="formData.graduateSchool" placeholder="请输入毕业院校" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="6">
|
||||
<el-form-item label="学籍状态" prop="studentStatus">
|
||||
<el-select v-model="formData.studentStatus" placeholder="请选择学籍状态" clearable multiple collapse-tags collapse-tags-tooltip>
|
||||
@@ -227,7 +269,24 @@
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="宿舍楼栋" prop="dormitoryBuilding">
|
||||
<el-input v-model="formData.dormitoryBuilding" placeholder="请输入宿舍楼栋" clearable />
|
||||
<el-tree-select
|
||||
v-model="formData.dormitoryBuilding"
|
||||
placeholder="请选择宿舍楼栋"
|
||||
clearable
|
||||
filterable
|
||||
multiple
|
||||
collapse-tags
|
||||
collapse-tags-tooltip
|
||||
default-expand-all
|
||||
:data="dormBuildingOptions"
|
||||
:props="{
|
||||
children: 'children',
|
||||
label: 'label',
|
||||
disabled: 'disabled',
|
||||
value: 'id'
|
||||
}"
|
||||
check-strictly
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -320,8 +379,10 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="家庭成员数量" prop="familyMembers">
|
||||
<el-input-number v-model="formData.familyMembers" placeholder="请输入家庭成员数量" :min="1" :max="20" />
|
||||
<el-form-item label="家庭成员数量" prop="familyMembersRange">
|
||||
<el-input v-model="formData.familyMembersRange[0]" placeholder="最小值" style="width: 45%" />
|
||||
<span style="margin: 0 3px">-</span>
|
||||
<el-input v-model="formData.familyMembersRange[1]" placeholder="最大值" style="width: 45%" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
@@ -543,7 +604,9 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, reactive, watch, computed, getCurrentInstance, toRefs } from 'vue';
|
||||
import { ref, reactive, watch, computed, getCurrentInstance, toRefs, onMounted } from 'vue';
|
||||
import ElMessage from 'element-plus/es/components/message/index';
|
||||
import request from '@/utils/request';
|
||||
|
||||
// 获取当前组件实例
|
||||
const { proxy } = getCurrentInstance() as any;
|
||||
@@ -563,7 +626,8 @@ const {
|
||||
sys_yesno,
|
||||
xg_blood_type,
|
||||
disability_type,
|
||||
wenhuachengdu
|
||||
wenhuachengdu,
|
||||
xg_native_place
|
||||
} = toRefs<any>(
|
||||
proxy?.useDict(
|
||||
'sys_user_sex',
|
||||
@@ -579,10 +643,17 @@ const {
|
||||
'sys_yesno',
|
||||
'xg_blood_type',
|
||||
'disability_type',
|
||||
'wenhuachengdu'
|
||||
'wenhuachengdu',
|
||||
'xg_native_place'
|
||||
)
|
||||
);
|
||||
|
||||
// 行政区划选项
|
||||
const regionOptions = ref<any[]>([]);
|
||||
|
||||
// 宿舍楼栋选项
|
||||
const dormBuildingOptions = ref<any[]>([]);
|
||||
|
||||
// Props
|
||||
interface Props {
|
||||
visible: boolean;
|
||||
@@ -612,10 +683,10 @@ const formData = reactive({
|
||||
idCard: '',
|
||||
nameEnglish: '',
|
||||
formerName: '',
|
||||
gender: '',
|
||||
gender: [] as string[],
|
||||
birthDateRange: [] as string[],
|
||||
nationality: [] as string[],
|
||||
nativePlace: '',
|
||||
nativePlace: [] as string[],
|
||||
politicalStatus: [] as string[],
|
||||
hukouLocation: '',
|
||||
homeAddress: '',
|
||||
@@ -630,17 +701,17 @@ const formData = reactive({
|
||||
educationLevel: [] as string[],
|
||||
|
||||
// 学籍信息
|
||||
enrollmentYear: '',
|
||||
enrollmentYearRange: [] as string[],
|
||||
enrollmentDateRange: [] as string[],
|
||||
admissionCategory: [] as string[],
|
||||
schoolSystem: '',
|
||||
schoolSystemRange: [] as string[],
|
||||
academicLevel: [] as string[],
|
||||
trainingType: [] as string[],
|
||||
grade: '',
|
||||
grade: [] as string[],
|
||||
householdRegisterType: [] as string[],
|
||||
studentStatus: [] as string[],
|
||||
isBoarder: [] as string[],
|
||||
dormitoryBuilding: '',
|
||||
dormitoryBuilding: [] as string[],
|
||||
|
||||
// 家庭信息
|
||||
fatherName: '',
|
||||
@@ -656,7 +727,7 @@ const formData = reactive({
|
||||
perCapitaIncomeRange: [] as string[],
|
||||
incomeSource: '',
|
||||
familyEconomicStatus: [] as string[],
|
||||
familyMembers: null as number | null,
|
||||
familyMembersRange: [] as string[],
|
||||
emergencyContactName: '',
|
||||
emergencyContactPhone: '',
|
||||
emergencyContactRelation: '',
|
||||
@@ -670,13 +741,13 @@ const formData = reactive({
|
||||
isSingleChild: [] as string[],
|
||||
isLowIncome: [] as string[],
|
||||
hasLoan: [] as string[],
|
||||
loanAmountRange: [] as number[],
|
||||
loanAmountRange: [] as string[],
|
||||
religion: '',
|
||||
sourceRegion: '',
|
||||
sourceRegion: [] as string[],
|
||||
|
||||
// 健康信息
|
||||
heightRange: [] as number[],
|
||||
weightRange: [] as number[],
|
||||
heightRange: [] as string[],
|
||||
weightRange: [] as string[],
|
||||
bloodType: [] as string[],
|
||||
healthStatus: '',
|
||||
specialCondition: '',
|
||||
@@ -695,8 +766,6 @@ const formData = reactive({
|
||||
updateTimeRange: [] as string[]
|
||||
});
|
||||
|
||||
|
||||
|
||||
// 方法
|
||||
const handleClose = () => {
|
||||
dialogVisible.value = false;
|
||||
@@ -720,7 +789,7 @@ const handleSearch = () => {
|
||||
// 构建查询参数
|
||||
const searchParams: any = { ...formData };
|
||||
|
||||
// 处理数组类型的参数
|
||||
// 处理日期范围参数
|
||||
if (searchParams.birthDateRange && searchParams.birthDateRange.length === 2) {
|
||||
searchParams.birthDateStart = searchParams.birthDateRange[0];
|
||||
searchParams.birthDateEnd = searchParams.birthDateRange[1];
|
||||
@@ -745,10 +814,219 @@ const handleSearch = () => {
|
||||
}
|
||||
delete searchParams.updateTimeRange;
|
||||
|
||||
// 处理数值范围参数
|
||||
if (searchParams.enrollmentYearRange && searchParams.enrollmentYearRange.length === 2) {
|
||||
searchParams.enrollmentYearStart = searchParams.enrollmentYearRange[0];
|
||||
searchParams.enrollmentYearEnd = searchParams.enrollmentYearRange[1];
|
||||
} else if (searchParams.enrollmentYearRange && searchParams.enrollmentYearRange.length === 1) {
|
||||
if (searchParams.enrollmentYearRange[0]) {
|
||||
searchParams.enrollmentYearStart = searchParams.enrollmentYearRange[0];
|
||||
}
|
||||
if (searchParams.enrollmentYearRange[1]) {
|
||||
searchParams.enrollmentYearEnd = searchParams.enrollmentYearRange[1];
|
||||
}
|
||||
}
|
||||
delete searchParams.enrollmentYearRange;
|
||||
|
||||
if (searchParams.schoolSystemRange && searchParams.schoolSystemRange.length === 2) {
|
||||
searchParams.schoolSystemMin = searchParams.schoolSystemRange[0];
|
||||
searchParams.schoolSystemMax = searchParams.schoolSystemRange[1];
|
||||
} else if (searchParams.schoolSystemRange && searchParams.schoolSystemRange.length === 1) {
|
||||
if (searchParams.schoolSystemRange[0]) {
|
||||
searchParams.schoolSystemMin = searchParams.schoolSystemRange[0];
|
||||
}
|
||||
if (searchParams.schoolSystemRange[1]) {
|
||||
searchParams.schoolSystemMax = searchParams.schoolSystemRange[1];
|
||||
}
|
||||
}
|
||||
delete searchParams.schoolSystemRange;
|
||||
|
||||
if (searchParams.grade && searchParams.grade.length === 2) {
|
||||
searchParams.gradeMin = searchParams.grade[0];
|
||||
searchParams.gradeMax = searchParams.grade[1];
|
||||
} else if (searchParams.grade && searchParams.grade.length === 1) {
|
||||
if (searchParams.grade[0]) {
|
||||
searchParams.gradeMin = searchParams.grade[0];
|
||||
}
|
||||
if (searchParams.grade[1]) {
|
||||
searchParams.gradeMax = searchParams.grade[1];
|
||||
}
|
||||
}
|
||||
delete searchParams.grade;
|
||||
|
||||
if (searchParams.familyIncomeRange && searchParams.familyIncomeRange.length === 2) {
|
||||
searchParams.familyIncomeMin = searchParams.familyIncomeRange[0];
|
||||
searchParams.familyIncomeMax = searchParams.familyIncomeRange[1];
|
||||
} else if (searchParams.familyIncomeRange && searchParams.familyIncomeRange.length === 1) {
|
||||
if (searchParams.familyIncomeRange[0]) {
|
||||
searchParams.familyIncomeMin = searchParams.familyIncomeRange[0];
|
||||
}
|
||||
if (searchParams.familyIncomeRange[1]) {
|
||||
searchParams.familyIncomeMax = searchParams.familyIncomeRange[1];
|
||||
}
|
||||
}
|
||||
delete searchParams.familyIncomeRange;
|
||||
|
||||
if (searchParams.perCapitaIncomeRange && searchParams.perCapitaIncomeRange.length === 2) {
|
||||
searchParams.perCapitaIncomeMin = searchParams.perCapitaIncomeRange[0];
|
||||
searchParams.perCapitaIncomeMax = searchParams.perCapitaIncomeRange[1];
|
||||
} else if (searchParams.perCapitaIncomeRange && searchParams.perCapitaIncomeRange.length === 1) {
|
||||
if (searchParams.perCapitaIncomeRange[0]) {
|
||||
searchParams.perCapitaIncomeMin = searchParams.perCapitaIncomeRange[0];
|
||||
}
|
||||
if (searchParams.perCapitaIncomeRange[1]) {
|
||||
searchParams.perCapitaIncomeMax = searchParams.perCapitaIncomeRange[1];
|
||||
}
|
||||
}
|
||||
delete searchParams.perCapitaIncomeRange;
|
||||
|
||||
if (searchParams.familyMembersRange && searchParams.familyMembersRange.length === 2) {
|
||||
searchParams.familyMembersMin = searchParams.familyMembersRange[0];
|
||||
searchParams.familyMembersMax = searchParams.familyMembersRange[1];
|
||||
} else if (searchParams.familyMembersRange && searchParams.familyMembersRange.length === 1) {
|
||||
if (searchParams.familyMembersRange[0]) {
|
||||
searchParams.familyMembersMin = searchParams.familyMembersRange[0];
|
||||
}
|
||||
if (searchParams.familyMembersRange[1]) {
|
||||
searchParams.familyMembersMax = searchParams.familyMembersRange[1];
|
||||
}
|
||||
}
|
||||
delete searchParams.familyMembersRange;
|
||||
|
||||
if (searchParams.loanAmountRange && searchParams.loanAmountRange.length === 2) {
|
||||
searchParams.loanAmountMin = searchParams.loanAmountRange[0];
|
||||
searchParams.loanAmountMax = searchParams.loanAmountRange[1];
|
||||
} else if (searchParams.loanAmountRange && searchParams.loanAmountRange.length === 1) {
|
||||
if (searchParams.loanAmountRange[0]) {
|
||||
searchParams.loanAmountMin = searchParams.loanAmountRange[0];
|
||||
}
|
||||
if (searchParams.loanAmountRange[1]) {
|
||||
searchParams.loanAmountMax = searchParams.loanAmountRange[1];
|
||||
}
|
||||
}
|
||||
delete searchParams.loanAmountRange;
|
||||
|
||||
if (searchParams.heightRange && searchParams.heightRange.length === 2) {
|
||||
searchParams.heightMin = searchParams.heightRange[0];
|
||||
searchParams.heightMax = searchParams.heightRange[1];
|
||||
} else if (searchParams.heightRange && searchParams.heightRange.length === 1) {
|
||||
if (searchParams.heightRange[0]) {
|
||||
searchParams.heightMin = searchParams.heightRange[0];
|
||||
}
|
||||
if (searchParams.heightRange[1]) {
|
||||
searchParams.heightMax = searchParams.heightRange[1];
|
||||
}
|
||||
}
|
||||
delete searchParams.heightRange;
|
||||
|
||||
if (searchParams.weightRange && searchParams.weightRange.length === 2) {
|
||||
searchParams.weightMin = searchParams.weightRange[0];
|
||||
searchParams.weightMax = searchParams.weightRange[1];
|
||||
} else if (searchParams.weightRange && searchParams.weightRange.length === 1) {
|
||||
if (searchParams.weightRange[0]) {
|
||||
searchParams.weightMin = searchParams.weightRange[0];
|
||||
}
|
||||
if (searchParams.weightRange[1]) {
|
||||
searchParams.weightMax = searchParams.weightRange[1];
|
||||
}
|
||||
}
|
||||
delete searchParams.weightRange;
|
||||
|
||||
// 处理多选下拉框参数 - 确保传递数组格式而不是索引格式
|
||||
// 基础信息多选字段
|
||||
const multiSelectFields = [
|
||||
'gender',
|
||||
'nationality',
|
||||
'nativePlace',
|
||||
'politicalStatus',
|
||||
'maritalStatus',
|
||||
'educationLevel',
|
||||
'admissionCategory',
|
||||
'academicLevel',
|
||||
'trainingType',
|
||||
'householdRegisterType',
|
||||
'studentStatus',
|
||||
'grade',
|
||||
'isBoarder',
|
||||
'dormitoryBuilding',
|
||||
'familyEconomicStatus',
|
||||
'isPoorStudent',
|
||||
'isMinority',
|
||||
'isDisabled',
|
||||
'isOrphan',
|
||||
'isLeftBehindChild',
|
||||
'isSingleChild',
|
||||
'isLowIncome',
|
||||
'hasLoan',
|
||||
'sourceRegion',
|
||||
'bloodType',
|
||||
'disabilityType'
|
||||
];
|
||||
|
||||
multiSelectFields.forEach((field) => {
|
||||
if (searchParams[field] && Array.isArray(searchParams[field])) {
|
||||
// 过滤掉空值，确保只传递有效的数组
|
||||
const filteredArray = searchParams[field].filter((item) => item !== null && item !== undefined && item !== '');
|
||||
if (filteredArray.length > 0) {
|
||||
searchParams[field] = filteredArray;
|
||||
} else {
|
||||
delete searchParams[field];
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
console.log(searchParams);
|
||||
emit('search', searchParams);
|
||||
handleClose();
|
||||
};
|
||||
|
||||
// 获取行政区划树形数据
|
||||
const getRegionTree = async () => {
|
||||
try {
|
||||
const res = await request.get('/system/SysRegion/tree');
|
||||
if (res && res.data) {
|
||||
regionOptions.value = res.data;
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('获取行政区划数据失败:', error);
|
||||
ElMessage.error('获取行政区划数据失败');
|
||||
}
|
||||
};
|
||||
|
||||
// 获取宿舍楼栋树形数据
|
||||
const getDormBuildingTree = async () => {
|
||||
try {
|
||||
const res = await request.get('/xgss/dormBuildingTree/list');
|
||||
if (res && res.data) {
|
||||
// 处理数据，为楼栋名称添加性别标识
|
||||
const processTreeData = (nodes: any[]): any[] => {
|
||||
return nodes.map((node) => {
|
||||
const processedNode = { ...node };
|
||||
|
||||
// 如果是楼栋类型，添加性别标识
|
||||
if (node.type === 'building' && node.buildingType) {
|
||||
const genderPrefix = node.buildingType === '1' ? '（男）' : node.buildingType === '2' ? '（女）' : '';
|
||||
processedNode.label = genderPrefix + node.label;
|
||||
processedNode.name = genderPrefix + node.label; // 使用label作为name
|
||||
}
|
||||
|
||||
// 递归处理子节点
|
||||
if (node.children && node.children.length > 0) {
|
||||
processedNode.children = processTreeData(node.children);
|
||||
}
|
||||
|
||||
return processedNode;
|
||||
});
|
||||
};
|
||||
|
||||
dormBuildingOptions.value = processTreeData(res.data);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('获取宿舍楼栋数据失败:', error);
|
||||
ElMessage.error('获取宿舍楼栋数据失败');
|
||||
}
|
||||
};
|
||||
|
||||
// 监听props变化，同步表单数据
|
||||
watch(
|
||||
() => props.queryParams,
|
||||
@@ -768,6 +1046,17 @@ watch(
|
||||
},
|
||||
{ deep: true, immediate: true }
|
||||
);
|
||||
|
||||
// 组件挂载时获取数据
|
||||
onMounted(() => {
|
||||
getRegionTree();
|
||||
getDormBuildingTree();
|
||||
});
|
||||
|
||||
// 添加默认导出
|
||||
defineOptions({
|
||||
name: 'AdvancedSearchDialog'
|
||||
});
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
@@ -0,0 +1,891 @@
|
||||
<template>
|
||||
<el-dialog v-model="dialogVisible" :title="dialogTitle" width="1100px" append-to-body @close="handleClose">
|
||||
<el-tabs
|
||||
v-model="activeTab"
|
||||
type="border-card"
|
||||
v-loading="dialogLoading"
|
||||
element-loading-text="正在加载数据，请稍候..."
|
||||
element-loading-background="rgba(0, 0, 0, 0.3)"
|
||||
>
|
||||
<!-- 基础信息Tab -->
|
||||
<el-tab-pane label="基础信息" name="basic">
|
||||
<el-form ref="studentFormRef" :model="form" label-width="100px">
|
||||
<!-- 学生照片和基本信息布局 -->
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="16">
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="学号" prop="studentNo">
|
||||
<el-input v-model="form.studentNo" placeholder="请输入学号" maxlength="32" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="身份证号" prop="idCard">
|
||||
<el-input v-model="form.idCard" placeholder="请输入身份证号" maxlength="18" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="姓名" prop="name">
|
||||
<el-input v-model="form.name" placeholder="请输入姓名" maxlength="50" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="英文姓名" prop="nameEnglish">
|
||||
<el-input v-model="form.nameEnglish" placeholder="请输入英文姓名" maxlength="100" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="曾用名" prop="formerName">
|
||||
<el-input v-model="form.formerName" placeholder="请输入曾用名" maxlength="50" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="性别" prop="gender">
|
||||
<el-select v-model="form.gender" placeholder="请选择性别" disabled>
|
||||
<el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="出生日期" prop="birthDate">
|
||||
<el-date-picker
|
||||
v-model="form.birthDate"
|
||||
type="date"
|
||||
placeholder="请选择出生日期"
|
||||
value-format="YYYY-MM-DD"
|
||||
disabled
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="民族" prop="nationality">
|
||||
<el-input v-model="form.nationality" placeholder="请输入民族" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="籍贯" prop="nativePlace">
|
||||
<el-input v-model="form.nativePlace" placeholder="请输入籍贯" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="政治面貌" prop="politicalStatus">
|
||||
<el-input v-model="form.politicalStatus" placeholder="请输入政治面貌" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="手机号码" prop="phone">
|
||||
<el-input v-model="form.phone" placeholder="请输入手机号码" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="电子邮箱" prop="email">
|
||||
<el-input v-model="form.email" placeholder="请输入电子邮箱" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="QQ号码" prop="qq">
|
||||
<el-input v-model="form.qq" placeholder="请输入QQ号码" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="微信号" prop="wechat">
|
||||
<el-input v-model="form.wechat" placeholder="请输入微信号" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="婚姻状况" prop="maritalStatus">
|
||||
<el-select v-model="form.maritalStatus" placeholder="请选择婚姻状况" disabled>
|
||||
<el-option v-for="dict in marital_status" :key="dict.value" :label="dict.label" :value="dict.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="宗教信仰" prop="religion">
|
||||
<el-input v-model="form.religion" placeholder="请输入宗教信仰" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item prop="photoUrl">
|
||||
<template #label>
|
||||
<div class="photo-label-container">
|
||||
<span>学生照片</span>
|
||||
</div>
|
||||
</template>
|
||||
<div class="photo-container">
|
||||
<el-avatar :size="120" :src="form.photoUrl || '/src/assets/images/profile.jpg'" />
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<!-- 地址信息 -->
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="户籍所在地" prop="hukouLocation">
|
||||
<el-input v-model="form.hukouLocation" type="textarea" :rows="2" placeholder="请输入户籍所在地" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="家庭地址" prop="homeAddress">
|
||||
<el-input v-model="form.homeAddress" type="textarea" :rows="2" placeholder="请输入家庭地址" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="现住址" prop="currentAddress">
|
||||
<el-input v-model="form.currentAddress" type="textarea" :rows="2" placeholder="请输入现住址" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="6">
|
||||
<el-form-item label="邮政编码" prop="postalCode">
|
||||
<el-input v-model="form.postalCode" placeholder="请输入邮政编码" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="生源地区" prop="sourceRegion">
|
||||
<el-input v-model="form.sourceRegion" placeholder="请输入生源地区" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="毕业院校" prop="graduateSchool">
|
||||
<el-input v-model="form.graduateSchool" placeholder="请输入毕业院校" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="户口类型" prop="householdRegisterType">
|
||||
<el-input v-model="form.householdRegisterType" placeholder="请输入户口类型" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</el-tab-pane>
|
||||
|
||||
<!-- 学籍信息Tab -->
|
||||
<el-tab-pane label="学籍信息" name="academic">
|
||||
<el-form ref="academicFormRef" :model="form" label-width="120px">
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="学籍状态" prop="studentStatus">
|
||||
<el-tag :type="getStatusType(form.studentStatus)">
|
||||
{{ getStudentStatusLabel(form.studentStatus) }}
|
||||
</el-tag>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="入学年份" prop="enrollmentYear">
|
||||
<el-input v-model="form.enrollmentYear" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="入学日期" prop="enrollmentDate">
|
||||
<el-date-picker
|
||||
v-model="form.enrollmentDate"
|
||||
type="date"
|
||||
placeholder="请选择入学日期"
|
||||
value-format="YYYY-MM-DD"
|
||||
disabled
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="录取类别" prop="admissionCategory">
|
||||
<el-input v-model="form.admissionCategory" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="学制" prop="schoolSystem">
|
||||
<el-input v-model="form.schoolSystem" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="学历层次" prop="academicLevel">
|
||||
<el-input v-model="form.academicLevel" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="培养方式" prop="trainingType">
|
||||
<el-input v-model="form.trainingType" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="年级" prop="grade">
|
||||
<el-input v-model="form.grade" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="是否住校" prop="isBoarder">
|
||||
<el-tag :type="form.isBoarder === '1' ? 'success' : 'info'">
|
||||
{{ form.isBoarder === '1' ? '是' : '否' }}
|
||||
</el-tag>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="学院" prop="collegeName">
|
||||
<el-input v-model="form.collegeName" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="专业" prop="majorName">
|
||||
<el-input v-model="form.majorName" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="班级" prop="className">
|
||||
<el-input v-model="form.className" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="辅导员" prop="counselorName">
|
||||
<el-input v-model="form.counselorName" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="班主任" prop="classTeacherName">
|
||||
<el-input v-model="form.classTeacherName" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="宿舍楼栋" prop="dormitoryBuilding">
|
||||
<el-input v-model="form.dormitoryBuilding" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="宿舍房间号" prop="dormitoryRoom">
|
||||
<el-input v-model="form.dormitoryRoom" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="银行卡号" prop="bankCardNo">
|
||||
<el-input v-model="form.bankCardNo" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="开户银行" prop="bankName">
|
||||
<el-input v-model="form.bankName" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</el-tab-pane>
|
||||
|
||||
<!-- 家庭信息Tab -->
|
||||
<el-tab-pane label="家庭信息" name="family">
|
||||
<el-form ref="familyFormRef" :model="form" label-width="120px">
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="父亲姓名" prop="fatherName">
|
||||
<el-input v-model="form.fatherName" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="父亲电话" prop="fatherPhone">
|
||||
<el-input v-model="form.fatherPhone" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="父亲工作单位" prop="fatherWorkUnit">
|
||||
<el-input v-model="form.fatherWorkUnit" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="母亲姓名" prop="motherName">
|
||||
<el-input v-model="form.motherName" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="母亲电话" prop="motherPhone">
|
||||
<el-input v-model="form.motherPhone" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="母亲工作单位" prop="motherWorkUnit">
|
||||
<el-input v-model="form.motherWorkUnit" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="监护人姓名" prop="guardianName">
|
||||
<el-input v-model="form.guardianName" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="监护人电话" prop="guardianPhone">
|
||||
<el-input v-model="form.guardianPhone" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="监护人关系" prop="guardianRelation">
|
||||
<el-input v-model="form.guardianRelation" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="家庭年收入" prop="familyIncome">
|
||||
<el-input v-model="form.familyIncome" disabled>
|
||||
<template #append>元</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="人均收入" prop="perCapitaIncome">
|
||||
<el-input v-model="form.perCapitaIncome" disabled>
|
||||
<template #append>元</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="收入来源" prop="incomeSource">
|
||||
<el-input v-model="form.incomeSource" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="家庭经济状况" prop="familyEconomicStatus">
|
||||
<el-input v-model="form.familyEconomicStatus" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="家庭成员数量" prop="familyMembers">
|
||||
<el-input v-model="form.familyMembers" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="紧急联系人" prop="emergencyContactName">
|
||||
<el-input v-model="form.emergencyContactName" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="紧急联系人电话" prop="emergencyContactPhone">
|
||||
<el-input v-model="form.emergencyContactPhone" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="紧急联系人关系" prop="emergencyContactRelation">
|
||||
<el-input v-model="form.emergencyContactRelation" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</el-tab-pane>
|
||||
|
||||
<!-- 特殊标识Tab -->
|
||||
<el-tab-pane label="特殊标识" name="special">
|
||||
<el-form ref="specialFormRef" :model="form" label-width="120px">
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="6">
|
||||
<el-form-item label="是否贫困生" prop="isPoorStudent">
|
||||
<el-tag :type="form.isPoorStudent === '1' ? 'warning' : 'info'">
|
||||
{{ form.isPoorStudent === '1' ? '是' : '否' }}
|
||||
</el-tag>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="是否少数民族" prop="isMinority">
|
||||
<el-tag :type="form.isMinority === '1' ? 'success' : 'info'">
|
||||
{{ form.isMinority === '1' ? '是' : '否' }}
|
||||
</el-tag>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="是否残疾" prop="isDisabled">
|
||||
<el-tag :type="form.isDisabled === '1' ? 'danger' : 'info'">
|
||||
{{ form.isDisabled === '1' ? '是' : '否' }}
|
||||
</el-tag>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="是否孤儿" prop="isOrphan">
|
||||
<el-tag :type="form.isOrphan === '1' ? 'danger' : 'info'">
|
||||
{{ form.isOrphan === '1' ? '是' : '否' }}
|
||||
</el-tag>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="6">
|
||||
<el-form-item label="是否留守儿童" prop="isLeftBehindChild">
|
||||
<el-tag :type="form.isLeftBehindChild === '1' ? 'warning' : 'info'">
|
||||
{{ form.isLeftBehindChild === '1' ? '是' : '否' }}
|
||||
</el-tag>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="是否独生子女" prop="isSingleChild">
|
||||
<el-tag :type="form.isSingleChild === '1' ? 'success' : 'info'">
|
||||
{{ form.isSingleChild === '1' ? '是' : '否' }}
|
||||
</el-tag>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="是否低保" prop="isLowIncome">
|
||||
<el-tag :type="form.isLowIncome === '1' ? 'warning' : 'info'">
|
||||
{{ form.isLowIncome === '1' ? '是' : '否' }}
|
||||
</el-tag>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="是否有助学贷款" prop="hasLoan">
|
||||
<el-tag :type="form.hasLoan === '1' ? 'warning' : 'info'">
|
||||
{{ form.hasLoan === '1' ? '是' : '否' }}
|
||||
</el-tag>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="助学贷款金额" prop="loanAmount">
|
||||
<el-input v-model="form.loanAmount" disabled>
|
||||
<template #append>元</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="残疾类型" prop="disabilityType">
|
||||
<el-input v-model="form.disabilityType" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="残疾等级" prop="disabilityLevel">
|
||||
<el-input v-model="form.disabilityLevel" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</el-tab-pane>
|
||||
|
||||
<!-- 健康信息Tab -->
|
||||
<el-tab-pane label="健康信息" name="health">
|
||||
<el-form ref="healthFormRef" :model="form" label-width="120px">
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="身高" prop="height">
|
||||
<el-input v-model="form.height" disabled>
|
||||
<template #append>cm</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="体重" prop="weight">
|
||||
<el-input v-model="form.weight" disabled>
|
||||
<template #append>kg</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="血型" prop="bloodType">
|
||||
<el-input v-model="form.bloodType" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="健康状况" prop="healthStatus">
|
||||
<el-input v-model="form.healthStatus" type="textarea" :rows="3" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="特殊体质或疾病" prop="specialCondition">
|
||||
<el-input v-model="form.specialCondition" type="textarea" :rows="3" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="病史" prop="medicalHistory">
|
||||
<el-input v-model="form.medicalHistory" type="textarea" :rows="3" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="过敏史" prop="allergies">
|
||||
<el-input v-model="form.allergies" type="textarea" :rows="3" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="特长爱好" prop="specialties">
|
||||
<el-input v-model="form.specialties" type="textarea" :rows="3" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="获奖情况" prop="awards">
|
||||
<el-input v-model="form.awards" type="textarea" :rows="3" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="违纪记录" prop="violations">
|
||||
<el-input v-model="form.violations" type="textarea" :rows="3" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="社会活动" prop="socialActivities">
|
||||
<el-input v-model="form.socialActivities" type="textarea" :rows="3" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
|
||||
<template #footer>
|
||||
<div class="dialog-footer">
|
||||
<el-button @click="handleClose">关闭</el-button>
|
||||
</div>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, reactive, computed, watch, onMounted } from 'vue';
|
||||
|
||||
// Props
|
||||
interface Props {
|
||||
visible: boolean;
|
||||
studentId: number | null;
|
||||
}
|
||||
|
||||
const props = withDefaults(defineProps<Props>(), {
|
||||
visible: false,
|
||||
studentId: null
|
||||
});
|
||||
|
||||
// Emits
|
||||
const emit = defineEmits<{
|
||||
'update:visible': [value: boolean];
|
||||
}>();
|
||||
|
||||
// 响应式数据
|
||||
const dialogVisible = computed({
|
||||
get: () => props.visible,
|
||||
set: (value) => emit('update:visible', value)
|
||||
});
|
||||
|
||||
const dialogTitle = ref('学生详情');
|
||||
const activeTab = ref('basic');
|
||||
const dialogLoading = ref(false);
|
||||
|
||||
// 表单数据
|
||||
const form = reactive({
|
||||
// 基础信息
|
||||
id: null as number | null,
|
||||
studentNo: '',
|
||||
idCard: '',
|
||||
name: '',
|
||||
nameEnglish: '',
|
||||
formerName: '',
|
||||
gender: '',
|
||||
birthDate: '',
|
||||
nationality: '',
|
||||
nativePlace: '',
|
||||
politicalStatus: '',
|
||||
hukouLocation: '',
|
||||
homeAddress: '',
|
||||
currentAddress: '',
|
||||
postalCode: '',
|
||||
photoUrl: '',
|
||||
phone: '',
|
||||
email: '',
|
||||
qq: '',
|
||||
wechat: '',
|
||||
maritalStatus: '',
|
||||
religion: '',
|
||||
sourceRegion: '',
|
||||
graduateSchool: '',
|
||||
householdRegisterType: '',
|
||||
|
||||
// 学籍信息
|
||||
studentStatus: '',
|
||||
enrollmentYear: '',
|
||||
enrollmentDate: '',
|
||||
admissionCategory: '',
|
||||
schoolSystem: '',
|
||||
academicLevel: '',
|
||||
trainingType: '',
|
||||
grade: '',
|
||||
isBoarder: '',
|
||||
collegeName: '',
|
||||
majorName: '',
|
||||
className: '',
|
||||
counselorName: '',
|
||||
classTeacherName: '',
|
||||
dormitoryBuilding: '',
|
||||
dormitoryRoom: '',
|
||||
bankCardNo: '',
|
||||
bankName: '',
|
||||
|
||||
// 家庭信息
|
||||
fatherName: '',
|
||||
fatherPhone: '',
|
||||
fatherWorkUnit: '',
|
||||
motherName: '',
|
||||
motherPhone: '',
|
||||
motherWorkUnit: '',
|
||||
guardianName: '',
|
||||
guardianPhone: '',
|
||||
guardianRelation: '',
|
||||
familyIncome: '',
|
||||
perCapitaIncome: '',
|
||||
incomeSource: '',
|
||||
familyEconomicStatus: '',
|
||||
familyMembers: '',
|
||||
emergencyContactName: '',
|
||||
emergencyContactPhone: '',
|
||||
emergencyContactRelation: '',
|
||||
|
||||
// 特殊标识
|
||||
isPoorStudent: '',
|
||||
isMinority: '',
|
||||
isDisabled: '',
|
||||
isOrphan: '',
|
||||
isLeftBehindChild: '',
|
||||
isSingleChild: '',
|
||||
isLowIncome: '',
|
||||
hasLoan: '',
|
||||
loanAmount: '',
|
||||
disabilityType: '',
|
||||
disabilityLevel: '',
|
||||
|
||||
// 健康信息
|
||||
height: '',
|
||||
weight: '',
|
||||
bloodType: '',
|
||||
healthStatus: '',
|
||||
specialCondition: '',
|
||||
medicalHistory: '',
|
||||
allergies: '',
|
||||
specialties: '',
|
||||
awards: '',
|
||||
violations: '',
|
||||
socialActivities: ''
|
||||
});
|
||||
|
||||
// 字典数据
|
||||
const sys_user_sex = ref([
|
||||
{ value: '0', label: '男' },
|
||||
{ value: '1', label: '女' }
|
||||
]);
|
||||
|
||||
const marital_status = ref([
|
||||
{ value: '1', label: '未婚' },
|
||||
{ value: '2', label: '已婚' },
|
||||
{ value: '3', label: '离异' },
|
||||
{ value: '4', label: '丧偶' }
|
||||
]);
|
||||
|
||||
// 模拟数据
|
||||
const mockStudentData = {
|
||||
id: 1,
|
||||
studentNo: '2021001',
|
||||
idCard: '110101200001011234',
|
||||
name: '张三',
|
||||
nameEnglish: 'Zhang San',
|
||||
formerName: '',
|
||||
gender: '0',
|
||||
birthDate: '2000-01-01',
|
||||
nationality: '汉族',
|
||||
nativePlace: '北京市',
|
||||
politicalStatus: '共青团员',
|
||||
hukouLocation: '北京市朝阳区',
|
||||
homeAddress: '北京市朝阳区某某街道某某小区',
|
||||
currentAddress: '北京市海淀区某某大学宿舍',
|
||||
postalCode: '100000',
|
||||
photoUrl: '',
|
||||
phone: '13800138001',
|
||||
email: 'zhangsan@example.com',
|
||||
qq: '123456789',
|
||||
wechat: 'zhangsan123',
|
||||
maritalStatus: '1',
|
||||
religion: '',
|
||||
sourceRegion: '北京市',
|
||||
graduateSchool: '北京市第一中学',
|
||||
householdRegisterType: '非农业',
|
||||
|
||||
// 学籍信息
|
||||
studentStatus: '1',
|
||||
enrollmentYear: '2021',
|
||||
enrollmentDate: '2021-09-01',
|
||||
admissionCategory: '统招',
|
||||
schoolSystem: '4',
|
||||
academicLevel: '本科',
|
||||
trainingType: '全日制',
|
||||
grade: '2021',
|
||||
isBoarder: '1',
|
||||
collegeName: '计算机学院',
|
||||
majorName: '软件工程',
|
||||
className: '软件2101班',
|
||||
counselorName: '李老师',
|
||||
classTeacherName: '王老师',
|
||||
dormitoryBuilding: '1号楼',
|
||||
dormitoryRoom: '101',
|
||||
bankCardNo: '6222021234567890123',
|
||||
bankName: '中国工商银行',
|
||||
|
||||
// 家庭信息
|
||||
fatherName: '张父',
|
||||
fatherPhone: '13900139001',
|
||||
fatherWorkUnit: '某某公司',
|
||||
motherName: '张母',
|
||||
motherPhone: '13900139002',
|
||||
motherWorkUnit: '某某单位',
|
||||
guardianName: '张父',
|
||||
guardianPhone: '13900139001',
|
||||
guardianRelation: '父亲',
|
||||
familyIncome: '120000',
|
||||
perCapitaIncome: '40000',
|
||||
incomeSource: '工资收入',
|
||||
familyEconomicStatus: '一般',
|
||||
familyMembers: '3',
|
||||
emergencyContactName: '张父',
|
||||
emergencyContactPhone: '13900139001',
|
||||
emergencyContactRelation: '父亲',
|
||||
|
||||
// 特殊标识
|
||||
isPoorStudent: '0',
|
||||
isMinority: '0',
|
||||
isDisabled: '0',
|
||||
isOrphan: '0',
|
||||
isLeftBehindChild: '0',
|
||||
isSingleChild: '1',
|
||||
isLowIncome: '0',
|
||||
hasLoan: '0',
|
||||
loanAmount: '0',
|
||||
disabilityType: '',
|
||||
disabilityLevel: '',
|
||||
|
||||
// 健康信息
|
||||
height: '175',
|
||||
weight: '65',
|
||||
bloodType: 'A型',
|
||||
healthStatus: '良好',
|
||||
specialCondition: '',
|
||||
medicalHistory: '',
|
||||
allergies: '',
|
||||
specialties: '篮球、编程',
|
||||
awards: '校级优秀学生',
|
||||
violations: '',
|
||||
socialActivities: '学生会成员、志愿者'
|
||||
};
|
||||
|
||||
// 方法
|
||||
const handleClose = () => {
|
||||
dialogVisible.value = false;
|
||||
};
|
||||
|
||||
const getStatusType = (status: string) => {
|
||||
const statusMap: Record<string, string> = {
|
||||
'1': 'success',
|
||||
'2': 'warning',
|
||||
'3': 'info',
|
||||
'4': 'danger',
|
||||
'5': 'info'
|
||||
};
|
||||
return statusMap[status] || 'info';
|
||||
};
|
||||
|
||||
const getStudentStatusLabel = (status: string) => {
|
||||
const statusMap: Record<string, string> = {
|
||||
'1': '在籍',
|
||||
'2': '休学',
|
||||
'3': '复学',
|
||||
'4': '退学',
|
||||
'5': '毕业'
|
||||
};
|
||||
return statusMap[status] || '未知';
|
||||
};
|
||||
|
||||
const loadStudentData = async (studentId: number) => {
|
||||
dialogLoading.value = true;
|
||||
try {
|
||||
// 模拟API调用
|
||||
await new Promise(resolve => setTimeout(resolve, 500));
|
||||
|
||||
// 使用模拟数据
|
||||
Object.assign(form, mockStudentData);
|
||||
|
||||
} catch (error) {
|
||||
console.error('加载学生数据失败:', error);
|
||||
} finally {
|
||||
dialogLoading.value = false;
|
||||
}
|
||||
};
|
||||
|
||||
// 监听studentId变化
|
||||
watch(() => props.studentId, (newId) => {
|
||||
if (newId && dialogVisible.value) {
|
||||
loadStudentData(newId);
|
||||
}
|
||||
});
|
||||
|
||||
// 监听弹窗显示状态
|
||||
watch(() => props.visible, (visible) => {
|
||||
if (visible && props.studentId) {
|
||||
loadStudentData(props.studentId);
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.photo-label-container {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.photo-container {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
height: 120px;
|
||||
border: 1px dashed #d9d9d9;
|
||||
border-radius: 6px;
|
||||
background-color: #fafafa;
|
||||
}
|
||||
|
||||
.dialog-footer {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.el-tag {
|
||||
margin-right: 8px;
|
||||
}
|
||||
</style>
|
||||
File diff suppressed because it is too large.
Load diff
@@ -52,7 +52,7 @@
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="状态" prop="studentStatus">
|
||||
<el-select v-model="queryParams.studentStatus" placeholder="学生状态" clearable>
|
||||
<el-select v-model="queryParams.studentStatus" placeholder="学生状态" multiple clearable collapse-tags collapse-tags-tooltip>
|
||||
<el-option v-for="dict in student_status" :key="dict.value" :label="dict.label" :value="dict.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
@@ -225,10 +225,12 @@
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, reactive, toRefs, watchEffect, onMounted, computed } from 'vue';
|
||||
import { ElMessage, ElMessageBox } from 'element-plus';
|
||||
import ElMessage from 'element-plus/es/components/message/index';
|
||||
import ElMessageBox from 'element-plus/es/components/message-box/index';
|
||||
import { Search, Refresh, Setting, Download, List, Grid, View } from '@element-plus/icons-vue';
|
||||
import AdvancedSearchDialog from './components/AdvancedSearchDialog.vue';
|
||||
import StudentDetailDialog from './components/StudentDetailDialog.vue';
|
||||
import api from '@/api/xg/xsjcxx/stuRoster/index';
|
||||
|
||||
// 响应式数据
|
||||
const loading = ref(false);
|
||||
@@ -260,7 +262,7 @@ const queryParams = reactive({
|
||||
studentNo: '',
|
||||
name: '',
|
||||
phone: '',
|
||||
studentStatus: '',
|
||||
studentStatus: [] as string[],
|
||||
deptIds: [] as number[]
|
||||
});
|
||||
|
||||
@@ -306,7 +308,7 @@ const advancedQueryParams = reactive({
|
||||
perCapitaIncomeRange: [] as number[],
|
||||
incomeSource: '',
|
||||
familyEconomicStatus: '',
|
||||
familyMembers: '',
|
||||
familyMembersRange: [] as number[],
|
||||
|
||||
// 特殊标识
|
||||
isPoorStudent: '',
|
||||
@@ -365,341 +367,7 @@ const student_status = ref([
|
||||
]);
|
||||
|
||||
// 部门树数据
|
||||
const deptOptions = ref([
|
||||
{
|
||||
id: 1,
|
||||
label: '计算机科学与技术学院',
|
||||
children: [
|
||||
{
|
||||
id: 11,
|
||||
label: '软件工程系',
|
||||
children: [
|
||||
{
|
||||
id: 111,
|
||||
label: '软件开发教研室',
|
||||
children: [
|
||||
{ id: 1111, label: 'Java开发团队' },
|
||||
{ id: 1112, label: 'Python开发团队' },
|
||||
{ id: 1113, label: '前端开发团队' },
|
||||
{ id: 1114, label: '移动端开发团队' }
|
||||
]
|
||||
},
|
||||
{
|
||||
id: 112,
|
||||
label: '软件测试教研室',
|
||||
children: [
|
||||
{ id: 1121, label: '自动化测试团队' },
|
||||
{ id: 1122, label: '性能测试团队' },
|
||||
{ id: 1123, label: '安全测试团队' }
|
||||
]
|
||||
},
|
||||
{
|
||||
id: 113,
|
||||
label: '软件架构教研室',
|
||||
children: [
|
||||
{ id: 1131, label: '系统架构团队' },
|
||||
{ id: 1132, label: '微服务团队' },
|
||||
{ id: 1133, label: '云原生团队' }
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
id: 12,
|
||||
label: '计算机科学与技术系',
|
||||
children: [
|
||||
{
|
||||
id: 121,
|
||||
label: '算法与数据结构教研室',
|
||||
children: [
|
||||
{ id: 1211, label: '算法优化团队' },
|
||||
{ id: 1212, label: '数据结构研究团队' },
|
||||
{ id: 1213, label: '算法竞赛指导团队' }
|
||||
]
|
||||
},
|
||||
{
|
||||
id: 122,
|
||||
label: '人工智能教研室',
|
||||
children: [
|
||||
{ id: 1221, label: '机器学习团队' },
|
||||
{ id: 1222, label: '深度学习团队' },
|
||||
{ id: 1223, label: '自然语言处理团队' },
|
||||
{ id: 1224, label: '计算机视觉团队' }
|
||||
]
|
||||
},
|
||||
{
|
||||
id: 123,
|
||||
label: '系统软件教研室',
|
||||
children: [
|
||||
{ id: 1231, label: '操作系统团队' },
|
||||
{ id: 1232, label: '编译原理团队' },
|
||||
{ id: 1233, label: '数据库系统团队' }
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
id: 13,
|
||||
label: '网络工程系',
|
||||
children: [
|
||||
{
|
||||
id: 131,
|
||||
label: '网络通信教研室',
|
||||
children: [
|
||||
{ id: 1311, label: '网络协议研究团队' },
|
||||
{ id: 1312, label: '网络安全团队' },
|
||||
{ id: 1313, label: '网络优化团队' }
|
||||
]
|
||||
},
|
||||
{
|
||||
id: 132,
|
||||
label: '信息安全教研室',
|
||||
children: [
|
||||
{ id: 1321, label: '密码学团队' },
|
||||
{ id: 1322, label: '网络安全防护团队' },
|
||||
{ id: 1323, label: '安全审计团队' },
|
||||
{ id: 1324, label: '应急响应团队' }
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
id: 2,
|
||||
label: '经济管理学院',
|
||||
children: [
|
||||
{
|
||||
id: 21,
|
||||
label: '工商管理系',
|
||||
children: [
|
||||
{
|
||||
id: 211,
|
||||
label: '企业管理教研室',
|
||||
children: [
|
||||
{ id: 2111, label: '战略管理团队' },
|
||||
{ id: 2112, label: '组织行为团队' },
|
||||
{ id: 2113, label: '人力资源管理团队' }
|
||||
]
|
||||
},
|
||||
{
|
||||
id: 212,
|
||||
label: '市场营销教研室',
|
||||
children: [
|
||||
{ id: 2121, label: '市场调研团队' },
|
||||
{ id: 2122, label: '品牌管理团队' },
|
||||
{ id: 2123, label: '数字营销团队' },
|
||||
{ id: 2124, label: '消费者行为研究团队' }
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
id: 22,
|
||||
label: '会计系',
|
||||
children: [
|
||||
{
|
||||
id: 221,
|
||||
label: '财务会计教研室',
|
||||
children: [
|
||||
{ id: 2211, label: '财务报表分析团队' },
|
||||
{ id: 2212, label: '成本会计团队' },
|
||||
{ id: 2213, label: '税务会计团队' }
|
||||
]
|
||||
},
|
||||
{
|
||||
id: 222,
|
||||
label: '审计教研室',
|
||||
children: [
|
||||
{ id: 2221, label: '内部审计团队' },
|
||||
{ id: 2222, label: '外部审计团队' },
|
||||
{ id: 2223, label: '信息系统审计团队' }
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
id: 23,
|
||||
label: '金融系',
|
||||
children: [
|
||||
{
|
||||
id: 231,
|
||||
label: '投资学教研室',
|
||||
children: [
|
||||
{ id: 2311, label: '证券投资团队' },
|
||||
{ id: 2312, label: '期货期权团队' },
|
||||
{ id: 2313, label: '量化投资团队' }
|
||||
]
|
||||
},
|
||||
{
|
||||
id: 232,
|
||||
label: '银行学教研室',
|
||||
children: [
|
||||
{ id: 2321, label: '商业银行团队' },
|
||||
{ id: 2322, label: '中央银行团队' },
|
||||
{ id: 2323, label: '国际金融团队' },
|
||||
{ id: 2324, label: '金融风险管理团队' }
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
id: 3,
|
||||
label: '机械工程学院',
|
||||
children: [
|
||||
{
|
||||
id: 31,
|
||||
label: '机械设计系',
|
||||
children: [
|
||||
{
|
||||
id: 311,
|
||||
label: '机械设计教研室',
|
||||
children: [
|
||||
{ id: 3111, label: '机械零件设计团队' },
|
||||
{ id: 3112, label: '机械传动设计团队' },
|
||||
{ id: 3113, label: '机械结构优化团队' }
|
||||
]
|
||||
},
|
||||
{
|
||||
id: 312,
|
||||
label: '机械制造教研室',
|
||||
children: [
|
||||
{ id: 3121, label: '精密制造团队' },
|
||||
{ id: 3122, label: '数控加工团队' },
|
||||
{ id: 3123, label: '3D打印技术团队' }
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
id: 32,
|
||||
label: '自动化系',
|
||||
children: [
|
||||
{
|
||||
id: 321,
|
||||
label: '控制理论教研室',
|
||||
children: [
|
||||
{ id: 3211, label: '自动控制团队' },
|
||||
{ id: 3212, label: '智能控制团队' },
|
||||
{ id: 3213, label: '机器人控制团队' }
|
||||
]
|
||||
},
|
||||
{
|
||||
id: 322,
|
||||
label: '电气工程教研室',
|
||||
children: [
|
||||
{ id: 3221, label: '电力系统团队' },
|
||||
{ id: 3222, label: '电机与电器团队' },
|
||||
{ id: 3223, label: '电力电子团队' },
|
||||
{ id: 3224, label: '新能源技术团队' }
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
id: 4,
|
||||
label: '外国语学院',
|
||||
children: [
|
||||
{
|
||||
id: 41,
|
||||
label: '英语系',
|
||||
children: [
|
||||
{
|
||||
id: 411,
|
||||
label: '英语语言文学教研室',
|
||||
children: [
|
||||
{ id: 4111, label: '英美文学团队' },
|
||||
{ id: 4112, label: '语言学团队' },
|
||||
{ id: 4113, label: '翻译理论与实践团队' }
|
||||
]
|
||||
},
|
||||
{
|
||||
id: 412,
|
||||
label: '商务英语教研室',
|
||||
children: [
|
||||
{ id: 4121, label: '国际贸易英语团队' },
|
||||
{ id: 4122, label: '商务沟通团队' },
|
||||
{ id: 4123, label: '跨文化交际团队' }
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
id: 42,
|
||||
label: '日语系',
|
||||
children: [
|
||||
{
|
||||
id: 421,
|
||||
label: '日语语言文学教研室',
|
||||
children: [
|
||||
{ id: 4211, label: '日本文学团队' },
|
||||
{ id: 4212, label: '日语语言学团队' },
|
||||
{ id: 4213, label: '日汉翻译团队' }
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
id: 5,
|
||||
label: '艺术学院',
|
||||
children: [
|
||||
{
|
||||
id: 51,
|
||||
label: '视觉传达设计系',
|
||||
children: [
|
||||
{
|
||||
id: 511,
|
||||
label: '平面设计教研室',
|
||||
children: [
|
||||
{ id: 5111, label: '品牌设计团队' },
|
||||
{ id: 5112, label: '包装设计团队' },
|
||||
{ id: 5113, label: '广告设计团队' }
|
||||
]
|
||||
},
|
||||
{
|
||||
id: 512,
|
||||
label: '数字媒体教研室',
|
||||
children: [
|
||||
{ id: 5121, label: 'UI设计团队' },
|
||||
{ id: 5122, label: '交互设计团队' },
|
||||
{ id: 5123, label: '动画设计团队' }
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
id: 52,
|
||||
label: '环境设计系',
|
||||
children: [
|
||||
{
|
||||
id: 521,
|
||||
label: '室内设计教研室',
|
||||
children: [
|
||||
{ id: 5211, label: '居住空间设计团队' },
|
||||
{ id: 5212, label: '商业空间设计团队' },
|
||||
{ id: 5213, label: '展示设计团队' }
|
||||
]
|
||||
},
|
||||
{
|
||||
id: 522,
|
||||
label: '景观设计教研室',
|
||||
children: [
|
||||
{ id: 5221, label: '园林景观团队' },
|
||||
{ id: 5222, label: '城市景观团队' },
|
||||
{ id: 5223, label: '生态景观团队' }
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
]);
|
||||
const deptOptions = ref([]);
|
||||
|
||||
// 表格列配置
|
||||
const columns = ref([
|
||||
@@ -714,69 +382,32 @@ const columns = ref([
|
||||
{ key: 8, label: '创建时间', visible: true }
|
||||
]);
|
||||
|
||||
// 模拟数据 - 生成更多数据用于测试分页
|
||||
const generateMockData = () => {
|
||||
const data = [];
|
||||
const colleges = ['计算机学院', '经济管理学院', '机械工程学院', '外国语学院', '艺术学院'];
|
||||
const majors = {
|
||||
'计算机学院': ['软件工程', '计算机科学与技术', '网络工程', '信息安全'],
|
||||
'经济管理学院': ['工商管理', '会计学', '金融学', '市场营销'],
|
||||
'机械工程学院': ['机械设计', '机械制造', '自动化', '工业设计'],
|
||||
'外国语学院': ['英语', '日语', '法语', '德语'],
|
||||
'艺术学院': ['视觉传达', '环境设计', '产品设计', '动画']
|
||||
};
|
||||
const statuses = ['1', '2', '3', '4', '5'];
|
||||
|
||||
for (let i = 1; i <= 50; i++) {
|
||||
const college = colleges[Math.floor(Math.random() * colleges.length)];
|
||||
const majorList = majors[college];
|
||||
const major = majorList[Math.floor(Math.random() * majorList.length)];
|
||||
const status = statuses[Math.floor(Math.random() * statuses.length)];
|
||||
|
||||
data.push({
|
||||
id: i,
|
||||
studentNo: `2021${String(i).padStart(3, '0')}`,
|
||||
name: `学生${i}`,
|
||||
collegeName: college,
|
||||
majorName: major,
|
||||
className: `${major}210${Math.floor(i / 10) + 1}班`,
|
||||
phone: `13800138${String(i).padStart(3, '0')}`,
|
||||
studentStatus: status,
|
||||
enrollmentYear: '2021',
|
||||
createTime: '2021-09-01 10:00:00',
|
||||
photoUrl: ''
|
||||
});
|
||||
}
|
||||
return data;
|
||||
};
|
||||
|
||||
const allMockData = generateMockData();
|
||||
|
||||
// 方法
|
||||
const getList = () => {
|
||||
console.log('入参数：', queryParams);
|
||||
loading.value = true;
|
||||
// 模拟API调用
|
||||
setTimeout(() => {
|
||||
// 实现分页逻辑
|
||||
const startIndex = (queryParams.pageNum - 1) * queryParams.pageSize;
|
||||
const endIndex = startIndex + queryParams.pageSize;
|
||||
|
||||
// 根据查询条件过滤数据
|
||||
let filteredData = allMockData.filter((item) => {
|
||||
const matchStudentNo = !queryParams.studentNo || item.studentNo.includes(queryParams.studentNo);
|
||||
const matchName = !queryParams.name || item.name.includes(queryParams.name);
|
||||
const matchPhone = !queryParams.phone || item.phone.includes(queryParams.phone);
|
||||
const matchStatus = !queryParams.studentStatus || item.studentStatus === queryParams.studentStatus;
|
||||
const matchDept = queryParams.deptIds.length === 0 || queryParams.deptIds.includes((item.id % 5) + 1); // 模拟部门ID
|
||||
|
||||
return matchStudentNo && matchName && matchPhone && matchStatus && matchDept;
|
||||
// 使用真实的API调用
|
||||
api
|
||||
.listStudentRoster(queryParams)
|
||||
.then((response: any) => {
|
||||
if (response.code === 200) {
|
||||
studentList.value = response.rows || [];
|
||||
total.value = response.total || 0;
|
||||
} else {
|
||||
ElMessage.error(response.msg || '查询失败');
|
||||
studentList.value = [];
|
||||
total.value = 0;
|
||||
}
|
||||
})
|
||||
.catch((error) => {
|
||||
console.error('查询学生花名册失败:', error);
|
||||
ElMessage.error('查询失败，请重试');
|
||||
studentList.value = [];
|
||||
total.value = 0;
|
||||
})
|
||||
.finally(() => {
|
||||
loading.value = false;
|
||||
});
|
||||
|
||||
// 分页切片
|
||||
studentList.value = filteredData.slice(startIndex, endIndex);
|
||||
total.value = filteredData.length;
|
||||
loading.value = false;
|
||||
}, 500);
|
||||
};
|
||||
|
||||
const handleQuery = () => {
|
||||
@@ -788,7 +419,7 @@ const resetQuery = () => {
|
||||
queryParams.studentNo = '';
|
||||
queryParams.name = '';
|
||||
queryParams.phone = '';
|
||||
queryParams.studentStatus = '';
|
||||
queryParams.studentStatus = [];
|
||||
queryParams.deptIds = [];
|
||||
selectedDepts.value = [];
|
||||
handleQuery();
|
||||
@@ -812,7 +443,23 @@ const handleAdvancedReset = () => {
|
||||
};
|
||||
|
||||
const handleExport = () => {
|
||||
ElMessage.success('导出功能待实现');
|
||||
// 使用真实的导出API
|
||||
api
|
||||
.exportStudentRoster(queryParams)
|
||||
.then((response) => {
|
||||
const blob = new Blob([response.data], { type: 'application/vnd.ms-excel' });
|
||||
const url = window.URL.createObjectURL(blob);
|
||||
const link = document.createElement('a');
|
||||
link.href = url;
|
||||
link.download = '学生花名册.xlsx';
|
||||
link.click();
|
||||
window.URL.revokeObjectURL(url);
|
||||
ElMessage.success('导出成功');
|
||||
})
|
||||
.catch((error) => {
|
||||
console.error('导出失败:', error);
|
||||
ElMessage.error('导出失败，请重试');
|
||||
});
|
||||
};
|
||||
|
||||
const switchViewMode = (mode: 'table' | 'card') => {
|
||||
@@ -873,8 +520,35 @@ watchEffect(() => {
|
||||
}
|
||||
});
|
||||
|
||||
/** 查询部门下拉树结构 */
|
||||
const getDeptTree = async () => {
|
||||
try {
|
||||
const res = await api.XgDeptTreeSelect(101);
|
||||
// XgDeptTreeSelect返回的数据结构与deptTreeSelect不同，需要进行适当处理
|
||||
if (res.data && Array.isArray(res.data)) {
|
||||
deptOptions.value = res.data;
|
||||
} else {
|
||||
console.warn('部门树数据格式不符合预期');
|
||||
// 回退到默认处理
|
||||
const backup = await api.deptTreeSelect();
|
||||
deptOptions.value = backup.data.data;
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('获取部门树失败:', error);
|
||||
// 如果API调用失败，可以使用默认的deptTreeSelect作为备选
|
||||
try {
|
||||
const backup = await api.deptTreeSelect();
|
||||
deptOptions.value = backup.data.data;
|
||||
} catch (backupError) {
|
||||
console.error('备选API也失败:', backupError);
|
||||
ElMessage.error('获取部门树失败，请重试');
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// 生命周期
|
||||
onMounted(() => {
|
||||
getDeptTree(); // 先加载部门树
|
||||
getList();
|
||||
});
|
||||
</script>
|
||||
@@ -889,6 +563,24 @@ onMounted(() => {
|
||||
.left-panel {
|
||||
width: 320px; /* 增加宽度以适应四层树结构 */
|
||||
flex-shrink: 0;
|
||||
height: calc(100vh - 120px); /* 与layout-container高度保持一致 */
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.left-panel .el-card {
|
||||
height: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.left-panel .el-card__body {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
overflow: hidden;
|
||||
padding-top: 12px; /* 减少顶部内边距 */
|
||||
padding-bottom: 20px; /* 增加底部内边距，为按钮留出空间 */
|
||||
}
|
||||
|
||||
.right-panel {
|
||||
@@ -899,10 +591,12 @@ onMounted(() => {
|
||||
}
|
||||
|
||||
.dept-tree {
|
||||
height: 400px;
|
||||
height: calc(100vh - 280px); /* 距离视窗底部100px，进一步减少高度 */
|
||||
overflow-y: auto;
|
||||
overflow-x: auto;
|
||||
min-width: 300px; /* 增加最小宽度以适应四层树结构 */
|
||||
flex: 1;
|
||||
margin-bottom: 0; /* 移除底部边距，使用padding来控制间距 */
|
||||
}
|
||||
|
||||
/* 部门树滚动条样式 */
|
||||
@@ -956,6 +650,8 @@ onMounted(() => {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 8px 0 !important; /* 减少头部内边距 */
|
||||
margin-bottom: 6px; /* 减少与搜索框的间距 */
|
||||
}
|
||||
|
||||
.search-btn-container {
|
||||
|
||||
Reference in new issue
Block a user