JeroBoot/base
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-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformApiController.java
+7 -4
View File
@@ -17,6 +17,7 @@ import com.jero.common.util.BrowserUtils;
import com.jero.common.util.SpringContextUtils;
import com.jero.common.util.TokenUtils;
import com.jero.common.util.oConvertUtils;
import com.jero.config.easypoi.EasyPoiDictHandlerImpl;
import com.jero.generater.modules.online.auth.service.IOnlAuthPageService;
import com.jero.generater.modules.online.cgform.converter.ConvertUtil;
import com.jero.generater.modules.online.cgform.entity.OnlCgformEnhanceJs;
@@ -566,8 +567,9 @@ public class OnlCgformApiController {
}
List<ExcelExportEntity> var14 = getExcelExportEntities(var4, var7, fieldList, var12);
Workbook var33 = ExcelExportUtil.exportExcel(new ExportParams(null, var5), var14, var12);
ExportParams exportParams = new ExportParams(null, var5);
exportParams.setDictHandler(SpringContextUtils.getApplicationContext().getBean(EasyPoiDictHandlerImpl.class));
Workbook var33 = ExcelExportUtil.exportExcel(exportParams, var14, var12);
ServletOutputStream var34 = null;
getVar3(var2, var3, var4, var33, var34);
@@ -659,8 +661,9 @@ public class OnlCgformApiController {
while (var53.hasNext()) {
Entry<String, MultipartFile> var20 = var53.next();
MultipartFile var21 = var20.getValue();
ImportParams var22 = new ImportParams();
List<Map<String, Object>> var23 = ExcelImportUtil.importExcel(var21.getInputStream(), Map.class, var22);
ImportParams params = new ImportParams();
params.setDictHandler(SpringContextUtils.getApplicationContext().getBean(EasyPoiDictHandlerImpl.class));
List<Map<String, Object>> var23 = ExcelImportUtil.importExcel(var21.getInputStream(), Map.class, params);
if (var23 != null) {
Object var24 = "";
ArrayList<Map<String, Object>> var25 = new ArrayList<>();
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportAPI.java
+7 -2
View File
@@ -13,7 +13,9 @@ import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.vo.DictModel;
import com.jero.common.system.vo.DynamicDataSourceModel;
import com.jero.common.util.BrowserUtils;
import com.jero.common.util.SpringContextUtils;
import com.jero.common.util.oConvertUtils;
import com.jero.config.easypoi.EasyPoiDictHandlerImpl;
import com.jero.generater.modules.online.cgreport.entity.OnlCgreportHead;
import com.jero.generater.modules.online.cgreport.entity.OnlCgreportItem;
import com.jero.generater.modules.online.cgreport.entity.OnlCgreportParam;
@@ -452,13 +454,16 @@ public class OnlCgreportAPI {
var42 = new String(var4.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1);
var3.setHeader("content-disposition", "attachment;filename=" + var42 + ".xls");
}
Workbook var44 = ExcelExportUtil.exportExcel(new ExportParams(null, var5), var13, var9);
ExportParams exportParams = new ExportParams(null, var5);
exportParams.setDictHandler(SpringContextUtils.getApplicationContext().getBean(EasyPoiDictHandlerImpl.class));
Workbook var44 = ExcelExportUtil.exportExcel(exportParams, var13, var9);
var41 = var3.getOutputStream();
var44.write(var41);
} catch (Exception var33) {
log.error("异常",var33);
} finally {
try {
if(var41 != null){var41.flush();var41.close();}
} catch (Exception var32) {