LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改bug#40944

Browse Source
This commit is contained in:
梁琦涛
2021-10-19 16:14:02 +08:00
parent 3a438e26d7
commit cb81762f39
5 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/base/controller/JeroController.java
+17 -2
View File
@@ -16,6 +16,7 @@ import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -75,6 +76,8 @@ public class JeroController<T, S extends IService<T>> {
//update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
ExportParams exportParams=new ExportParams(title, title);
exportParams.setImageBasePath(upLoadPath);
// 导出xlsx
exportParams.setType(ExcelType.XSSF);
//update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
mv.addObject(NormalExcelConstants.PARAMS,exportParams);
mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
@@ -92,7 +95,10 @@ public class JeroController<T, S extends IService<T>> {
//此处设置的filename无效 ,前端会重更新设置一下
mv.addObject(NormalExcelConstants.FILE_NAME, title);
mv.addObject(NormalExcelConstants.CLASS, clazz);
mv.addObject(NormalExcelConstants.PARAMS,new ExportParams(title, title));
ExportParams exportParams=new ExportParams(title, title);
// 导出xlsx
exportParams.setType(ExcelType.XSSF);
mv.addObject(NormalExcelConstants.PARAMS,exportParams);
mv.addObject(NormalExcelConstants.DATA_LIST, object);
return mv;
}
@@ -104,6 +110,10 @@ public class JeroController<T, S extends IService<T>> {
*/
protected ModelAndView exportXls(HttpServletRequest request, T object, Class<T> clazz, String title,String exportFields) {
ModelAndView mv = this.exportXls(request,object,clazz,title);
ExportParams exportParams=new ExportParams(title, title);
// 导出xlsx
exportParams.setType(ExcelType.XSSF);
mv.addObject(NormalExcelConstants.PARAMS,exportParams);
mv.addObject(NormalExcelConstants.EXPORT_FIELDS,exportFields);
return mv;
}
@@ -175,7 +185,10 @@ public class JeroController<T, S extends IService<T>> {
//此处设置的filename无效 ,前端会重更新设置一下
mv.addObject(NormalExcelConstants.FILE_NAME, title);
mv.addObject(NormalExcelConstants.CLASS, exportClass);
mv.addObject(NormalExcelConstants.PARAMS, new ExportParams(title, title));
ExportParams exportParams=new ExportParams(title, title);
// 导出xlsx
exportParams.setType(ExcelType.XSSF);
mv.addObject(NormalExcelConstants.PARAMS,exportParams);
mv.addObject(NormalExcelConstants.DATA_LIST, new ArrayList<T>());
return mv;
}
@@ -196,6 +209,8 @@ public class JeroController<T, S extends IService<T>> {
//update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
ExportParams exportParams=new ExportParams(title, title);
exportParams.setImageBasePath(upLoadPath);
// 导出xlsx
exportParams.setType(ExcelType.XSSF);
//update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
mv.addObject(NormalExcelConstants.PARAMS,exportParams);
mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java
+2
View File
@@ -42,6 +42,7 @@ import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.core.env.Environment;
import org.springframework.web.bind.annotation.*;
@@ -595,6 +596,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
//update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
ExportParams exportParams=new ExportParams("企业信息", "企业信息");
exportParams.setImageBasePath(env.getProperty("jero.path.upload"));
exportParams.setType(ExcelType.XSSF);
//update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
mv.addObject(NormalExcelConstants.PARAMS,exportParams);
mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+2
View File
@@ -37,6 +37,7 @@ import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.env.Environment;
@@ -646,6 +647,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
//update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
ExportParams exportParams=new ExportParams("联系人信息", "联系人信息");
exportParams.setImageBasePath(env.getProperty("jero.path.upload"));
exportParams.setType(ExcelType.XSSF);
//update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
mv.addObject(NormalExcelConstants.PARAMS,exportParams);
mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java
+2
View File
@@ -35,6 +35,7 @@ import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecgframework.poi.excel.def.MapExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity;
import org.jeecgframework.poi.excel.view.JeecgMapExcelView;
import org.springframework.core.env.Environment;
@@ -624,6 +625,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
//update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
ExportParams exportParams=new ExportParams("收入合同", "收入合同");
exportParams.setImageBasePath(env.getProperty("jero.path.upload"));
exportParams.setType(ExcelType.XSSF);
//update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
mv.addObject(MapExcelConstants.PARAMS,exportParams);
mv.addObject(MapExcelConstants.MAP_LIST, list);
jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java
+2
View File
@@ -33,6 +33,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecgframework.poi.excel.def.MapExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity;
import org.jeecgframework.poi.excel.view.JeecgMapExcelView;
import org.springframework.beans.factory.annotation.Autowired;
@@ -346,6 +347,7 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
//update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
ExportParams exportParams=new ExportParams("支出合同", "支出合同");
exportParams.setImageBasePath(env.getProperty("jero.path.upload"));
exportParams.setType(ExcelType.XSSF);
//update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
mv.addObject(MapExcelConstants.PARAMS,exportParams);
mv.addObject(MapExcelConstants.MAP_LIST, list);