diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/base/controller/JeroController.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/base/controller/JeroController.java index 603b1185..fac59e3e 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/base/controller/JeroController.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/base/controller/JeroController.java @@ -167,7 +167,6 @@ public class JeroController> { // Step.1 组装查询条件 // Step.2 获取导出数据 List pageList = service.list(queryWrapper); - // Step.3 AutoPoi 导出Excel ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); //此处设置的filename无效 ,前端会重更新设置一下 @@ -181,7 +180,7 @@ public class JeroController> { mv.addObject(NormalExcelConstants.DATA_LIST, pageList); return mv; } - + /** * 通过excel获取导入数据 * diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java index ab85715e..ab150c17 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java @@ -8,6 +8,7 @@ import javax.validation.Valid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; @@ -16,13 +17,19 @@ import com.jero.common.system.query.QueryGenerator; import com.jero.data.entity.DTO.PayCaseCommitteeDTO; import com.jero.data.entity.DTO.PayCaseCommitteeUpdateDTO; import com.jero.data.entity.PayCaseCommittee; +import com.jero.data.entity.PayCaseCommitteeExcel; +import com.jero.data.entity.VO.payCaseCommitteeSubitemVO; import com.jero.data.mapper.PayCaseCommitteeSubitemMapper; import com.jero.data.service.IPayCaseCommitteeService; import com.jero.data.entity.PayCaseCommitteeSubitem; import com.jero.data.service.IPayCaseCommitteeSubitemService; import lombok.extern.slf4j.Slf4j; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -40,8 +47,12 @@ import io.swagger.annotations.ApiOperation; @RequestMapping("/payCaseCommittee/payCaseCommittee") @Slf4j public class PayCaseCommitteeController extends JeroController { + @Value("${jero.path.upload}") + private String upLoadPath; + @Autowired private IPayCaseCommitteeService payCaseCommitteeService; + @Autowired private IPayCaseCommitteeSubitemService payCaseCommitteeSubitemService; @@ -142,15 +153,29 @@ public class PayCaseCommitteeController extends JeroController queryWrapper = Wrappers.query(); + List list = payCaseCommitteeSubitemMapper.listExcel(queryWrapper); + // Step.3 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + mv.addObject(NormalExcelConstants.FILE_NAME, "分标委表"); //此处设置的filename无效 ,前端会重更新设置一下 + mv.addObject(NormalExcelConstants.CLASS, PayCaseCommitteeExcel.class); + //update-begin--Author:liusq Date:20210126 for:图片导出报错,ImageBasePath未设置-------------------- + ExportParams exportParams=new ExportParams("分标委表", "分标委表"); + exportParams.setImageBasePath(upLoadPath); + //update-end--Author:liusq Date:20210126 for:图片导出报错,ImageBasePath未设置---------------------- + mv.addObject(NormalExcelConstants.PARAMS,exportParams); + mv.addObject(NormalExcelConstants.DATA_LIST, list); + return mv; } + + + // /** // * 批量删除 // * diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java index 9f92555e..23a86d8b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java @@ -2,9 +2,11 @@ package com.jero.data.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.data.entity.PayCaseCommitteeExcel; import com.jero.data.entity.PayCaseCommitteeSubitem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jero.data.entity.VO.payCaseCommitteeSubitemVO; @@ -25,5 +27,8 @@ public interface PayCaseCommitteeSubitemMapper extends BaseMapper list (IPage page, @Param(Constants.WRAPPER) Wrapper wrapper); List list2 (@Param(Constants.WRAPPER) Wrapper wrapper); + + List listExcel(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml index 9ff5fb3a..7a795ce7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml @@ -30,4 +30,13 @@ left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id) ${ew.customSqlSegment} + + \ No newline at end of file