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
35c871c4
Commit
35c871c4
authored
4 years ago
by
leialin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'lal' into 'develop'
Lal See merge request 8timerv2/8timerapiv200!309
parents
86783b88
18d2a331
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
0 deletions
+11
-0
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
+11
-0
No files found.
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
View file @
35c871c4
...
...
@@ -9,6 +9,8 @@ import java.util.Date;
import
java.util.List
;
import
java.util.Map
;
import
javax.management.Query
;
import
org.codehaus.jettison.json.JSONObject
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
...
...
@@ -1415,6 +1417,15 @@ public class TimeCardController {
return
ResultUtil
.
data
(
attgro
,
"操作成功!"
);
}
@GetMapping
(
value
=
"/Overtime_rule_default"
)
@ApiOperation
(
value
=
"获取当前公司的默认加班规则"
,
httpMethod
=
"GET"
,
notes
=
"接口发布说明"
)
public
Result
<
Object
>
Overtime_rule_default
(
@CurrentUser
UserBean
userBean
)
{
KqglAssoOvertimeRules
defovwe
=
KqglAssoOvertimeRules
.
builder
().
build
().
selectOne
(
new
QueryWrapper
<
KqglAssoOvertimeRules
>().
lambda
().
eq
(
KqglAssoOvertimeRules:
:
getOrgCode
,
userBean
.
getOrgCode
())
.
eq
(
KqglAssoOvertimeRules:
:
getOvertimeruledefault
,
1
));
return
ResultUtil
.
data
(
defovwe
,
"操作成功!"
);
}
/**
...
...
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