Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
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
fangxinjiang
yifu-mvp
Commits
ce9d3064
Commit
ce9d3064
authored
Feb 23, 2023
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.5.1-收入证明等
parent
ded502c2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
TProveRecord.java
...yifu/cloud/plus/v1/yifu/archives/entity/TProveRecord.java
+1
-1
SalaryProveController.java
...us/v1/yifu/archives/controller/SalaryProveController.java
+2
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TProveRecord.java
View file @
ce9d3064
...
...
@@ -94,7 +94,7 @@ public class TProveRecord extends Model<TProveRecord> {
@ExcelAttribute
(
name
=
"开具日期"
)
@ExcelProperty
(
"开具日期"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
Local
Date
creatDate
;
private
Date
creatDate
;
/**
* 开始月份
*/
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/SalaryProveController.java
View file @
ce9d3064
...
...
@@ -31,6 +31,7 @@ import javax.servlet.http.HttpServletResponse;
import
javax.validation.Valid
;
import
java.math.BigDecimal
;
import
java.time.LocalDate
;
import
java.util.Date
;
import
java.util.List
;
...
...
@@ -151,7 +152,7 @@ public class SalaryProveController {
record
.
setEmployeeName
(
em
.
getEmpName
());
record
.
setEmployeeIdCard
(
em
.
getEmpIdcard
());
record
.
setEmployeeInfo
(
emId
);
record
.
setCreatDate
(
LocalDate
.
now
());
record
.
setCreatDate
(
new
Date
());
record
.
setEmployeeSettleDepartName
(
em
.
getDeptName
());
record
.
setPost
(
em
.
getPost
());
count
=
LocalDateTimeUtils
.
getBeginOfMonth
(
endDate
.
concat
(
"01"
),
startDate
.
concat
(
"01"
),
"yyyyMMdd"
)
+
1
;
...
...
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