From a6979500057ab74ebd6788f66754c6fa96e14969 Mon Sep 17 00:00:00 2001 From: wangshuai Date: Mon, 5 Aug 2024 18:37:51 +0800 Subject: [PATCH] =?UTF-8?q?1;=20=E7=A7=AF=E5=88=86=E6=B6=88=E8=80=97?= =?UTF-8?q?=E5=8A=A0=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusIntegralConsumeController.java | 22 +++++++++++++++++-- .../business/domain/BusIntegralRecord.java | 15 ++++++++----- ruoyi-ui/src/views/point/consume/index.vue | 22 +++++++++---------- 3 files changed, 41 insertions(+), 18 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralConsumeController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralConsumeController.java index e3f1abb..c70ba92 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralConsumeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralConsumeController.java @@ -93,12 +93,30 @@ public class BusIntegralConsumeController extends BaseController /** * 导出积分变更记录列表 */ - @PreAuthorize("@ss.hasPermi('system:consume:export')") +// @PreAuthorize("@ss.hasPermi('system:consume:export')") @Log(title = "积分变更记录", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, BusIntegralRecord busIntegralRecord) { - List list = busIntegralRecordService.selectBusIntegralRecordList(busIntegralRecord); + busIntegralRecord.setUpdateType("消耗账分"); + if (SecurityUtils.getLoginUser().getUserId() != 1L) { + List list = new ArrayList<>(); + BusAgentInfo agentInfo = new BusAgentInfo(); + agentInfo.setAgentAccount(SecurityUtils.getLoginUser().getUsername()); + BusAgentInfo temp = agentInfoService.selectBusAgentInfoList(agentInfo).get(0); + list.add(SecurityUtils.getLoginUser().getUsername()); + if (temp.getSuperiorAgentCode() == 1L) { + BusAgentInfo agentInfo1 = new BusAgentInfo(); + agentInfo1.setSuperiorAgentCode(temp.getId()); + List subList = agentInfoService.selectBusAgentInfoList(agentInfo1); + for (BusAgentInfo info : subList) { + list.add(info.getAgentAccount()); + } + } + busIntegralRecord.setAgentAccount(list); + } +// List list = busIntegralRecordService.selectBusIntegralRecordList(busIntegralRecord); + List list = busIntegralRecordService.selectBusIntegralRecordList1(busIntegralRecord); ExcelUtil util = new ExcelUtil(BusIntegralRecord.class); util.exportExcel(response, list, "积分变更记录数据"); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusIntegralRecord.java b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusIntegralRecord.java index d73965c..0e7dac7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusIntegralRecord.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusIntegralRecord.java @@ -3,6 +3,7 @@ package com.ruoyi.business.domain; import java.util.Date; import java.util.List; +import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -23,28 +24,32 @@ public class BusIntegralRecord extends BaseEntity private Long id; /** 营销账户 */ - @Excel(name = "营销账户") + @Excel(name = "账户") + @JSONField(ordinal = 2) private String account; /** 平台（M/E） */ - @Excel(name = "平台", readConverterExp = "M=/E") +// @Excel(name = "平台", readConverterExp = "M=/E") private String platform; /** 变更类型（出账/入账） */ - @Excel(name = "变更类型", readConverterExp = "出=账/入账") + @Excel(name = "变更类型") + @JSONField(ordinal = 3) private String updateType; /** 积分变更数值 */ @Excel(name = "积分变更数值") + @JSONField(ordinal = 4) private int integralUpdateNum; /** 变更时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "变更时间", width = 30, dateFormat = "yyyy-MM-dd") + @JSONField(ordinal = 1) private Date integralUpdateTime; /** 积分余额 */ - @Excel(name = "积分余额") +// @Excel(name = "积分余额") private int integralBalance; private List agentAccount; @@ -58,7 +63,7 @@ public class BusIntegralRecord extends BaseEntity } /** 代理备注 */ - @Excel(name = "代理备注") +// @Excel(name = "代理备注") private String agentRemark; private String createUser; diff --git a/ruoyi-ui/src/views/point/consume/index.vue b/ruoyi-ui/src/views/point/consume/index.vue index cdd1e79..8cf66c7 100644 --- a/ruoyi-ui/src/views/point/consume/index.vue +++ b/ruoyi-ui/src/views/point/consume/index.vue @@ -56,16 +56,16 @@ - - - - - - - - - - + + 导出 + @@ -266,7 +266,7 @@ export default { }, /** 导出按钮操作 */ handleExport() { - this.download('system/record/export', { + this.download('system/consume/export', { ...this.queryParams }, `record_${new Date().getTime()}.xlsx`) }