Commit 085d8779 authored by wujipeng's avatar wujipeng
Browse files

账号导入导出优化

parent 1b41cf3f
...@@ -18,6 +18,45 @@ public class AccountImportRowDTO { ...@@ -18,6 +18,45 @@ public class AccountImportRowDTO {
private String phoneNumber; private String phoneNumber;
/**
* 以下字段仅用于学员花名册导入。教师和管理员仍使用原有的精简模板,
* 因此这些字段在非学员导入结果中保持为空,避免改变既有页面的数据口径。
*/
private String sex;
private String idCard;
private String userType1;
private String userType2;
private String companyName1;
private String companyCode1;
private String companyName2;
private String companyCode2;
private String highestEducation;
private String major;
private String socialSecurityYear;
private String workYear;
private String occupation;
@ApiModelProperty("所持前一等级证书的等级,不是当前培训班级等级")
private String certificateLevel;
private String certificateNo;
private String issueDate;
private String qualificationClause;
private String roleName; private String roleName;
private Integer roleId; private Integer roleId;
......
package com.platform.business.model.vo;
import lombok.Data;
/**
* 学员账户导出为正式职业技能认定花名册时使用的数据行。
*
* <p>该对象刻意与账户管理列表VO分离:列表页面只需要账户、班级和状态等摘要字段,
* 花名册则需要身份证、用工单位、学历及前一等级证书等申报资料。分离后不会因为导出
* 需求而扩大分页接口的响应体,也能明确区分“当前培训等级”和“前一证书等级”。</p>
*/
@Data
public class AccountStudentRosterVO {
private String id;
private String name;
private String sex;
private String idCard;
private String phoneNumber;
private String userType1;
private String userType2;
private String companyName1;
private String companyCode1;
private String companyName2;
private String companyCode2;
private String highestEducation;
private String major;
private String socialSecurityYear;
private String workYear;
private String occupation;
private String certificateLevel;
private String certificateNo;
private String issueDate;
private String qualificationClause;
private String remark;
}
...@@ -7,6 +7,7 @@ import com.platform.business.model.vo.AccountAdminStatisticsVO; ...@@ -7,6 +7,7 @@ import com.platform.business.model.vo.AccountAdminStatisticsVO;
import com.platform.business.model.vo.AccountAttendanceVO; import com.platform.business.model.vo.AccountAttendanceVO;
import com.platform.business.model.vo.AccountLoginLogVO; import com.platform.business.model.vo.AccountLoginLogVO;
import com.platform.business.model.vo.AccountOptionVO; import com.platform.business.model.vo.AccountOptionVO;
import com.platform.business.model.vo.AccountStudentRosterVO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
...@@ -21,6 +22,14 @@ public interface AccountAdminMapper { ...@@ -21,6 +22,14 @@ public interface AccountAdminMapper {
@Param("broadRole") String broadRole, @Param("broadRole") String broadRole,
@Param("sixMonthsAgo") Date sixMonthsAgo); @Param("sixMonthsAgo") Date sixMonthsAgo);
/**
* 使用与账户分页完全一致的筛选条件查询正式学员花名册字段,避免导出结果与页面不一致。
*/
List<AccountStudentRosterVO> selectStudentRosterRows(
@Param("query") AccountAdminQueryDTO query,
@Param("broadRole") String broadRole,
@Param("sixMonthsAgo") Date sixMonthsAgo);
AccountAdminDetailVO selectDetail(@Param("id") String id); AccountAdminDetailVO selectDetail(@Param("id") String id);
List<AccountAttendanceVO> selectAttendance(@Param("userId") String userId); List<AccountAttendanceVO> selectAttendance(@Param("userId") String userId);
......
...@@ -18,6 +18,7 @@ import com.platform.business.model.vo.AccountAdminListVO; ...@@ -18,6 +18,7 @@ import com.platform.business.model.vo.AccountAdminListVO;
import com.platform.business.model.vo.AccountAdminOptionsVO; import com.platform.business.model.vo.AccountAdminOptionsVO;
import com.platform.business.model.vo.AccountAdminStatisticsVO; import com.platform.business.model.vo.AccountAdminStatisticsVO;
import com.platform.business.model.vo.AccountImportResultVO; import com.platform.business.model.vo.AccountImportResultVO;
import com.platform.business.model.vo.AccountStudentRosterVO;
import com.platform.business.service.AccountAdminService; import com.platform.business.service.AccountAdminService;
import com.platform.business.service.ClassStudentService; import com.platform.business.service.ClassStudentService;
import com.platform.business.service.SysPhoneRoleService; import com.platform.business.service.SysPhoneRoleService;
...@@ -26,12 +27,19 @@ import com.platform.business.service.SysUserAndRoleService; ...@@ -26,12 +27,19 @@ import com.platform.business.service.SysUserAndRoleService;
import com.platform.business.service.UserService; import com.platform.business.service.UserService;
import com.platform.business.utils.PasswordUtil; import com.platform.business.utils.PasswordUtil;
import com.platform.exception.BusinessException; import com.platform.exception.BusinessException;
import org.apache.poi.ss.usermodel.BorderStyle;
import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellStyle;
import org.apache.poi.ss.usermodel.DataFormatter; import org.apache.poi.ss.usermodel.DataFormatter;
import org.apache.poi.ss.usermodel.Font;
import org.apache.poi.ss.usermodel.FormulaEvaluator;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.VerticalAlignment;
import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.usermodel.WorkbookFactory; import org.apache.poi.ss.usermodel.WorkbookFactory;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -41,6 +49,7 @@ import javax.annotation.Resource; ...@@ -41,6 +49,7 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.math.BigDecimal;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.ZoneId; import java.time.ZoneId;
...@@ -66,8 +75,40 @@ public class AccountAdminServiceImpl implements AccountAdminService { ...@@ -66,8 +75,40 @@ public class AccountAdminServiceImpl implements AccountAdminService {
private static final ZoneId BUSINESS_ZONE = ZoneId.of("Asia/Shanghai"); private static final ZoneId BUSINESS_ZONE = ZoneId.of("Asia/Shanghai");
private static final Pattern PHONE_PATTERN = Pattern.compile("^1[3-9]\\d{9}$"); private static final Pattern PHONE_PATTERN = Pattern.compile("^1[3-9]\\d{9}$");
private static final Pattern ACCOUNT_PATTERN = Pattern.compile("^[A-Za-z0-9._-]{3,50}$"); private static final Pattern ACCOUNT_PATTERN = Pattern.compile("^[A-Za-z0-9._-]{3,50}$");
private static final Pattern ID_CARD_PATTERN = Pattern.compile("^(?:\\d{15}|\\d{17}[0-9Xx])$");
private static final int LOGIN_LOG_LIMIT = 100; private static final int LOGIN_LOG_LIMIT = 100;
/** 正式花名册沿用参考文件的前4行抬头,数据从Excel第5行开始。 */
private static final int STUDENT_ROSTER_DATA_START_ROW = 4;
private static final int STUDENT_ROSTER_MIN_DATA_ROWS = 48;
private static final int STUDENT_ROSTER_COLUMN_COUNT = 21;
private static final String STUDENT_ROSTER_TITLE =
"上海城投(集团)有限公司职业技能认定申报资质审核信息表";
private static final String STUDENT_ROSTER_ORGANIZATION =
"申报单位:(盖章):上海水务职业技术培训学校";
private static final String STUDENT_ROSTER_PROJECT =
" 申报项目(工种/等级):污水处理工(污泥处理工)/四级 ";
private static final String STUDENT_ROSTER_TRAINING_PROJECT =
"培养项目:污水处理工(污泥处理工)四级2025年1期";
private static final String STUDENT_ROSTER_NOTES = String.join("\n",
"备注:",
"1、考生承诺报名时所提供的基本信息、获证信息、申报信息是真实、有效的,如经查实存在虚假伪造的,统一取消考生鉴定资格及考试成绩、虚假材料及费用不予退还、所获证书作无效处理。考生所属单位需审核并确认。",
"2、本表“人员类别”请根据实际勾选:“1”为学员实际用工单位与具有劳动关系单位一致的;“2”为学员实际用工单位与劳动关系单位不一致的。",
"3、学员实际用工单位与具有劳动关系单位一致的,仅需填写“具有劳动关系单位”的信息,学员实际用工单位与劳动关系单位不一致的,应同时填写“实际用工单位”与“具有劳动关系单位”信息。",
"4、社保缴金年限和从事本职业或相关职业工作年限:社保缴纳月份/12。",
"5、发证日期:具体到年月日。",
"6、单位盖章:人力资源部或培训部盖章。",
"7、符合认定申报资质条款:需明确符合《2023版国标》申报条件何条款。",
"8、需递交材料:(1)学历证明材料(毕业证书复印件或学信网证明) (2)上一等级本职业或相关职业技能证书复印件 (3)当月参保人员城镇职工基本养老保险缴费情况表(需与社保缴金年限对应) (4)各单位出具满足符合认定申报要求的“从事本职业或相关职业工作年限证明”(5)个人工作经历。");
/** 列宽逐列复刻参考工作簿,单位为Excel字符宽度。 */
private static final double[] STUDENT_ROSTER_COLUMN_WIDTHS = {
4, 11.25, 7.75, 23.375, 14.125, 5.25, 4.875, 31.0917, 26.875,
32.1917, 26.875, 9.625, 14.875, 9.625, 12.125, 14.125, 8.125,
17.5, 14.875, 14.375, 9.375
};
@Resource @Resource
private AccountAdminMapper accountAdminMapper; private AccountAdminMapper accountAdminMapper;
@Resource @Resource
...@@ -140,12 +181,27 @@ public class AccountAdminServiceImpl implements AccountAdminService { ...@@ -140,12 +181,27 @@ public class AccountAdminServiceImpl implements AccountAdminService {
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public AccountAdminDetailVO create(AccountAdminSaveDTO request, UserEntity operator) { public AccountAdminDetailVO create(AccountAdminSaveDTO request, UserEntity operator) {
return createAccount(request, operator, null);
}
/**
* 创建账户的统一内部入口。
*
* <p>页面单个新增传入的rosterRow为空;正式花名册导入则传入完整资料。这样密码、
* 状态、班级关系、大类角色和审计逻辑只保留一份,同时扩展资料可以在首次INSERT前
* 一并写入,避免先建账户再更新资料产生半成品记录。</p>
*/
private AccountAdminDetailVO createAccount(AccountAdminSaveDTO request, UserEntity operator,
AccountImportRowDTO rosterRow) {
validateAndNormalizeSave(request, null, true); validateAndNormalizeSave(request, null, true);
String type = request.getAccountType(); String type = request.getAccountType();
String status = defaultStatus(type, request.getStatus()); String status = defaultStatus(type, request.getStatus());
UserEntity user = new UserEntity(); UserEntity user = new UserEntity();
applyEditableFields(user, request, type); applyEditableFields(user, request, type);
if (AccountAdminConstants.TYPE_STUDENT.equals(type) && rosterRow != null) {
applyStudentRosterFields(user, rosterRow);
}
user.setPassword(passwordUtil.encodePassword(defaultPassword(request.getInitialPassword()))); user.setPassword(passwordUtil.encodePassword(defaultPassword(request.getInitialPassword())));
user.setLoginFailNum(0); user.setLoginFailNum(0);
user.setFirstLoginFlag(true); user.setFirstLoginFlag(true);
...@@ -315,8 +371,11 @@ public class AccountAdminServiceImpl implements AccountAdminService { ...@@ -315,8 +371,11 @@ public class AccountAdminServiceImpl implements AccountAdminService {
request.setEmployeeNo(row.getEmployeeNo()); request.setEmployeeNo(row.getEmployeeNo());
request.setRoleId(row.getRoleId()); request.setRoleId(row.getRoleId());
request.setClassId(classId); request.setClassId(classId);
request.setIdCard(row.getIdCard());
request.setCompanyName(row.getCompanyName2() == null
? row.getCompanyName1() : row.getCompanyName2());
request.setRemark(row.getRemark()); request.setRemark(row.getRemark());
create(request, operator); createAccount(request, operator, row);
imported++; imported++;
} }
} }
...@@ -335,13 +394,17 @@ public class AccountAdminServiceImpl implements AccountAdminService { ...@@ -335,13 +394,17 @@ public class AccountAdminServiceImpl implements AccountAdminService {
public void downloadTemplate(String accountType, HttpServletResponse response) { public void downloadTemplate(String accountType, HttpServletResponse response) {
String type = normalizeType(accountType); String type = normalizeType(accountType);
try (Workbook workbook = new XSSFWorkbook()) { try (Workbook workbook = new XSSFWorkbook()) {
if (AccountAdminConstants.TYPE_STUDENT.equals(type)) {
writeStudentRosterSheet(workbook, Collections.emptyList());
writeWorkbook(response, workbook, "学员账户批量导入模板.xlsx");
return;
}
Sheet sheet = workbook.createSheet("账户导入"); Sheet sheet = workbook.createSheet("账户导入");
List<String> headers = importHeaders(type); List<String> headers = importHeaders(type);
writeRow(sheet.createRow(0), headers); writeRow(sheet.createRow(0), headers);
Row example = sheet.createRow(1); Row example = sheet.createRow(1);
if (AccountAdminConstants.TYPE_STUDENT.equals(type)) { if (AccountAdminConstants.TYPE_TEACHER.equals(type)) {
writeRow(example, asList("张三", "13800138000", "可选备注"));
} else if (AccountAdminConstants.TYPE_TEACHER.equals(type)) {
writeRow(example, asList("王老师", "T-2026-001", "13800138000", "理论讲师", "可选备注")); writeRow(example, asList("王老师", "T-2026-001", "13800138000", "理论讲师", "可选备注"));
} else { } else {
writeRow(example, asList("管理员", "admin01", "13800138000", "机构管理员", "可选备注")); writeRow(example, asList("管理员", "admin01", "13800138000", "机构管理员", "可选备注"));
...@@ -357,6 +420,19 @@ public class AccountAdminServiceImpl implements AccountAdminService { ...@@ -357,6 +420,19 @@ public class AccountAdminServiceImpl implements AccountAdminService {
@Transactional(readOnly = true) @Transactional(readOnly = true)
public void export(AccountAdminQueryDTO query, HttpServletResponse response) { public void export(AccountAdminQueryDTO query, HttpServletResponse response) {
AccountAdminQueryDTO normalized = normalizeQuery(query); AccountAdminQueryDTO normalized = normalizeQuery(query);
if (AccountAdminConstants.TYPE_STUDENT.equals(normalized.getAccountType())) {
List<AccountStudentRosterVO> rosterRows = accountAdminMapper.selectStudentRosterRows(
normalized, AccountAdminConstants.ROLE_STUDENT, sixMonthsAgo());
try (Workbook workbook = new XSSFWorkbook()) {
writeStudentRosterSheet(workbook,
rosterRows == null ? Collections.emptyList() : rosterRows);
writeWorkbook(response, workbook, "学员账户清单.xlsx");
return;
} catch (IOException e) {
throw new BusinessException("学员花名册导出失败");
}
}
List<AccountAdminListVO> rows = accountAdminMapper.selectAccounts( List<AccountAdminListVO> rows = accountAdminMapper.selectAccounts(
normalized, normalized,
AccountAdminConstants.broadRoleName(normalized.getAccountType()), AccountAdminConstants.broadRoleName(normalized.getAccountType()),
...@@ -481,6 +557,34 @@ public class AccountAdminServiceImpl implements AccountAdminService { ...@@ -481,6 +557,34 @@ public class AccountAdminServiceImpl implements AccountAdminService {
} }
} }
/**
* 将正式花名册的申报资料映射到历史user表字段。
*
* <p>特别注意:花名册Q列“等级”位于“所持前一等级证书信息”分组下,代表前一证书
* 等级;当前在培等级由class_student关联的班级决定。这里允许Q列覆盖user.level,
* 页面查询仍优先使用班级关联的等级,因此两种业务含义不会互相污染。</p>
*/
private void applyStudentRosterFields(UserEntity user, AccountImportRowDTO row) {
user.setSex(row.getSex());
user.setIdCard(row.getIdCard());
user.setUserType1(row.getUserType1());
user.setUserType2(row.getUserType2());
user.setCompanyName1(row.getCompanyName1());
user.setCompanyCode1(row.getCompanyCode1());
user.setCompanyName2(row.getCompanyName2());
user.setCompanyCode2(row.getCompanyCode2());
user.setHighestEducation(row.getHighestEducation());
user.setMajor(row.getMajor());
user.setSocialSecurityYear(row.getSocialSecurityYear());
user.setWorkYear(row.getWorkYear());
user.setOccupation(row.getOccupation());
user.setLevel(row.getCertificateLevel());
user.setCertNo(row.getCertificateNo());
user.setIssueDate(row.getIssueDate());
user.setQualificationClause(row.getQualificationClause());
user.setRemark(row.getRemark());
}
private void saveRelations(String userId, AccountAdminSaveDTO request, String type) { private void saveRelations(String userId, AccountAdminSaveDTO request, String type) {
if (AccountAdminConstants.TYPE_STUDENT.equals(type)) { if (AccountAdminConstants.TYPE_STUDENT.equals(type)) {
classStudentService.remove(new LambdaQueryWrapper<ClassStudentEntity>() classStudentService.remove(new LambdaQueryWrapper<ClassStudentEntity>()
...@@ -529,46 +633,106 @@ public class AccountAdminServiceImpl implements AccountAdminService { ...@@ -529,46 +633,106 @@ public class AccountAdminServiceImpl implements AccountAdminService {
if (sheet == null || sheet.getLastRowNum() < 1) { if (sheet == null || sheet.getLastRowNum() < 1) {
throw new BusinessException("Excel中没有可导入的数据"); throw new BusinessException("Excel中没有可导入的数据");
} }
validateHeaders(sheet.getRow(0), importHeaders(type));
DataFormatter formatter = new DataFormatter(Locale.CHINA); DataFormatter formatter = new DataFormatter(Locale.CHINA);
FormulaEvaluator evaluator = workbook.getCreationHelper().createFormulaEvaluator();
List<AccountImportRowDTO> rows = AccountAdminConstants.TYPE_STUDENT.equals(type)
? parseStudentRosterRows(sheet, formatter, evaluator)
: parseSimpleImportRows(sheet, type, formatter, evaluator);
if (rows.isEmpty()) {
throw new BusinessException("Excel中没有可导入的数据");
}
return rows;
} catch (BusinessException e) {
throw e;
} catch (Exception e) {
throw new BusinessException("Excel文件无法解析,请使用下载的模板重新填写");
}
}
/**
* 解析参考花名册的固定21列结构。前4行是抬头和两级表头;第5行开始才是业务数据。
* 模板预置的48个序号不会被误判为数据,因为是否为空只检查B~U列。
*/
private List<AccountImportRowDTO> parseStudentRosterRows(
Sheet sheet, DataFormatter formatter, FormulaEvaluator evaluator) {
validateStudentRosterHeaders(sheet, formatter, evaluator);
List<AccountImportRowDTO> rows = new ArrayList<>(); List<AccountImportRowDTO> rows = new ArrayList<>();
for (int i = 1; i <= sheet.getLastRowNum(); i++) { for (int i = STUDENT_ROSTER_DATA_START_ROW; i <= sheet.getLastRowNum(); i++) {
Row excelRow = sheet.getRow(i); Row excelRow = sheet.getRow(i);
if (excelRow == null || isBlankRow(excelRow, formatter)) { if (excelRow == null) {
continue;
}
String firstCell = cell(excelRow, 0, formatter, evaluator);
if (firstCell.startsWith("审核人签字") || firstCell.startsWith("备注:")) {
break;
}
if (isStudentRosterDataBlank(excelRow, formatter, evaluator)) {
continue; continue;
} }
AccountImportRowDTO row = new AccountImportRowDTO(); AccountImportRowDTO row = new AccountImportRowDTO();
row.setRowNumber(i + 1); row.setRowNumber(i + 1);
row.setName(cell(excelRow, 0, formatter)); row.setName(cell(excelRow, 1, formatter, evaluator));
if (AccountAdminConstants.TYPE_STUDENT.equals(type)) { row.setSex(cell(excelRow, 2, formatter, evaluator));
row.setPhoneNumber(cell(excelRow, 1, formatter)); row.setIdCard(identifierCell(excelRow, 3, formatter, evaluator));
row.setPhoneNumber(identifierCell(excelRow, 4, formatter, evaluator));
row.setUsername(row.getPhoneNumber()); row.setUsername(row.getPhoneNumber());
row.setRemark(cell(excelRow, 2, formatter)); row.setUserType1(cell(excelRow, 5, formatter, evaluator));
} else if (AccountAdminConstants.TYPE_TEACHER.equals(type)) { row.setUserType2(cell(excelRow, 6, formatter, evaluator));
row.setEmployeeNo(cell(excelRow, 1, formatter)); row.setCompanyName1(cell(excelRow, 7, formatter, evaluator));
row.setCompanyCode1(identifierCell(excelRow, 8, formatter, evaluator));
row.setCompanyName2(cell(excelRow, 9, formatter, evaluator));
row.setCompanyCode2(identifierCell(excelRow, 10, formatter, evaluator));
row.setHighestEducation(cell(excelRow, 11, formatter, evaluator));
row.setMajor(cell(excelRow, 12, formatter, evaluator));
row.setSocialSecurityYear(cell(excelRow, 13, formatter, evaluator));
row.setWorkYear(cell(excelRow, 14, formatter, evaluator));
row.setOccupation(cell(excelRow, 15, formatter, evaluator));
row.setCertificateLevel(cell(excelRow, 16, formatter, evaluator));
row.setCertificateNo(identifierCell(excelRow, 17, formatter, evaluator));
row.setIssueDate(cell(excelRow, 18, formatter, evaluator));
row.setQualificationClause(cell(excelRow, 19, formatter, evaluator));
row.setRemark(cell(excelRow, 20, formatter, evaluator));
rows.add(row);
ensureImportLimit(rows);
}
return rows;
}
/** 教师、管理员继续解析既有首行表头和5列数据,保持向后兼容。 */
private List<AccountImportRowDTO> parseSimpleImportRows(
Sheet sheet, String type, DataFormatter formatter, FormulaEvaluator evaluator) {
validateHeaders(sheet.getRow(0), importHeaders(type), formatter, evaluator);
List<AccountImportRowDTO> rows = new ArrayList<>();
for (int i = 1; i <= sheet.getLastRowNum(); i++) {
Row excelRow = sheet.getRow(i);
if (excelRow == null || isBlankRow(excelRow, formatter, evaluator)) {
continue;
}
AccountImportRowDTO row = new AccountImportRowDTO();
row.setRowNumber(i + 1);
row.setName(cell(excelRow, 0, formatter, evaluator));
if (AccountAdminConstants.TYPE_TEACHER.equals(type)) {
row.setEmployeeNo(cell(excelRow, 1, formatter, evaluator));
row.setUsername(row.getEmployeeNo()); row.setUsername(row.getEmployeeNo());
row.setPhoneNumber(cell(excelRow, 2, formatter)); row.setPhoneNumber(identifierCell(excelRow, 2, formatter, evaluator));
row.setRoleName(cell(excelRow, 3, formatter)); row.setRoleName(cell(excelRow, 3, formatter, evaluator));
row.setRemark(cell(excelRow, 4, formatter)); row.setRemark(cell(excelRow, 4, formatter, evaluator));
} else { } else {
row.setUsername(cell(excelRow, 1, formatter)); row.setUsername(cell(excelRow, 1, formatter, evaluator));
row.setPhoneNumber(cell(excelRow, 2, formatter)); row.setPhoneNumber(identifierCell(excelRow, 2, formatter, evaluator));
row.setRoleName(cell(excelRow, 3, formatter)); row.setRoleName(cell(excelRow, 3, formatter, evaluator));
row.setRemark(cell(excelRow, 4, formatter)); row.setRemark(cell(excelRow, 4, formatter, evaluator));
} }
rows.add(row); rows.add(row);
if (rows.size() > AccountAdminConstants.MAX_BATCH_SIZE) { ensureImportLimit(rows);
throw new BusinessException("单次导入不能超过500条账户");
}
}
if (rows.isEmpty()) {
throw new BusinessException("Excel中没有可导入的数据");
} }
return rows; return rows;
} catch (BusinessException e) { }
throw e;
} catch (Exception e) { private void ensureImportLimit(List<AccountImportRowDTO> rows) {
throw new BusinessException("Excel文件无法解析,请使用下载的模板重新填写"); if (rows.size() > AccountAdminConstants.MAX_BATCH_SIZE) {
throw new BusinessException("单次导入不能超过500条账户");
} }
} }
...@@ -584,6 +748,10 @@ public class AccountAdminServiceImpl implements AccountAdminService { ...@@ -584,6 +748,10 @@ public class AccountAdminServiceImpl implements AccountAdminService {
row.setRoleName(trimToNull(row.getRoleName())); row.setRoleName(trimToNull(row.getRoleName()));
row.setRemark(trimToNull(row.getRemark())); row.setRemark(trimToNull(row.getRemark()));
if (AccountAdminConstants.TYPE_STUDENT.equals(type)) {
normalizeStudentRosterFields(row, errors);
}
if (row.getName() == null) errors.add("姓名为空"); if (row.getName() == null) errors.add("姓名为空");
else if (row.getName().length() > 50) errors.add("姓名超过50个字符"); else if (row.getName().length() > 50) errors.add("姓名超过50个字符");
if (row.getPhoneNumber() == null || !PHONE_PATTERN.matcher(row.getPhoneNumber()).matches()) { if (row.getPhoneNumber() == null || !PHONE_PATTERN.matcher(row.getPhoneNumber()).matches()) {
...@@ -617,6 +785,77 @@ public class AccountAdminServiceImpl implements AccountAdminService { ...@@ -617,6 +785,77 @@ public class AccountAdminServiceImpl implements AccountAdminService {
} }
} }
/**
* 花名册采用宽松导入:除姓名、手机号外均可留空;一旦填写则执行基础格式和长度校验,
* 避免无效身份证、同时勾选两种人员类别或超长文本直接进入数据库。
*/
private void normalizeStudentRosterFields(AccountImportRowDTO row, List<String> errors) {
row.setSex(trimToNull(row.getSex()));
row.setIdCard(trimToNull(row.getIdCard()));
row.setUserType1(normalizePersonCategory(row.getUserType1(), "人员类别1", errors));
row.setUserType2(normalizePersonCategory(row.getUserType2(), "人员类别2", errors));
row.setCompanyName1(trimToNull(row.getCompanyName1()));
row.setCompanyCode1(trimToNull(row.getCompanyCode1()));
row.setCompanyName2(trimToNull(row.getCompanyName2()));
row.setCompanyCode2(trimToNull(row.getCompanyCode2()));
row.setHighestEducation(trimToNull(row.getHighestEducation()));
row.setMajor(trimToNull(row.getMajor()));
row.setSocialSecurityYear(trimToNull(row.getSocialSecurityYear()));
row.setWorkYear(trimToNull(row.getWorkYear()));
row.setOccupation(trimToNull(row.getOccupation()));
row.setCertificateLevel(trimToNull(row.getCertificateLevel()));
row.setCertificateNo(trimToNull(row.getCertificateNo()));
row.setIssueDate(trimToNull(row.getIssueDate()));
row.setQualificationClause(trimToNull(row.getQualificationClause()));
if (row.getSex() != null && !"男".equals(row.getSex()) && !"女".equals(row.getSex())) {
errors.add("性别只能填写男或女");
}
if (row.getIdCard() != null && !ID_CARD_PATTERN.matcher(row.getIdCard()).matches()) {
errors.add("身份证号格式错误");
}
if (row.getUserType1() != null && row.getUserType2() != null) {
errors.add("人员类别1和2不能同时勾选");
}
addLengthError(errors, "身份证号", row.getIdCard(), 30);
addLengthError(errors, "劳动关系单位名称", row.getCompanyName1(), 200);
addLengthError(errors, "劳动关系单位组织机构代码", row.getCompanyCode1(), 100);
addLengthError(errors, "实际用工单位名称", row.getCompanyName2(), 200);
addLengthError(errors, "实际用工单位组织机构代码", row.getCompanyCode2(), 100);
addLengthError(errors, "最高学历", row.getHighestEducation(), 50);
addLengthError(errors, "专业", row.getMajor(), 100);
addLengthError(errors, "社保缴金年限", row.getSocialSecurityYear(), 50);
addLengthError(errors, "相关职业工作年限", row.getWorkYear(), 50);
addLengthError(errors, "职业(工种)", row.getOccupation(), 100);
addLengthError(errors, "前一证书等级", row.getCertificateLevel(), 50);
addLengthError(errors, "证书编号", row.getCertificateNo(), 100);
addLengthError(errors, "发证日期", row.getIssueDate(), 50);
addLengthError(errors, "申报资质条款", row.getQualificationClause(), 500);
addLengthError(errors, "备注", row.getRemark(), 500);
}
private String normalizePersonCategory(String value, String label, List<String> errors) {
String normalized = trimToNull(value);
if (normalized == null) {
return null;
}
String upper = normalized.toUpperCase(Locale.ROOT);
if ("√".equals(normalized) || "✓".equals(normalized) || "1".equals(normalized)
|| "是".equals(normalized) || "Y".equals(upper) || "YES".equals(upper)
|| "TRUE".equals(upper)) {
return "√";
}
errors.add(label + "只能填写√、1、是或Y");
return normalized;
}
private void addLengthError(List<String> errors, String label, String value, int maxLength) {
if (value != null && value.length() > maxLength) {
errors.add(label + "超过" + maxLength + "个字符");
}
}
private void validateImportFile(MultipartFile file) { private void validateImportFile(MultipartFile file) {
if (file == null || file.isEmpty()) throw new BusinessException("请选择Excel文件"); if (file == null || file.isEmpty()) throw new BusinessException("请选择Excel文件");
if (file.getSize() > AccountAdminConstants.MAX_IMPORT_BYTES) { if (file.getSize() > AccountAdminConstants.MAX_IMPORT_BYTES) {
...@@ -629,11 +868,11 @@ public class AccountAdminServiceImpl implements AccountAdminService { ...@@ -629,11 +868,11 @@ public class AccountAdminServiceImpl implements AccountAdminService {
} }
} }
private void validateHeaders(Row row, List<String> expected) { private void validateHeaders(Row row, List<String> expected,
DataFormatter formatter, FormulaEvaluator evaluator) {
if (row == null) throw new BusinessException("Excel缺少表头"); if (row == null) throw new BusinessException("Excel缺少表头");
DataFormatter formatter = new DataFormatter(Locale.CHINA);
for (int i = 0; i < expected.size(); i++) { for (int i = 0; i < expected.size(); i++) {
String actual = cell(row, i, formatter); String actual = cell(row, i, formatter, evaluator);
if (!expected.get(i).equals(actual)) { if (!expected.get(i).equals(actual)) {
throw new BusinessException("Excel表头不正确,第" + (i + 1) throw new BusinessException("Excel表头不正确,第" + (i + 1)
+ "列应为“" + expected.get(i) + "”"); + "列应为“" + expected.get(i) + "”");
...@@ -641,6 +880,59 @@ public class AccountAdminServiceImpl implements AccountAdminService { ...@@ -641,6 +880,59 @@ public class AccountAdminServiceImpl implements AccountAdminService {
} }
} }
/**
* 校验正式花名册的两级表头。合并区域只有左上角保存文字,因此只检查有文字的锚点列;
* 比较前去掉换行和空格,可同时接受参考文件中的“学员\n姓名”和用户手动改成的“学员姓名”。
*/
private void validateStudentRosterHeaders(
Sheet sheet, DataFormatter formatter, FormulaEvaluator evaluator) {
Row firstHeader = sheet.getRow(2);
Row secondHeader = sheet.getRow(3);
if (firstHeader == null || secondHeader == null) {
throw new BusinessException("Excel缺少正式花名册的两级表头");
}
requireRosterHeader(firstHeader, 0, "序号", formatter, evaluator);
requireRosterHeader(firstHeader, 1, "学员姓名", formatter, evaluator);
requireRosterHeader(firstHeader, 2, "性别", formatter, evaluator);
requireRosterHeader(firstHeader, 3, "身份证号", formatter, evaluator);
requireRosterHeader(firstHeader, 4, "联系电话", formatter, evaluator);
requireRosterHeader(firstHeader, 5, "人员类别", formatter, evaluator);
requireRosterHeader(firstHeader, 7, "具有劳动关系单位(缴金单位)", formatter, evaluator);
requireRosterHeader(firstHeader, 9, "实际用工单位", formatter, evaluator);
requireRosterHeader(firstHeader, 11, "最高学历", formatter, evaluator);
requireRosterHeader(firstHeader, 12, "专业", formatter, evaluator);
requireRosterHeader(firstHeader, 13, "社保缴金年限", formatter, evaluator);
requireRosterHeader(firstHeader, 14, "从事本职业或相关职业工作年限", formatter, evaluator);
requireRosterHeader(firstHeader, 15, "所持前一等级证书信息", formatter, evaluator);
requireRosterHeader(firstHeader, 19, "符合认定申报资质条款", formatter, evaluator);
requireRosterHeader(firstHeader, 20, "备注", formatter, evaluator);
requireRosterHeader(secondHeader, 5, "1", formatter, evaluator);
requireRosterHeader(secondHeader, 6, "2", formatter, evaluator);
requireRosterHeader(secondHeader, 7, "单位名称", formatter, evaluator);
requireRosterHeader(secondHeader, 8, "组织机构代码", formatter, evaluator);
requireRosterHeader(secondHeader, 9, "单位名称", formatter, evaluator);
requireRosterHeader(secondHeader, 10, "组织机构代码", formatter, evaluator);
requireRosterHeader(secondHeader, 15, "职业(工种)", formatter, evaluator);
requireRosterHeader(secondHeader, 16, "等级", formatter, evaluator);
requireRosterHeader(secondHeader, 17, "证书编号", formatter, evaluator);
requireRosterHeader(secondHeader, 18, "发证日期", formatter, evaluator);
}
private void requireRosterHeader(Row row, int column, String expected,
DataFormatter formatter, FormulaEvaluator evaluator) {
String actual = normalizeHeader(cell(row, column, formatter, evaluator));
if (!normalizeHeader(expected).equals(actual)) {
throw new BusinessException("Excel花名册表头不正确,第" + (column + 1)
+ "列应为“" + expected + "”");
}
}
private String normalizeHeader(String value) {
return value == null ? "" : value.replaceAll("[\\s ]+", "");
}
private List<String> importHeaders(String type) { private List<String> importHeaders(String type) {
if (AccountAdminConstants.TYPE_STUDENT.equals(type)) { if (AccountAdminConstants.TYPE_STUDENT.equals(type)) {
return asList("姓名", "手机号", "备注"); return asList("姓名", "手机号", "备注");
...@@ -787,14 +1079,49 @@ public class AccountAdminServiceImpl implements AccountAdminService { ...@@ -787,14 +1079,49 @@ public class AccountAdminServiceImpl implements AccountAdminService {
if (trimToNull(id) == null) throw new BusinessException("账户ID不能为空"); if (trimToNull(id) == null) throw new BusinessException("账户ID不能为空");
} }
private String cell(Row row, int index, DataFormatter formatter) { private String cell(Row row, int index, DataFormatter formatter,
FormulaEvaluator evaluator) {
Cell cell = row.getCell(index); Cell cell = row.getCell(index);
return cell == null ? "" : formatter.formatCellValue(cell).trim(); return cell == null ? "" : formatter.formatCellValue(cell, evaluator).trim();
} }
private boolean isBlankRow(Row row, DataFormatter formatter) { /**
* 标识类字段如果被Excel保存为数字,DataFormatter可能返回科学计数法。统一转成普通数字
* 字符串,确保手机号、身份证号、组织机构代码和证书编号不会以E+形式进入数据库。
*/
private String identifierCell(Row row, int index, DataFormatter formatter,
FormulaEvaluator evaluator) {
String value = cell(row, index, formatter, evaluator);
if (value.isEmpty()) {
return value;
}
try {
if (value.matches("[+-]?\\d+(?:\\.\\d+)?[Ee][+-]?\\d+")) {
return new BigDecimal(value).stripTrailingZeros().toPlainString();
}
if (value.matches("[+-]?\\d+\\.0+")) {
return value.substring(0, value.indexOf('.'));
}
} catch (NumberFormatException ignored) {
// 非数字型编号按原文本保留,后续字段校验会给出更准确的业务错误。
}
return value;
}
private boolean isBlankRow(Row row, DataFormatter formatter, FormulaEvaluator evaluator) {
for (int i = 0; i < row.getLastCellNum(); i++) { for (int i = 0; i < row.getLastCellNum(); i++) {
if (!cell(row, i, formatter).isEmpty()) return false; if (!cell(row, i, formatter, evaluator).isEmpty()) return false;
}
return true;
}
/** A列序号由模板预置,不参与空行判断;B~U均为空才视为未填写。 */
private boolean isStudentRosterDataBlank(
Row row, DataFormatter formatter, FormulaEvaluator evaluator) {
for (int i = 1; i < STUDENT_ROSTER_COLUMN_COUNT; i++) {
if (!cell(row, i, formatter, evaluator).isEmpty()) {
return false;
}
} }
return true; return true;
} }
...@@ -805,6 +1132,227 @@ public class AccountAdminServiceImpl implements AccountAdminService { ...@@ -805,6 +1132,227 @@ public class AccountAdminServiceImpl implements AccountAdminService {
return result; return result;
} }
/**
* 生成与参考文件一致的正式学员花名册。
*
* <p>数据区至少保留48行;超过48人时自动扩行。数据区后固定保留两行带边框空白行,
* 再放置签字和备注,因此签字行公式为“第5行起始索引 + 数据行数 + 2”。该公式可避免
* 导出人数增加时覆盖底部说明。</p>
*/
private void writeStudentRosterSheet(Workbook workbook, List<AccountStudentRosterVO> rows) {
Sheet sheet = workbook.createSheet("花名册");
sheet.setDisplayGridlines(false);
StudentRosterStyles styles = new StudentRosterStyles(workbook);
for (int i = 0; i < STUDENT_ROSTER_COLUMN_WIDTHS.length; i++) {
sheet.setColumnWidth(i, (int) Math.round(STUDENT_ROSTER_COLUMN_WIDTHS[i] * 256));
}
Row titleRow = createStyledRow(sheet, 0, 38.1f, styles.title);
titleRow.getCell(0).setCellValue(STUDENT_ROSTER_TITLE);
sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 20));
Row metaRow = sheet.createRow(1);
metaRow.setHeightInPoints(30f);
createCells(metaRow, STUDENT_ROSTER_COLUMN_COUNT, styles.metaCenter);
for (int i = 0; i <= 6; i++) {
metaRow.getCell(i).setCellStyle(styles.metaLeft);
}
metaRow.getCell(0).setCellValue(STUDENT_ROSTER_ORGANIZATION);
metaRow.getCell(7).setCellValue(STUDENT_ROSTER_PROJECT);
metaRow.getCell(11).setCellValue(STUDENT_ROSTER_TRAINING_PROJECT);
sheet.addMergedRegion(new CellRangeAddress(1, 1, 0, 6));
sheet.addMergedRegion(new CellRangeAddress(1, 1, 7, 10));
sheet.addMergedRegion(new CellRangeAddress(1, 1, 11, 20));
Row firstHeader = createStyledRow(sheet, 2, 18f, styles.header);
Row secondHeader = createStyledRow(sheet, 3, 36f, styles.header);
firstHeader.getCell(0).setCellValue("序号");
firstHeader.getCell(1).setCellValue("学员\n姓名");
firstHeader.getCell(2).setCellValue("性别");
firstHeader.getCell(3).setCellValue("身份证号");
firstHeader.getCell(4).setCellValue("联系电话");
firstHeader.getCell(5).setCellValue("人员类别");
firstHeader.getCell(7).setCellValue("具有劳动关系单位(缴金单位)");
firstHeader.getCell(9).setCellValue("实际用工单位");
firstHeader.getCell(11).setCellValue("最高学历");
firstHeader.getCell(12).setCellValue("专业");
firstHeader.getCell(13).setCellValue("社保缴金年限");
firstHeader.getCell(14).setCellValue("从事本职业或相关职业工作年限");
firstHeader.getCell(15).setCellValue("所持前一等级证书信息");
firstHeader.getCell(19).setCellValue("符合认定申报资质条款");
firstHeader.getCell(20).setCellValue("备注");
secondHeader.getCell(5).setCellValue("1");
secondHeader.getCell(6).setCellValue("2");
secondHeader.getCell(5).setCellStyle(styles.headerNumber);
secondHeader.getCell(6).setCellStyle(styles.headerNumber);
secondHeader.getCell(7).setCellValue("单位名称");
secondHeader.getCell(8).setCellValue("组织机构代码");
secondHeader.getCell(9).setCellValue("单位名称");
secondHeader.getCell(10).setCellValue("组织机构代码");
secondHeader.getCell(15).setCellValue("职业(工种)");
secondHeader.getCell(16).setCellValue("等级");
secondHeader.getCell(17).setCellValue("证书编号");
secondHeader.getCell(18).setCellValue("发证日期");
addStudentRosterHeaderMerges(sheet);
int dataRowCount = Math.max(STUDENT_ROSTER_MIN_DATA_ROWS, rows.size());
for (int i = 0; i < dataRowCount; i++) {
Row row = sheet.createRow(STUDENT_ROSTER_DATA_START_ROW + i);
row.setHeightInPoints(33f);
AccountStudentRosterVO item = i < rows.size() ? rows.get(i) : null;
writeStudentRosterDataRow(row, i + 1, item, styles.body);
}
// 参考文件在数据区和签字区之间保留两行完整表格,导出扩行时同步下移。
int spacerStart = STUDENT_ROSTER_DATA_START_ROW + dataRowCount;
for (int i = 0; i < 2; i++) {
Row spacer = sheet.createRow(spacerStart + i);
spacer.setHeightInPoints(33f);
createCellsWithStyles(spacer, styles.body);
}
int signatureRowIndex = spacerStart + 2;
Row signatureRow = sheet.createRow(signatureRowIndex);
signatureRow.setHeightInPoints(24f);
createCells(signatureRow, STUDENT_ROSTER_COLUMN_COUNT, styles.footer);
signatureRow.getCell(0).setCellValue("审核人签字:");
sheet.addMergedRegion(new CellRangeAddress(signatureRowIndex, signatureRowIndex, 0, 1));
sheet.addMergedRegion(new CellRangeAddress(signatureRowIndex, signatureRowIndex, 2, 6));
sheet.addMergedRegion(new CellRangeAddress(signatureRowIndex, signatureRowIndex, 8, 10));
int notesRowIndex = signatureRowIndex + 1;
Row notesRow = sheet.createRow(notesRowIndex);
notesRow.setHeightInPoints(171.75f);
createCells(notesRow, STUDENT_ROSTER_COLUMN_COUNT, styles.notes);
notesRow.getCell(0).setCellValue(STUDENT_ROSTER_NOTES);
sheet.addMergedRegion(new CellRangeAddress(notesRowIndex, notesRowIndex, 0, 20));
}
/** 合并区域坐标与参考文件保持一致;纵向合并列覆盖第3、4行表头。 */
private void addStudentRosterHeaderMerges(Sheet sheet) {
sheet.addMergedRegion(new CellRangeAddress(2, 2, 5, 6));
sheet.addMergedRegion(new CellRangeAddress(2, 2, 7, 8));
sheet.addMergedRegion(new CellRangeAddress(2, 2, 9, 10));
sheet.addMergedRegion(new CellRangeAddress(2, 2, 15, 18));
int[] verticalColumns = {0, 1, 2, 3, 4, 11, 12, 13, 14, 19, 20};
for (int column : verticalColumns) {
sheet.addMergedRegion(new CellRangeAddress(2, 3, column, column));
}
}
private Row createStyledRow(Sheet sheet, int rowIndex, float height, CellStyle style) {
Row row = sheet.createRow(rowIndex);
row.setHeightInPoints(height);
createCells(row, STUDENT_ROSTER_COLUMN_COUNT, style);
return row;
}
private void createCells(Row row, int count, CellStyle style) {
for (int i = 0; i < count; i++) {
row.createCell(i).setCellStyle(style);
}
}
private void createCellsWithStyles(Row row, CellStyle[] styles) {
for (int i = 0; i < styles.length; i++) {
row.createCell(i).setCellStyle(styles[i]);
}
}
private void writeStudentRosterDataRow(Row row, int serial,
AccountStudentRosterVO item,
CellStyle[] styles) {
createCellsWithStyles(row, styles);
row.getCell(0).setCellValue(serial);
if (item == null) {
return;
}
String[] values = {
item.getName(), item.getSex(), item.getIdCard(), item.getPhoneNumber(),
item.getUserType1(), item.getUserType2(), item.getCompanyName1(),
item.getCompanyCode1(), item.getCompanyName2(), item.getCompanyCode2(),
item.getHighestEducation(), item.getMajor(), item.getSocialSecurityYear(),
item.getWorkYear(), item.getOccupation(), item.getCertificateLevel(),
item.getCertificateNo(), item.getIssueDate(), item.getQualificationClause(),
item.getRemark()
};
for (int i = 0; i < values.length; i++) {
row.getCell(i + 1).setCellValue(values[i] == null ? "" : values[i]);
}
}
/**
* 花名册样式集中创建,避免逐单元格生成样式导致POI样式数量膨胀。
* 标识列使用文本格式“@”,即使导出值全为数字也不会被Excel改写为科学计数法。
*/
private static final class StudentRosterStyles {
private final CellStyle title;
private final CellStyle metaLeft;
private final CellStyle metaCenter;
private final CellStyle header;
private final CellStyle headerNumber;
private final CellStyle footer;
private final CellStyle notes;
private final CellStyle[] body;
private StudentRosterStyles(Workbook workbook) {
title = style(workbook, "宋体", 28, true, HorizontalAlignment.CENTER,
VerticalAlignment.CENTER, false, false);
metaLeft = style(workbook, "宋体", 12, true, HorizontalAlignment.LEFT,
VerticalAlignment.CENTER, true, false);
metaCenter = style(workbook, "宋体", 12, true, HorizontalAlignment.CENTER,
VerticalAlignment.CENTER, true, false);
header = style(workbook, "宋体", 12, true, HorizontalAlignment.CENTER,
VerticalAlignment.CENTER, true, true);
headerNumber = style(workbook, "Times New Roman", 12, true,
HorizontalAlignment.CENTER, VerticalAlignment.CENTER, true, true);
footer = style(workbook, "宋体", 12, false, HorizontalAlignment.LEFT,
VerticalAlignment.CENTER, false, false);
notes = style(workbook, "宋体", 9, false, HorizontalAlignment.LEFT,
VerticalAlignment.TOP, true, false);
body = new CellStyle[STUDENT_ROSTER_COLUMN_COUNT];
for (int i = 0; i < body.length; i++) {
int fontSize = i == 0 ? 10 : (i == 3 || i == 4 ? 11 : 12);
body[i] = style(workbook, "宋体", fontSize, false,
HorizontalAlignment.CENTER, VerticalAlignment.CENTER, true, true);
}
int textFormat = workbook.createDataFormat().getFormat("@");
int[] identifierColumns = {3, 4, 8, 10, 17};
for (int column : identifierColumns) {
body[column].setDataFormat((short) textFormat);
}
}
private static CellStyle style(Workbook workbook, String fontName, int fontSize,
boolean bold, HorizontalAlignment horizontal,
VerticalAlignment vertical, boolean wrap,
boolean allBorders) {
Font font = workbook.createFont();
font.setFontName(fontName);
font.setFontHeightInPoints((short) fontSize);
font.setBold(bold);
CellStyle style = workbook.createCellStyle();
style.setFont(font);
style.setAlignment(horizontal);
style.setVerticalAlignment(vertical);
style.setWrapText(wrap);
if (allBorders) {
style.setBorderTop(BorderStyle.THIN);
style.setBorderBottom(BorderStyle.THIN);
style.setBorderLeft(BorderStyle.THIN);
style.setBorderRight(BorderStyle.THIN);
} else if (wrap && vertical == VerticalAlignment.CENTER) {
// 参考文件的第二行信息区仅保留下边框。
style.setBorderBottom(BorderStyle.THIN);
}
return style;
}
}
private void writeRow(Row row, List<String> values) { private void writeRow(Row row, List<String> values) {
for (int i = 0; i < values.size(); i++) { for (int i = 0; i < values.size(); i++) {
row.createCell(i).setCellValue(values.get(i) == null ? "" : values.get(i)); row.createCell(i).setCellValue(values.get(i) == null ? "" : values.get(i));
......
...@@ -83,6 +83,20 @@ ...@@ -83,6 +83,20 @@
`preview=true` 上传并展示逐行校验结果,用户确认后用同一文件以 `preview=false` 再次提交。 `preview=true` 上传并展示逐行校验结果,用户确认后用同一文件以 `preview=false` 再次提交。
服务端只落库校验通过的行,单次最多500条、文件最大5MB。 服务端只落库校验通过的行,单次最多500条、文件最大5MB。
### 学员正式花名册格式
`accountType=STUDENT` 时,模板和导出文件使用“花名册”工作表以及正式职业技能认定申报表
版式。前4行为固定抬头和两级表头,数据从第5行开始,共21列:序号、姓名、性别、身份证号、
联系电话、人员类别1/2、劳动关系单位名称及代码、实际用工单位名称及代码、最高学历、专业、
社保缴金年限、相关职业工作年限、前一等级证书的职业/等级/编号/日期、申报资质条款、备注。
- 模板预置48个空白学员行;仅预置序号的行不会被识别为待导入数据。
- 姓名和手机号必填,其他字段允许为空;填写身份证、性别和人员类别时会执行格式校验。
- 身份证、手机号、组织机构代码和证书编号按文本编号处理,兼容Excel科学计数法显示。
- 花名册“等级”属于“所持前一等级证书信息”;当前培训等级仍由`classId`对应班级决定。
- 导出少于48人时保留完整空白表格,超过48人时自动扩展并下移签字、备注区。
- 教师和管理员继续使用原有5列精简模板及账户清单格式。
## 数据库 ## 数据库
发布前执行 `src/main/resources/sql/account_management.sql`。脚本新增账户状态、工号、结业/归档时间、 发布前执行 `src/main/resources/sql/account_management.sql`。脚本新增账户状态、工号、结业/归档时间、
......
...@@ -88,6 +88,61 @@ ...@@ -88,6 +88,61 @@
order by coalesce(u.create_time, u.update_time, u.login_date) desc, u.id desc order by coalesce(u.create_time, u.update_time, u.login_date) desc, u.id desc
</select> </select>
<!--
正式花名册不复用AccountAdminListVO,防止身份证和单位等敏感字段被分页接口一并返回。
下方筛选条件必须与selectAccounts保持相同;学员导出由服务层固定传入STUDENT和“学生”。
-->
<select id="selectStudentRosterRows"
resultType="com.platform.business.model.vo.AccountStudentRosterVO">
select
u.id,
u.nick_name as name,
u.sex,
u.id_card as idCard,
u.phone_number as phoneNumber,
u.user_type1 as userType1,
u.user_type2 as userType2,
u.company_name1 as companyName1,
u.company_code1 as companyCode1,
u.company_name2 as companyName2,
u.company_code2 as companyCode2,
u.highest_education as highestEducation,
u.major,
u.social_security_year as socialSecurityYear,
u.work_year as workYear,
u.occupation,
u.level as certificateLevel,
u.cert_no as certificateNo,
u.issue_date as issueDate,
u.qualification_clause as qualificationClause,
u.remark
from user u
<include refid="accountJoins"/>
where exists (
select 1 from phone_role pr
where pr.phone = u.phone_number and pr.role_name = #{broadRole}
)
<if test="query.keyword != null and query.keyword != ''">
and (u.nick_name like concat('%', #{query.keyword}, '%')
or u.phone_number like concat('%', #{query.keyword}, '%')
or u.username like concat('%', #{query.keyword}, '%')
or u.employee_no like concat('%', #{query.keyword}, '%'))
</if>
<if test="query.classId != null">
and c.id = #{query.classId}
</if>
<if test="query.status != null and query.status != ''">
and <include refid="statusExpression"/> = #{query.status}
</if>
<if test="query.startDate != null">and c.start_date &gt;= #{query.startDate}</if>
<if test="query.endDate != null">and c.end_date &lt;= #{query.endDate}</if>
<if test="query.archiveOverSixMonths == true">
and <include refid="statusExpression"/> = 'GRADUATED'
and coalesce(u.graduation_time, c.end_date) &lt;= #{sixMonthsAgo}
</if>
order by coalesce(u.create_time, u.update_time, u.login_date) desc, u.id desc
</select>
<select id="selectDetail" resultType="com.platform.business.model.vo.AccountAdminDetailVO"> <select id="selectDetail" resultType="com.platform.business.model.vo.AccountAdminDetailVO">
select select
u.id, u.id,
......
...@@ -23,6 +23,8 @@ class AccountAdminMapperXmlTest { ...@@ -23,6 +23,8 @@ class AccountAdminMapperXmlTest {
configuration.getSqlFragments()).parse(); configuration.getSqlFragments()).parse();
assertTrue(configuration.hasStatement( assertTrue(configuration.hasStatement(
"com.platform.business.mapper.AccountAdminMapper.selectAccounts")); "com.platform.business.mapper.AccountAdminMapper.selectAccounts"));
assertTrue(configuration.hasStatement(
"com.platform.business.mapper.AccountAdminMapper.selectStudentRosterRows"));
assertTrue(configuration.hasStatement( assertTrue(configuration.hasStatement(
"com.platform.business.mapper.AccountAdminMapper.selectDetail")); "com.platform.business.mapper.AccountAdminMapper.selectDetail"));
assertTrue(configuration.hasStatement( assertTrue(configuration.hasStatement(
......
package com.platform.business.service.impl;
import com.platform.business.mapper.AccountAdminMapper;
import com.platform.business.mapper.ClassMapper;
import com.platform.business.model.dto.AccountAdminQueryDTO;
import com.platform.business.model.entity.ClassEntity;
import com.platform.business.model.entity.ClassStudentEntity;
import com.platform.business.model.entity.SysPhoneRoleEntity;
import com.platform.business.model.entity.UserEntity;
import com.platform.business.model.vo.AccountAdminDetailVO;
import com.platform.business.model.vo.AccountImportResultVO;
import com.platform.business.model.vo.AccountStudentRosterVO;
import com.platform.business.service.ClassStudentService;
import com.platform.business.service.SysPhoneRoleService;
import com.platform.business.service.SysRoleService;
import com.platform.business.service.SysUserAndRoleService;
import com.platform.business.service.UserService;
import com.platform.business.utils.PasswordUtil;
import com.platform.exception.BusinessException;
import org.apache.poi.ss.usermodel.BorderStyle;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.Font;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockMultipartFile;
import org.springframework.test.util.ReflectionTestUtils;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/** 学员正式花名册模板、解析、持久化和导出的回归测试。 */
@ExtendWith(MockitoExtension.class)
class AccountAdminRosterExcelServiceTest {
@Mock
private AccountAdminMapper accountAdminMapper;
@Mock
private UserService userService;
@Mock
private SysPhoneRoleService phoneRoleService;
@Mock
private SysUserAndRoleService userRoleService;
@Mock
private SysRoleService roleService;
@Mock
private ClassStudentService classStudentService;
@Mock
private ClassMapper classMapper;
@Mock
private PasswordUtil passwordUtil;
private AccountAdminServiceImpl service;
@BeforeEach
void setUp() {
service = new AccountAdminServiceImpl();
ReflectionTestUtils.setField(service, "accountAdminMapper", accountAdminMapper);
ReflectionTestUtils.setField(service, "userService", userService);
ReflectionTestUtils.setField(service, "phoneRoleService", phoneRoleService);
ReflectionTestUtils.setField(service, "userRoleService", userRoleService);
ReflectionTestUtils.setField(service, "roleService", roleService);
ReflectionTestUtils.setField(service, "classStudentService", classStudentService);
ReflectionTestUtils.setField(service, "classMapper", classMapper);
ReflectionTestUtils.setField(service, "passwordUtil", passwordUtil);
}
@Test
void studentTemplateShouldMatchOfficialRosterStructureAndStyles() throws Exception {
byte[] bytes = downloadTemplate("STUDENT");
try (XSSFWorkbook workbook = new XSSFWorkbook(new ByteArrayInputStream(bytes))) {
Sheet sheet = workbook.getSheetAt(0);
assertEquals("花名册", sheet.getSheetName());
assertEquals("上海城投(集团)有限公司职业技能认定申报资质审核信息表",
sheet.getRow(0).getCell(0).getStringCellValue());
assertEquals("培养项目:污水处理工(污泥处理工)四级2025年1期",
sheet.getRow(1).getCell(11).getStringCellValue());
assertEquals("学员\n姓名", sheet.getRow(2).getCell(1).getStringCellValue());
assertEquals("职业(工种)", sheet.getRow(3).getCell(15).getStringCellValue());
assertTrue(hasMergedRegion(sheet, "A1:U1"));
assertTrue(hasMergedRegion(sheet, "F3:G3"));
assertTrue(hasMergedRegion(sheet, "P3:S3"));
assertTrue(hasMergedRegion(sheet, "A56:U56"));
assertEquals(4 * 256, sheet.getColumnWidth(0));
assertEquals(38.1f, sheet.getRow(0).getHeightInPoints(), 0.1f);
assertEquals(33f, sheet.getRow(4).getHeightInPoints(), 0.1f);
assertEquals(1d, sheet.getRow(4).getCell(0).getNumericCellValue());
assertEquals(48d, sheet.getRow(51).getCell(0).getNumericCellValue());
assertEquals("审核人签字:", sheet.getRow(54).getCell(0).getStringCellValue());
assertTrue(sheet.getRow(55).getCell(0).getStringCellValue().contains("2023版国标"));
Font titleFont = workbook.getFontAt(
sheet.getRow(0).getCell(0).getCellStyle().getFontIndex());
assertEquals("宋体", titleFont.getFontName());
assertEquals(28, titleFont.getFontHeightInPoints());
assertTrue(titleFont.getBold());
assertEquals(BorderStyle.THIN,
sheet.getRow(2).getCell(0).getCellStyle().getBorderTop());
assertEquals("@", sheet.getRow(4).getCell(3).getCellStyle().getDataFormatString());
}
}
@Test
void previewShouldParseAllTwentyOneColumnsAndNormalizeIdentifiers() throws Exception {
stubTargetClass();
MockMultipartFile file = rosterFile("1.3800138E10", false);
AccountImportResultVO result = service.importAccounts("STUDENT", 12, true, file, null);
assertEquals(1, result.getTotalCount());
assertEquals(1, result.getValidCount());
assertEquals(0, result.getInvalidCount());
assertEquals("13800138000", result.getRows().get(0).getPhoneNumber());
assertEquals("310101199001011234", result.getRows().get(0).getIdCard());
assertEquals("√", result.getRows().get(0).getUserType1());
assertEquals("上海城投污水处理有限公司", result.getRows().get(0).getCompanyName1());
assertEquals("五级", result.getRows().get(0).getCertificateLevel());
assertEquals("符合申报等级第1条", result.getRows().get(0).getQualificationClause());
}
@Test
void previewShouldRejectConflictingPersonCategoriesWithoutRejectingOptionalBlanks()
throws Exception {
stubTargetClass();
MockMultipartFile file = rosterFile("13800138000", true);
AccountImportResultVO result = service.importAccounts("STUDENT", 12, true, file, null);
assertEquals(0, result.getValidCount());
assertEquals(1, result.getInvalidCount());
assertTrue(result.getRows().get(0).getErrorMessage().contains("人员类别1和2不能同时勾选"));
}
@Test
void confirmedImportShouldPersistExtendedProfileAndKeepPreviousCertificateLevel()
throws Exception {
stubTargetClass();
when(passwordUtil.encodePassword(anyString())).thenReturn("encoded");
when(userService.save(any(UserEntity.class))).thenAnswer(invocation -> {
UserEntity user = invocation.getArgument(0);
user.setId("student-1");
return true;
});
when(phoneRoleService.count(any())).thenReturn(0L);
when(phoneRoleService.save(any(SysPhoneRoleEntity.class))).thenReturn(true);
when(classStudentService.remove(any())).thenReturn(true);
when(classStudentService.save(any(ClassStudentEntity.class))).thenReturn(true);
when(userRoleService.remove(any())).thenReturn(true);
AccountAdminDetailVO detail = new AccountAdminDetailVO();
detail.setId("student-1");
detail.setAccountType("STUDENT");
when(accountAdminMapper.selectDetail("student-1")).thenReturn(detail);
when(accountAdminMapper.selectAttendance("student-1")).thenReturn(Collections.emptyList());
when(accountAdminMapper.selectLoginLogs("student-1", 100)).thenReturn(Collections.emptyList());
AccountImportResultVO result = service.importAccounts(
"STUDENT", 12, false, rosterFile("13800138000", false), null);
assertEquals(1, result.getImportedCount());
ArgumentCaptor<UserEntity> userCaptor = ArgumentCaptor.forClass(UserEntity.class);
verify(userService).save(userCaptor.capture());
UserEntity saved = userCaptor.getValue();
assertEquals("310101199001011234", saved.getIdCard());
assertEquals("上海城投污水处理有限公司", saved.getCompanyName1());
assertEquals("91310115703235068A", saved.getCompanyCode1());
assertEquals("五级", saved.getLevel());
assertEquals("CERT-001", saved.getCertNo());
assertEquals("符合申报等级第1条", saved.getQualificationClause());
}
@Test
void studentExportShouldUseRosterQueryAndKeepMinimumFortyEightRows() throws Exception {
AccountStudentRosterVO roster = new AccountStudentRosterVO();
roster.setName("张三");
roster.setIdCard("310101199001011234");
roster.setPhoneNumber("13800138000");
roster.setCertificateLevel("五级");
roster.setCertificateNo("CERT-001");
when(accountAdminMapper.selectStudentRosterRows(any(AccountAdminQueryDTO.class),
anyString(), any(Date.class))).thenReturn(Collections.singletonList(roster));
AccountAdminQueryDTO query = new AccountAdminQueryDTO();
query.setAccountType("STUDENT");
MockHttpServletResponse response = new MockHttpServletResponse();
service.export(query, response);
try (XSSFWorkbook workbook = new XSSFWorkbook(
new ByteArrayInputStream(response.getContentAsByteArray()))) {
Sheet sheet = workbook.getSheet("花名册");
assertNotNull(sheet);
assertEquals("张三", sheet.getRow(4).getCell(1).getStringCellValue());
assertEquals(CellType.STRING, sheet.getRow(4).getCell(3).getCellType());
assertEquals("310101199001011234", sheet.getRow(4).getCell(3).getStringCellValue());
assertEquals("五级", sheet.getRow(4).getCell(16).getStringCellValue());
assertEquals("审核人签字:", sheet.getRow(54).getCell(0).getStringCellValue());
}
}
@Test
void studentExportShouldMoveSignatureAndNotesAfterMoreThanFortyEightRows() throws Exception {
List<AccountStudentRosterVO> rows = new ArrayList<>();
for (int i = 1; i <= 50; i++) {
AccountStudentRosterVO roster = new AccountStudentRosterVO();
roster.setName("学员" + i);
roster.setPhoneNumber(String.format("138%08d", i));
rows.add(roster);
}
when(accountAdminMapper.selectStudentRosterRows(any(AccountAdminQueryDTO.class),
anyString(), any(Date.class))).thenReturn(rows);
AccountAdminQueryDTO query = new AccountAdminQueryDTO();
query.setAccountType("STUDENT");
MockHttpServletResponse response = new MockHttpServletResponse();
service.export(query, response);
try (XSSFWorkbook workbook = new XSSFWorkbook(
new ByteArrayInputStream(response.getContentAsByteArray()))) {
Sheet sheet = workbook.getSheet("花名册");
assertEquals(50d, sheet.getRow(53).getCell(0).getNumericCellValue());
assertEquals("学员50", sheet.getRow(53).getCell(1).getStringCellValue());
// 50 条数据之后仍保留两行空白表格行,因此签字区从模板的第55行顺延到第57行。
assertEquals("审核人签字:", sheet.getRow(56).getCell(0).getStringCellValue());
assertTrue(sheet.getRow(57).getCell(0).getStringCellValue().contains("2023版国标"));
assertTrue(hasMergedRegion(sheet, "A58:U58"));
}
}
@Test
void studentImportShouldRejectMoreThanFiveHundredDataRows() throws Exception {
stubTargetClass();
MockMultipartFile file = rosterFileWithRows(501);
BusinessException exception = assertThrows(BusinessException.class,
() -> service.importAccounts("STUDENT", 12, true, file, null));
assertTrue(exception.getMessage().contains("500"));
}
@Test
void teacherTemplateShouldRemainTheOriginalFiveColumnFormat() throws Exception {
try (XSSFWorkbook workbook = new XSSFWorkbook(
new ByteArrayInputStream(downloadTemplate("TEACHER")))) {
Sheet sheet = workbook.getSheet("账户导入");
assertNotNull(sheet);
assertEquals("姓名", sheet.getRow(0).getCell(0).getStringCellValue());
assertEquals("工号", sheet.getRow(0).getCell(1).getStringCellValue());
assertEquals("手机号", sheet.getRow(0).getCell(2).getStringCellValue());
assertEquals("角色", sheet.getRow(0).getCell(3).getStringCellValue());
assertEquals("备注", sheet.getRow(0).getCell(4).getStringCellValue());
assertFalse(hasMergedRegion(sheet, "A1:U1"));
}
}
private byte[] downloadTemplate(String type) {
MockHttpServletResponse response = new MockHttpServletResponse();
service.downloadTemplate(type, response);
return response.getContentAsByteArray();
}
private void stubTargetClass() {
ClassEntity clazz = new ClassEntity();
clazz.setId(12);
clazz.setLevel("4");
when(classMapper.selectById(12)).thenReturn(clazz);
}
/**
* 基于服务真实下载的空模板构造合成数据,既验证模板可回读,也避免把参考文件中的
* 身份证和手机号等个人信息作为测试夹具提交到仓库。
*/
private MockMultipartFile rosterFile(String phone, boolean conflictingCategories)
throws Exception {
byte[] template = downloadTemplate("STUDENT");
try (XSSFWorkbook workbook = new XSSFWorkbook(new ByteArrayInputStream(template));
ByteArrayOutputStream output = new ByteArrayOutputStream()) {
Row row = workbook.getSheet("花名册").getRow(4);
String[] values = {
"张三", "男", "310101199001011234", phone, "√",
conflictingCategories ? "√" : "", "上海城投污水处理有限公司",
"91310115703235068A", "石洞口污水处理厂", "91310115703235068A",
"本科", "环境工程", "10.5", "6.5", "污水处理工", "五级",
"CERT-001", "2024-01-01", "符合申报等级第1条", "测试备注"
};
for (int i = 0; i < values.length; i++) {
row.getCell(i + 1).setCellValue(values[i]);
}
workbook.write(output);
return new MockMultipartFile("file", "花名册.xlsx",
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
output.toByteArray());
}
}
/** 构造超过上限的合成花名册;移除页脚合并区后再将原页脚行复用为普通数据行。 */
private MockMultipartFile rosterFileWithRows(int rowCount) throws Exception {
byte[] template = downloadTemplate("STUDENT");
try (XSSFWorkbook workbook = new XSSFWorkbook(new ByteArrayInputStream(template));
ByteArrayOutputStream output = new ByteArrayOutputStream()) {
Sheet sheet = workbook.getSheet("花名册");
for (int i = sheet.getNumMergedRegions() - 1; i >= 0; i--) {
if (sheet.getMergedRegion(i).getFirstRow() >= 54) {
sheet.removeMergedRegion(i);
}
}
for (int i = 0; i < rowCount; i++) {
int rowIndex = i + 4;
Row row = sheet.getRow(rowIndex);
if (row == null) {
row = sheet.createRow(rowIndex);
}
row.createCell(0).setCellValue(i + 1);
row.createCell(1).setCellValue("学员" + (i + 1));
row.createCell(4).setCellValue(String.format("138%08d", i + 1));
}
workbook.write(output);
return new MockMultipartFile("file", "花名册-501条.xlsx",
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
output.toByteArray());
}
}
private boolean hasMergedRegion(Sheet sheet, String reference) {
return sheet.getMergedRegions().stream()
.map(CellRangeAddress::formatAsString)
.anyMatch(reference::equals);
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment