1;店铺数据-复制模版 replaceAll特殊字符报错 Matcher.quoteReplacement处理
This commit is contained in:
parent
49396391c6
commit
b427f4be8b
|
@ -74,14 +74,13 @@ public class BusIntegralHistoryInfoController extends BaseController
|
||||||
// @PreAuthorize("@ss.hasPermi('integral:integral:export')")
|
// @PreAuthorize("@ss.hasPermi('integral:integral:export')")
|
||||||
@Log(title = "帐分历史快照", businessType = BusinessType.EXPORT)
|
@Log(title = "帐分历史快照", businessType = BusinessType.EXPORT)
|
||||||
@PostMapping("/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())){
|
expStartTime = expStartTime + " 00:00:00";
|
||||||
busIntegralHistoryInfo.setAccount(SecurityUtils.getLoginUser().getUsername());
|
expEndTime = expEndTime + " 23:59:59";
|
||||||
}
|
List<BusIntegralHistoryInfo> list = busIntegralHistoryInfoService.selectBusIntegralHistoryInfoList1(account, expStartTime,expEndTime);
|
||||||
List<BusIntegralHistoryInfo> list = busIntegralHistoryInfoService.selectBusIntegralHistoryInfoList(busIntegralHistoryInfo);
|
|
||||||
ExcelUtil<BusIntegralHistoryInfo> util = new ExcelUtil<BusIntegralHistoryInfo>(BusIntegralHistoryInfo.class);
|
ExcelUtil<BusIntegralHistoryInfo> util = new ExcelUtil<BusIntegralHistoryInfo>(BusIntegralHistoryInfo.class);
|
||||||
util.exportExcel(response, list, "帐分历史快照数据");
|
util.exportExcel(response, list, expEndTime,"帐分历史快照数据"+expEndTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -1,10 +1,13 @@
|
||||||
package com.ruoyi.business.domain;
|
package com.ruoyi.business.domain;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||||
import com.ruoyi.common.annotation.Excel;
|
import com.ruoyi.common.annotation.Excel;
|
||||||
import com.ruoyi.common.core.domain.BaseEntity;
|
import com.ruoyi.common.core.domain.BaseEntity;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 帐分历史快照对象 bus_integral_history_info
|
* 帐分历史快照对象 bus_integral_history_info
|
||||||
*
|
*
|
||||||
|
@ -38,6 +41,11 @@ public class BusIntegralHistoryInfo extends BaseEntity
|
||||||
@Excel(name = "sms帐分")
|
@Excel(name = "sms帐分")
|
||||||
private Integer integralBalance;
|
private Integer integralBalance;
|
||||||
|
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
|
@Excel(name = "快照时间", dateFormat = "yyyy-MM-dd")
|
||||||
|
private Date createTime;
|
||||||
|
|
||||||
|
|
||||||
public void setId(Long id)
|
public void setId(Long id)
|
||||||
{
|
{
|
||||||
this.id = id;
|
this.id = id;
|
||||||
|
@ -93,6 +101,16 @@ public class BusIntegralHistoryInfo extends BaseEntity
|
||||||
return integralBalance;
|
return integralBalance;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Date getCreateTime() {
|
||||||
|
return createTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setCreateTime(Date createTime) {
|
||||||
|
this.createTime = createTime;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||||
|
|
|
@ -24,6 +24,13 @@
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
<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 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-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
|
|
||||||
|
@ -41,16 +48,16 @@
|
||||||
<el-table-column label="普通帐分快照" align="center" prop="aiIntegralBalance" />
|
<el-table-column label="普通帐分快照" align="center" prop="aiIntegralBalance" />
|
||||||
<el-table-column label="快照时间" align="center" prop="createTime" :formatter="dateFormat"/>
|
<el-table-column label="快照时间" align="center" prop="createTime" :formatter="dateFormat"/>
|
||||||
|
|
||||||
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
|
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||||
<!-- <template slot-scope="scope">-->
|
<template slot-scope="scope">
|
||||||
<!-- <el-button-->
|
<el-button
|
||||||
<!-- size="mini"-->
|
size="mini"
|
||||||
<!-- type="text"-->
|
type="text"
|
||||||
<!-- icon="el-icon-mouse"-->
|
icon="el-icon-mouse"
|
||||||
<!-- @click="export1(scope.row)"-->
|
@click="export1(scope.row)"
|
||||||
<!-- >导出</el-button>-->
|
>导出</el-button>
|
||||||
<!-- </template>-->
|
</template>
|
||||||
<!-- </el-table-column>-->
|
</el-table-column> -->
|
||||||
</el-table>
|
</el-table>
|
||||||
|
|
||||||
<pagination
|
<pagination
|
||||||
|
@ -280,8 +287,8 @@ export default {
|
||||||
// }, `info_${new Date().getTime()}.xlsx`)
|
// }, `info_${new Date().getTime()}.xlsx`)
|
||||||
// }
|
// }
|
||||||
handleExport(data) {
|
handleExport(data) {
|
||||||
this.download('excel/info/export', {
|
this.download('business/integral/export', {
|
||||||
...this.queryParams1
|
...this.queryParams
|
||||||
}, data.storeName+`_${new Date().getTime()}.xlsx`)
|
}, data.storeName+`_${new Date().getTime()}.xlsx`)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue