Commit 7fb33e12 authored by 耿迪迪's avatar 耿迪迪

导出申请时间修改

parent b6b0997e
......@@ -113,6 +113,7 @@ public class TStatisticsController extends BaseController {
List<TradeIncomeStatisticsDetailExportVo> listVo = list.stream().map(item ->{
TradeIncomeStatisticsDetailExportVo vo = new TradeIncomeStatisticsDetailExportVo();
BeanUtils.copyProperties(item,vo);
vo.setCreateTimeStr(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(vo.getCreateTime()));
return vo;
}).collect(Collectors.toList());
ExcelUtil<TradeIncomeStatisticsDetailExportVo> util = new ExcelUtil<>(TradeIncomeStatisticsDetailExportVo.class);
......@@ -122,6 +123,7 @@ public class TStatisticsController extends BaseController {
List<TradeExpensesStatisticsDetailExportVo> listVo = list.stream().map(item ->{
TradeExpensesStatisticsDetailExportVo vo = new TradeExpensesStatisticsDetailExportVo();
BeanUtils.copyProperties(item,vo);
vo.setCreateTimeStr(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(vo.getCreateTime()));
return vo;
}).collect(Collectors.toList());
ExcelUtil<TradeExpensesStatisticsDetailExportVo> util = new ExcelUtil<>(TradeExpensesStatisticsDetailExportVo.class);
......@@ -245,6 +247,7 @@ public class TStatisticsController extends BaseController {
List<PurchaseStatisticsDetailExportVo> listVo = list.stream().map(item ->{
PurchaseStatisticsDetailExportVo vo = new PurchaseStatisticsDetailExportVo();
BeanUtils.copyProperties(item,vo);
vo.setCreateTimeStr(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(vo.getCreateTime()));
return vo;
}).collect(Collectors.toList());
ExcelUtil<PurchaseStatisticsDetailExportVo> util = new ExcelUtil<>(PurchaseStatisticsDetailExportVo.class);
......
......@@ -3,6 +3,7 @@ package com.zehong.system.domain.vo;
import com.zehong.common.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
public class PurchaseStatisticsDetailExportVo {
......@@ -24,8 +25,10 @@ public class PurchaseStatisticsDetailExportVo {
@Excel(name = "报销总额")
private BigDecimal total;
private Date createTime;
@Excel(name = "申请时间")
private String createTime;
private String createTimeStr;
@Excel(name = "状态", dictType = "purchaseStatus")
private String purchaseStatus;
......@@ -81,14 +84,22 @@ public class PurchaseStatisticsDetailExportVo {
this.total = total;
}
public String getCreateTime() {
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public String getCreateTimeStr() {
return createTimeStr;
}
public void setCreateTimeStr(String createTimeStr) {
this.createTimeStr = createTimeStr;
}
public String getPurchaseStatus() {
return purchaseStatus;
}
......
......@@ -3,6 +3,7 @@ package com.zehong.system.domain.vo;
import com.zehong.common.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
public class TradeExpensesStatisticsDetailExportVo {
......@@ -21,8 +22,10 @@ public class TradeExpensesStatisticsDetailExportVo {
@Excel(name = "交易细项名称")
private String transactionDetailName;
private Date createTime;
@Excel(name = "申请时间")
private String createTime;
private String createTimeStr;
@Excel(name = "项目状态",dictType = "t_transaction_project_status")
private String tradeStatus;
......@@ -73,14 +76,22 @@ public class TradeExpensesStatisticsDetailExportVo {
this.transactionDetailName = transactionDetailName;
}
public String getCreateTime() {
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public String getCreateTimeStr() {
return createTimeStr;
}
public void setCreateTimeStr(String createTimeStr) {
this.createTimeStr = createTimeStr;
}
public String getTradeStatus() {
return tradeStatus;
}
......
......@@ -3,6 +3,7 @@ package com.zehong.system.domain.vo;
import com.zehong.common.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
public class TradeIncomeStatisticsDetailExportVo {
......@@ -21,8 +22,10 @@ public class TradeIncomeStatisticsDetailExportVo {
@Excel(name = "交易细项名称")
private String transactionDetailName;
private Date createTime;
@Excel(name = "申请时间")
private String createTime;
private String createTimeStr;
@Excel(name = "项目状态",dictType = "t_transaction_project_status")
private String tradeStatus;
......@@ -73,14 +76,22 @@ public class TradeIncomeStatisticsDetailExportVo {
this.transactionDetailName = transactionDetailName;
}
public String getCreateTime() {
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public String getCreateTimeStr() {
return createTimeStr;
}
public void setCreateTimeStr(String createTimeStr) {
this.createTimeStr = createTimeStr;
}
public String getTradeStatus() {
return tradeStatus;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment