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
6187f27b
Commit
6187f27b
authored
4 years ago
by
ilal
Committed by
chenzg
3 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交
parent
a9c50c5c
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
src/main/java/cn/timer/api/bean/kqmk/KqglAssoLeaveRules.java
+1
-1
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
+1
-1
src/main/java/cn/timer/api/dto/kqmk/KqglAssoLeaveRulesDto.java
+1
-1
src/main/java/cn/timer/api/dto/kqmk/VacationInformationDto.java
+1
-1
No files found.
src/main/java/cn/timer/api/bean/kqmk/KqglAssoLeaveRules.java
View file @
6187f27b
...
...
@@ -41,7 +41,7 @@ public class KqglAssoLeaveRules extends Model<KqglAssoLeaveRules> {
private
String
name
;
@ApiModelProperty
(
value
=
"请假单位 "
,
example
=
"1:按天请假;2:按半天;3:按小时"
)
private
String
company
;
private
Integer
company
;
@ApiModelProperty
(
value
=
"假期类型 "
,
example
=
"1:系统项;2:自定义项"
)
private
Integer
leaveType
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
View file @
6187f27b
...
...
@@ -365,7 +365,7 @@ public class TimeCardController {
KqglAssoLeaveRules
rules
=
KqglAssoLeaveRules
.
builder
().
id
(
id
).
build
().
selectById
();
overrule
.
setRules
(
rules
);
List
<
KqglAssoRulesVice
>
vice
=
new
LambdaQueryChainWrapper
<
KqglAssoRulesVice
>(
kqglassorulesvicemapper
).
eq
(
KqglAssoRulesVice:
:
getLeaveRulesId
,
id
).
list
();
overrule
.
set
Vic
e
(
vice
);
overrule
.
set
Rang
e
(
vice
);
return
ResultUtil
.
data
(
overrule
,
"操作成功!"
);
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dto/kqmk/KqglAssoLeaveRulesDto.java
View file @
6187f27b
...
...
@@ -22,7 +22,7 @@ public class KqglAssoLeaveRulesDto {
private
String
name
;
@ApiModelProperty
(
value
=
"请假单位 "
,
example
=
"1:按天请假;2:按半天;3:按小时"
)
private
String
company
;
private
Integer
company
;
@ApiModelProperty
(
value
=
"假期类型 "
,
example
=
"1:系统项;2:自定义项"
)
private
Integer
leaveType
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dto/kqmk/VacationInformationDto.java
View file @
6187f27b
...
...
@@ -20,6 +20,6 @@ public class VacationInformationDto {
KqglAssoLeaveRules
rules
;
@ApiModelProperty
(
value
=
"假期规则-适用范围 "
,
example
=
"字段说明"
)
List
<
KqglAssoRulesVice
>
vic
e
;
List
<
KqglAssoRulesVice
>
rang
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