Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
P
precision-effect
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
耿迪迪
precision-effect
Commits
7fb33e12
Commit
7fb33e12
authored
Aug 05, 2023
by
耿迪迪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
导出申请时间修改
parent
b6b0997e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
45 additions
and
9 deletions
+45
-9
TStatisticsController.java
...ong/web/controller/transaction/TStatisticsController.java
+3
-0
PurchaseStatisticsDetailExportVo.java
...ng/system/domain/vo/PurchaseStatisticsDetailExportVo.java
+14
-3
TradeExpensesStatisticsDetailExportVo.java
...stem/domain/vo/TradeExpensesStatisticsDetailExportVo.java
+14
-3
TradeIncomeStatisticsDetailExportVo.java
...system/domain/vo/TradeIncomeStatisticsDetailExportVo.java
+14
-3
No files found.
precision-effect-admin/src/main/java/com/zehong/web/controller/transaction/TStatisticsController.java
View file @
7fb33e12
...
...
@@ -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
);
...
...
precision-effect-system/src/main/java/com/zehong/system/domain/vo/PurchaseStatisticsDetailExportVo.java
View file @
7fb33e12
...
...
@@ -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
createTime
Str
;
@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
;
}
...
...
precision-effect-system/src/main/java/com/zehong/system/domain/vo/TradeExpensesStatisticsDetailExportVo.java
View file @
7fb33e12
...
...
@@ -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
createTime
Str
;
@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
;
}
...
...
precision-effect-system/src/main/java/com/zehong/system/domain/vo/TradeIncomeStatisticsDetailExportVo.java
View file @
7fb33e12
...
...
@@ -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
createTime
Str
;
@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
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment