导出模块的bug

beetlsql3-dev
Mlxa0324 2 years ago
parent e3dc12381c
commit ac3ed8b281

@ -1,5 +1,6 @@
package com.ibeetl.admin.core.util.excelGroupValidation; package com.ibeetl.admin.core.util.excelGroupValidation;
import cn.hutool.core.util.ReUtil;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.usermodel.*;
@ -159,6 +160,7 @@ public class ExcelUtil {
String format = "%s!$%s$%s:$%s$%s"; String format = "%s!$%s$%s:$%s$%s";
// 创建名称管理器 // 创建名称管理器
Name name = workbook.createName(); Name name = workbook.createName();
nameString = replaceNameName(nameString);
name.setNameName(nameString); name.setNameName(nameString);
String cellColumnFlag = getCellColumnFlag(columnIndex + 2); String cellColumnFlag = getCellColumnFlag(columnIndex + 2);
int nameManageRegan = CollectionUtils.isEmpty(data) ? 1 : data.size() + 1; int nameManageRegan = CollectionUtils.isEmpty(data) ? 1 : data.size() + 1;
@ -172,6 +174,16 @@ public class ExcelUtil {
} }
} }
/**
* poiname
* @param nameName
* @return
*/
public static String replaceNameName(String nameName) {
// 首字母必须是中文,支持有限的符号
return ReUtil.get("[\\u4e00-\\u9fa5]+[_0-9]*", nameName, 0);
}
private static String getCellColumnFlag(int num) { private static String getCellColumnFlag(int num) {
String colFiled = ""; String colFiled = "";
int chuNum = 0; int chuNum = 0;

@ -11,6 +11,8 @@ import org.apache.poi.xssf.usermodel.XSSFDataValidation;
import java.util.Map; import java.util.Map;
import static com.ibeetl.admin.core.util.excelGroupValidation.ExcelUtil.replaceNameName;
/** /**
* easyExcel, * easyExcel,
* *
@ -56,6 +58,7 @@ public class ExcelSelectorDataWriteHandler implements SheetWriteHandler {
hidden.createRow(endRow + i).createCell(k).setCellValue(deptList[i]); hidden.createRow(endRow + i).createCell(k).setCellValue(deptList[i]);
} }
Name category1Name = workbook.createName(); Name category1Name = workbook.createName();
hiddenName = replaceNameName(hiddenName);
category1Name.setNameName(hiddenName); category1Name.setNameName(hiddenName);
//3 A1:A代表隐藏域创建第N列createCell(N)时。以A1列开始A行数据获取下拉数组 //3 A1:A代表隐藏域创建第N列createCell(N)时。以A1列开始A行数据获取下拉数组
category1Name.setRefersToFormula(hiddenName + "!A2:A" + (deptList.length + endRow)); category1Name.setRefersToFormula(hiddenName + "!A2:A" + (deptList.length + endRow));

@ -3,7 +3,7 @@ package com.ibeetl.jlw.entity.vo;
import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.entity.BaseEntity;
import com.ibeetl.jlw.entity.CourseInfo; import com.ibeetl.jlw.entity.CourseInfo;
import lombok.Data; import lombok.Data;
import org.beetl.sql.annotation.entity.AssignID; import org.beetl.sql.annotation.entity.Auto;
import org.beetl.sql.annotation.entity.Table; import org.beetl.sql.annotation.entity.Table;
import org.beetl.sql.fetch.annotation.Fetch; import org.beetl.sql.fetch.annotation.Fetch;
import org.beetl.sql.fetch.annotation.FetchSql; import org.beetl.sql.fetch.annotation.FetchSql;
@ -28,13 +28,13 @@ import static com.ibeetl.admin.core.util.StreamUtils.listJoin;
*/ */
@Data @Data
@Fetch @Fetch
@Table(name = "course_info", assignID = true) @Table(name = "course_info")
public class ResourcesCourseInfoAuthDetailsVO extends BaseEntity { public class ResourcesCourseInfoAuthDetailsVO extends BaseEntity {
/** /**
* *
*/ */
@AssignID @Auto
private Long courseInfoId; private Long courseInfoId;
/** /**

@ -56,6 +56,7 @@ import java.util.*;
import static cn.hutool.core.util.ArrayUtil.join; import static cn.hutool.core.util.ArrayUtil.join;
import static cn.hutool.core.util.ObjectUtil.defaultIfNull; import static cn.hutool.core.util.ObjectUtil.defaultIfNull;
import static cn.jlw.util.excel.ExcelUtil.standardName; import static cn.jlw.util.excel.ExcelUtil.standardName;
import static com.ibeetl.admin.core.util.excelGroupValidation.ExcelUtil.replaceNameName;
/** /**
* ResourcesQuestion * ResourcesQuestion
@ -458,6 +459,7 @@ public class ResourcesQuestionController{
String range = getRange(1, rowId, son.size()); String range = getRange(1, rowId, son.size());
Name name = workbook.createName(); Name name = workbook.createName();
// key不可重复 // key不可重复
key = replaceNameName(key);
name.setNameName(key); name.setNameName(key);
String formula = "课程章节信息!" + range; String formula = "课程章节信息!" + range;
name.setRefersToFormula(formula); name.setRefersToFormula(formula);

@ -70,6 +70,7 @@ import static com.ibeetl.admin.console.service.OrgConsoleService.setObjectOrgId;
import static com.ibeetl.admin.core.util.ExcelUtil.convertData; import static com.ibeetl.admin.core.util.ExcelUtil.convertData;
import static com.ibeetl.admin.core.util.ExcelUtil.write; import static com.ibeetl.admin.core.util.ExcelUtil.write;
import static com.ibeetl.admin.core.util.excelGroupValidation.ExcelUtil.createExcel; import static com.ibeetl.admin.core.util.excelGroupValidation.ExcelUtil.createExcel;
import static com.ibeetl.admin.core.util.excelGroupValidation.ExcelUtil.replaceNameName;
import static com.ibeetl.admin.core.web.JsonReturnCode.DIY_ERROR; import static com.ibeetl.admin.core.web.JsonReturnCode.DIY_ERROR;
import static com.ibeetl.jlw.web.IpAddressController.ipAddressMap; import static com.ibeetl.jlw.web.IpAddressController.ipAddressMap;
import static java.util.function.UnaryOperator.identity; import static java.util.function.UnaryOperator.identity;
@ -2501,6 +2502,7 @@ public class StudentController extends BaseController{
String range = getRange(1, rowId, son.size()); String range = getRange(1, rowId, son.size());
Name name = workbook.createName(); Name name = workbook.createName();
// key不可重复 // key不可重复
key = replaceNameName(key);
name.setNameName(key); name.setNameName(key);
String formula = "院校及班级信息!" + range; String formula = "院校及班级信息!" + range;
name.setRefersToFormula(formula); name.setRefersToFormula(formula);

Loading…
Cancel
Save