From b427f4be8b051061b433851262122621ba71ce6b Mon Sep 17 00:00:00 2001
From: wangshuai <daws172839@163.com>
Date: Tue, 20 Aug 2024 16:48:59 +0800
Subject: [PATCH] =?UTF-8?q?1=EF=BC=9B=E5=BA=97=E9=93=BA=E6=95=B0=E6=8D=AE-?=
 =?UTF-8?q?=E5=A4=8D=E5=88=B6=E6=A8=A1=E7=89=88=20replaceAll=E7=89=B9?=
 =?UTF-8?q?=E6=AE=8A=E5=AD=97=E7=AC=A6=E6=8A=A5=E9=94=99=20Matcher.quoteRe?=
 =?UTF-8?q?placement=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusIntegralHistoryInfoController.java     | 11 +++----
 .../domain/BusIntegralHistoryInfo.java        | 18 ++++++++++
 .../src/views/statistics/integral/index.vue   | 33 +++++++++++--------
 3 files changed, 43 insertions(+), 19 deletions(-)

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<BusIntegralHistoryInfo> list = busIntegralHistoryInfoService.selectBusIntegralHistoryInfoList(busIntegralHistoryInfo);
+        expStartTime = expStartTime + " 00:00:00";
+        expEndTime = expEndTime + " 23:59:59";
+        List<BusIntegralHistoryInfo> list = busIntegralHistoryInfoService.selectBusIntegralHistoryInfoList1(account, expStartTime,expEndTime);
         ExcelUtil<BusIntegralHistoryInfo> util = new ExcelUtil<BusIntegralHistoryInfo>(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 @@
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+        >导出</el-button>
       </el-form-item>
     </el-form>
-
+    
     <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" type="index" width="50"  >
@@ -41,16 +48,16 @@
       <el-table-column label="普通帐分快照" align="center" prop="aiIntegralBalance" />
       <el-table-column label="快照时间" align="center" prop="createTime" :formatter="dateFormat"/>
 
-<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
-<!--        <template slot-scope="scope">-->
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-mouse"-->
-<!--            @click="export1(scope.row)"-->
-<!--          >导出</el-button>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+     <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+       <template slot-scope="scope">
+         <el-button
+           size="mini"
+           type="text"
+           icon="el-icon-mouse"
+           @click="export1(scope.row)"
+         >导出</el-button>
+       </template>
+     </el-table-column> -->
     </el-table>
 
     <pagination
@@ -280,8 +287,8 @@ export default {
     //   }, `info_${new Date().getTime()}.xlsx`)
     // }
     handleExport(data) {
-      this.download('excel/info/export', {
-        ...this.queryParams1
+      this.download('business/integral/export', {
+        ...this.queryParams
       }, data.storeName+`_${new Date().getTime()}.xlsx`)
     }
   }