Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
8
8timerapiv200
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
8timerv2
8timerapiv200
Commits
cf590ea9
Commit
cf590ea9
authored
4 years ago
by
ilal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改字段
parent
8f15eb9c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
14 deletions
+14
-14
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
+10
-10
src/main/java/cn/timer/api/dto/kqgl/CompensateDto.java
+2
-2
src/main/java/cn/timer/api/dto/kqgl/LeaveTypeDto.java
+2
-2
No files found.
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
View file @
cf590ea9
...
...
@@ -33,16 +33,16 @@ public class TimeCardController {
List
<
LeaveTypeDto
>
leas
=
new
ArrayList
<
LeaveTypeDto
>();
LeaveTypeDto
lea
=
LeaveTypeDto
.
builder
().
build
();
lea
.
set
Vaci
d
(
1
);
lea
.
setVa
cnam
e
(
"事假"
);
lea
.
set
I
d
(
1
);
lea
.
setVa
lu
e
(
"事假"
);
leas
.
add
(
lea
);
LeaveTypeDto
lea2
=
LeaveTypeDto
.
builder
().
build
();
lea2
.
set
Vaci
d
(
2
);
lea2
.
setVa
cnam
e
(
"调休"
);
lea2
.
set
I
d
(
2
);
lea2
.
setVa
lu
e
(
"调休"
);
leas
.
add
(
lea2
);
LeaveTypeDto
lea3
=
LeaveTypeDto
.
builder
().
build
();
lea3
.
set
Vaci
d
(
3
);
lea3
.
setVa
cnam
e
(
"病假"
);
lea3
.
set
I
d
(
3
);
lea3
.
setVa
lu
e
(
"病假"
);
leas
.
add
(
lea3
);
return
ResultUtil
.
data
(
leas
,
"操作成功!"
);
...
...
@@ -59,12 +59,12 @@ public class TimeCardController {
List
<
CompensateDto
>
coms
=
new
ArrayList
<
CompensateDto
>();
CompensateDto
com
=
CompensateDto
.
builder
().
build
();
com
.
set
Ovtii
d
(
1
);
com
.
set
Ovtinam
e
(
"加班费"
);
com
.
set
I
d
(
1
);
com
.
set
Valu
e
(
"加班费"
);
coms
.
add
(
com
);
CompensateDto
coms2
=
CompensateDto
.
builder
().
build
();
coms2
.
set
Ovtii
d
(
2
);
coms2
.
set
Ovtinam
e
(
"调休"
);
coms2
.
set
I
d
(
2
);
coms2
.
set
Valu
e
(
"调休"
);
coms
.
add
(
coms2
);
return
ResultUtil
.
data
(
coms
,
"操作成功!"
);
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dto/kqgl/CompensateDto.java
View file @
cf590ea9
...
...
@@ -13,8 +13,8 @@ import lombok.NoArgsConstructor;
public
class
CompensateDto
{
@ApiModelProperty
(
value
=
"加班补偿记录id"
,
example
=
"1"
,
required
=
true
)
private
Integer
ovti
id
;
private
Integer
id
;
@ApiModelProperty
(
value
=
"加班补偿名称"
,
example
=
"加班费、调休"
)
private
String
ovtinam
e
;
private
String
valu
e
;
}
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dto/kqgl/LeaveTypeDto.java
View file @
cf590ea9
...
...
@@ -14,8 +14,8 @@ import lombok.NoArgsConstructor;
public
class
LeaveTypeDto
{
@ApiModelProperty
(
value
=
"假期记录id"
,
example
=
"1"
,
required
=
true
)
private
Integer
vac
id
;
private
Integer
id
;
@ApiModelProperty
(
value
=
"假期名称"
,
example
=
"事假、调休..."
)
private
String
va
cnam
e
;
private
String
va
lu
e
;
}
This diff is collapsed.
Click to expand it.
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