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 ea2afb12..8906ce09 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 @@ -95,6 +95,7 @@ public class JeroController> { ExportParams exportParams=new ExportParams(title, title); // 导出xlsx exportParams.setType(ExcelType.XSSF); + exportParams.setImageBasePath(upLoadPath); mv.addObject(NormalExcelConstants.PARAMS,exportParams); mv.addObject(NormalExcelConstants.DATA_LIST, object); return mv; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 2ea06f7e..7be8b115 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -48,6 +48,8 @@ import com.jero.meeting.service.IPayMeetingSituationService; import com.jero.meeting.valid.group.*; import com.jero.meeting.vo.*; import com.jero.meeting.vo.excel.*; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; import com.jero.pack.entity.PayPackCompanyProject; import com.jero.pack.service.IPayPackCompanyProjectService; import com.jero.payment.entity.PayPaymentRecord; @@ -64,8 +66,10 @@ import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.jetbrains.annotations.NotNull; import org.springframework.beans.BeanUtils; +import org.springframework.core.env.Environment; import org.springframework.stereotype.Service; +import java.io.File; import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; @@ -122,6 +126,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl