KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

全面修复和测试引入easypoi的bug，处理dict转换问题

Browse Source
This commit is contained in:
lixuetao
2023-11-18 13:45:38 +08:00
parent b84fded287
commit 1a0d0a2c08
23 changed files with 207 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroOrderMainController.java
+7 -1
View File
@@ -7,6 +7,8 @@ import com.jero.common.api.vo.Results;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.SpringContextUtils;
import com.jero.config.easypoi.EasyPoiDictHandlerImpl;
import com.jero.modules.demo.test.entity.JeroOrderCustomer;
import com.jero.modules.demo.test.entity.JeroOrderMain;
import com.jero.modules.demo.test.entity.JeroOrderTicket;
@@ -202,7 +204,10 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
// 注解对象Class
mv.addObject(CLASS, JeroOrderMainPage.class);
// 自定义表格参数
mv.addObject(PARAMS, new ExportParams("自定义导出Excel内容标题", "导出人:" + sysUser.getRealname(), "自定义Sheet名字"));
ExportParams exportParams = new ExportParams("自定义导出Excel内容标题", "导出人:" + sysUser.getRealname(), "自定义Sheet名字");
exportParams.setDictHandler(SpringContextUtils.getApplicationContext().getBean(EasyPoiDictHandlerImpl.class));
mv.addObject(PARAMS, exportParams);
// 导出数据列表
mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
return mv;
@@ -223,6 +228,7 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
MultipartFile file = entity.getValue();// 获取上传文件对象
ImportParams params = new ImportParams();
params.setDictHandler(SpringContextUtils.getApplicationContext().getBean(EasyPoiDictHandlerImpl.class));
params.setTitleRows(2);
params.setHeadRows(2);
params.setNeedSave(true);
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JoaDemoController.java
+6 -1
View File
@@ -8,7 +8,9 @@ import com.jero.common.api.vo.Results;
import com.jero.common.api.vo.ResultConstant;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.SpringContextUtils;
import com.jero.common.util.oConvertUtils;
import com.jero.config.easypoi.EasyPoiDictHandlerImpl;
import com.jero.modules.demo.test.entity.JoaDemo;
import com.jero.modules.demo.test.service.IJoaDemoService;
import org.apache.commons.lang.StringUtils;
@@ -186,7 +188,9 @@ public class JoaDemoController {
//导出文件名称
mv.addObject(JeroController.FILE_NAME, "流程测试列表");
mv.addObject(JeroController.CLASS, JoaDemo.class);
mv.addObject(JeroController.PARAMS, new ExportParams("流程测试列表数据", "导出人:Jero", "导出信息"));
ExportParams exportParams = new ExportParams("流程测试列表数据", "导出人:Jero", "导出信息");
exportParams.setDictHandler(SpringContextUtils.getApplicationContext().getBean(EasyPoiDictHandlerImpl.class));
mv.addObject(JeroController.PARAMS, exportParams);
mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
return mv;
}
@@ -206,6 +210,7 @@ public class JoaDemoController {
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
MultipartFile file = entity.getValue();// 获取上传文件对象
ImportParams params = new ImportParams();
params.setDictHandler(SpringContextUtils.getApplicationContext().getBean(EasyPoiDictHandlerImpl.class));
params.setTitleRows(2);
params.setHeadRows(1);
params.setNeedSave(true);