From 817255e18c06eb9279c7290d17f5b346b982ac9e Mon Sep 17 00:00:00 2001 From: zhangqinlin <1500920753@qq.com> Date: Wed, 15 Sep 2021 16:21:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A5=A8=E6=8D=AE=E9=82=AE=E5=AF=84=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayFileDownloadRecordController.java | 24 ++----------- .../controller/PayMailBillController.java | 34 +++++++++++++++---- .../com/jero/mail/entity/PayMailBill.java | 2 +- 3 files changed, 32 insertions(+), 28 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayFileDownloadRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayFileDownloadRecordController.java index 11c26047..480f7908 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayFileDownloadRecordController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayFileDownloadRecordController.java @@ -24,6 +24,7 @@ import com.jero.data.entity.*; import com.jero.data.service.IPayFileDownloadRecordService; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; +import com.jero.util.AmountUtil; import lombok.extern.slf4j.Slf4j; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -156,16 +157,7 @@ public class PayFileDownloadRecordController extends JeroController queryWrapper = Wrappers.query(); List list = payFileDownloadRecordService.list(queryWrapper); - ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - mv.addObject(NormalExcelConstants.FILE_NAME, "资料下载记录"); //此处设置的filename无效 ,前端会重更新设置一下 - mv.addObject(NormalExcelConstants.CLASS, PayFileDownloadRecord.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; + return AmountUtil.exportListXls(list,PayFileDownloadRecord.class,"资料下载记录"); }else { ArrayList strings = new ArrayList<>(Arrays.asList(ids.split(","))); ArrayList list = new ArrayList<>(); @@ -173,19 +165,9 @@ public class PayFileDownloadRecordController extends JeroController objectLambdaQueryWrapper = new LambdaQueryWrapper<>(); objectLambdaQueryWrapper.eq(StringUtils.isNotBlank(ids), PayFileDownloadRecord::getId, id); PayFileDownloadRecord one = payFileDownloadRecordService.getOne(objectLambdaQueryWrapper, false); - // Step.3 AutoPoi 导出Excelaw list.add(one); } - ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - mv.addObject(NormalExcelConstants.FILE_NAME, "资料下载记录"); //此处设置的filename无效 ,前端会重更新设置一下 - mv.addObject(NormalExcelConstants.CLASS, PayFileDownloadRecord.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; + return AmountUtil.exportListXls(list,PayFileDownloadRecord.class,"资料下载记录"); } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java index 41e50add..8990e5c0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java @@ -2,8 +2,11 @@ package com.jero.mail.controller; import java.security.PrivateKey; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Arrays; import java.util.Date; +import java.util.List; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -12,6 +15,8 @@ import com.alibaba.fastjson.JSONObject; 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.StringUtils; +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.service.ProjectDetailService; @@ -21,6 +26,7 @@ import com.jero.common.vo.ProjectDetailVO; import com.jero.company.entity.PayContactsManagement; import com.jero.company.mapper.PayContactsManagementMapper; import com.jero.company.service.IPayContactsManagementService; +import com.jero.data.entity.PayFileDownloadRecord; import com.jero.mail.entity.PayMailBill; import com.jero.mail.entity.PayMailBillProject; import com.jero.mail.entity.PayMailBillSearch; @@ -28,6 +34,7 @@ import com.jero.mail.service.IPayMailBillProjectService; import com.jero.mail.service.IPayMailBillService; import com.jero.member.entity.PayMemberProjectSubitem; import com.jero.member.service.IPayMemberProjectSubitemService; +import com.jero.util.AmountUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; @@ -194,15 +201,30 @@ public class PayMailBillController extends JeroController queryWrapper = Wrappers.query(); + List list = payMailBillService.list(queryWrapper); + return AmountUtil.exportListXls(list,PayMailBill.class,"邮寄票据"); + }else { + ArrayList strings = new ArrayList<>(Arrays.asList(ids.split(","))); + ArrayList list = new ArrayList<>(); + for (String id : strings) { + LambdaQueryWrapper objectLambdaQueryWrapper = new LambdaQueryWrapper<>(); + objectLambdaQueryWrapper.eq(StringUtils.isNotBlank(ids), PayMailBill::getId, id); + PayMailBill one = payMailBillService.getOne(objectLambdaQueryWrapper, false); + list.add(one); + } + return AmountUtil.exportListXls(list,PayMailBill.class,"邮寄票据"); + } + + +// Date day=new Date(); +// SimpleDateFormat df = new SimpleDateFormat("yyyy年MM月dd日HH时mm分ss秒"); +// return super.exportXls(request, payMailBill, PayMailBill.class, df.format(day).toString()+"邮寄票据信息"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java index 5f991963..552d8136 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java @@ -66,7 +66,7 @@ public class PayMailBill implements Serializable { private BigDecimal invoiceAmount; /**邮寄状态(0:未邮寄，1::已邮寄)*/ @Dict(dicCode = "mail_type") - @Excel(name = "邮寄状态(0:未邮寄，1::已邮寄)", width = 15) + @Excel(name = "邮寄状态", width = 15,dicCode = "mail_type") @ApiModelProperty(value = "邮寄状态(0:未邮寄，1::已邮寄)") private java.lang.Integer postStatus; /**快递公司(1:EMS,2:顺丰)*/