diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralHistoryInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralHistoryInfoController.java index aac9c20..0504622 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralHistoryInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralHistoryInfoController.java @@ -74,14 +74,13 @@ public class BusIntegralHistoryInfoController extends BaseController // @PreAuthorize("@ss.hasPermi('integral:integral:export')") @Log(title = "帐分历史快照", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, BusIntegralHistoryInfo busIntegralHistoryInfo) + public void export(HttpServletResponse response, String account, String expStartTime, String expEndTime) { - if(!"admin".equals(SecurityUtils.getLoginUser().getUsername())){ - busIntegralHistoryInfo.setAccount(SecurityUtils.getLoginUser().getUsername()); - } - List list = busIntegralHistoryInfoService.selectBusIntegralHistoryInfoList(busIntegralHistoryInfo); + expStartTime = expStartTime + " 00:00:00"; + expEndTime = expEndTime + " 23:59:59"; + List list = busIntegralHistoryInfoService.selectBusIntegralHistoryInfoList1(account, expStartTime,expEndTime); ExcelUtil util = new ExcelUtil(BusIntegralHistoryInfo.class); - util.exportExcel(response, list, "帐分历史快照数据"); + util.exportExcel(response, list, expEndTime,"帐分历史快照数据"+expEndTime); } /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusIntegralHistoryInfo.java b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusIntegralHistoryInfo.java index 3414c7d..c3bc079 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusIntegralHistoryInfo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusIntegralHistoryInfo.java @@ -1,10 +1,13 @@ package com.ruoyi.business.domain; +import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import java.util.Date; + /** * 帐分历史快照对象 bus_integral_history_info * @@ -38,6 +41,11 @@ public class BusIntegralHistoryInfo extends BaseEntity @Excel(name = "sms帐分") private Integer integralBalance; + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "快照时间", dateFormat = "yyyy-MM-dd") + private Date createTime; + + public void setId(Long id) { this.id = id; @@ -93,6 +101,16 @@ public class BusIntegralHistoryInfo extends BaseEntity return integralBalance; } + @Override + public Date getCreateTime() { + return createTime; + } + + @Override + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-ui/src/views/statistics/integral/index.vue b/ruoyi-ui/src/views/statistics/integral/index.vue index ec95ea1..ee72bd3 100644 --- a/ruoyi-ui/src/views/statistics/integral/index.vue +++ b/ruoyi-ui/src/views/statistics/integral/index.vue @@ -24,9 +24,16 @@ 搜索 重置 + 导出 - + @@ -41,16 +48,16 @@ - - - - - - - - - - +