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
b35a0c02
Commit
b35a0c02
authored
4 years ago
by
Administrator
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'lal' into 'develop'
提交 See merge request 8timerv2/8timerapiv200!82
parents
03b11eb1
508b09e8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
29 deletions
+25
-29
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
+25
-2
src/main/java/cn/timer/api/controller/kqgl/test.java
+0
-27
No files found.
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
View file @
b35a0c02
...
...
@@ -37,6 +37,8 @@ import cn.timer.api.bean.kqmk.KqglAssoLeaveRules;
import
cn.timer.api.bean.kqmk.KqglAssoOvertimeBasics
;
import
cn.timer.api.bean.kqmk.KqglAssoOvertimeRules
;
import
cn.timer.api.bean.kqmk.KqglAssoRulesVice
;
import
cn.timer.api.bean.kqmk.KqglMainKqz
;
import
cn.timer.api.bean.spmk.SpmkInitiatorConfig
;
import
cn.timer.api.config.annotation.CurrentUser
;
import
cn.timer.api.config.annotation.UserBean
;
import
cn.timer.api.dao.kqmk.KqglAssOvertimeViceMapper
;
...
...
@@ -598,8 +600,8 @@ public class TimeCardController {
* 查询列表-假期规则*******************************************
*/
@GetMapping
(
value
=
"/list_leave_rules"
)
@ApiOperation
(
value
=
"
111
: 查询列表-假期规则"
,
httpMethod
=
"GET"
,
notes
=
" 查询列表-假期规则"
)
@ApiOperationSupport
(
order
=
111
)
@ApiOperation
(
value
=
"
30
: 查询列表-假期规则"
,
httpMethod
=
"GET"
,
notes
=
" 查询列表-假期规则"
)
@ApiOperationSupport
(
order
=
30
)
public
Result
<
Object
>
selectListLeaveRules
(
@CurrentUser
UserBean
userBean
)
{
List
<
KqglAssoLeaveRules
>
balheas
=
new
LambdaQueryChainWrapper
<
KqglAssoLeaveRules
>(
kqglassoleaverulesmapper
).
eq
(
KqglAssoLeaveRules
::
getOrgCode
,
userBean
.
getOrgCode
())
...
...
@@ -616,6 +618,27 @@ public class TimeCardController {
}
/**
* 根据组织机构代码 获取考勤组
*/
@GetMapping
(
value
=
"/check_workatt"
)
@ApiOperation
(
value
=
"31:根据组织机构代码 获取考勤组"
,
httpMethod
=
"GET"
,
notes
=
"接口发布说明"
)
@ApiOperationSupport
(
order
=
31
)
public
Result
<
Object
>
CheckWorkatt
(
@CurrentUser
UserBean
userBean
)
{
List
<
KqglMainKqz
>
kqzs
=
KqglMainKqz
.
builder
().
build
().
selectList
(
new
QueryWrapper
<
KqglMainKqz
>().
lambda
().
eq
(
KqglMainKqz:
:
getQyid
,
userBean
.
getOrgCode
()));
List
<
LeaveTypeDto
>
leas
=
new
ArrayList
<
LeaveTypeDto
>();
for
(
KqglMainKqz
rul
:
kqzs
)
{
LeaveTypeDto
lea
=
LeaveTypeDto
.
builder
().
build
();
lea
.
setId
(
rul
.
getId
());
lea
.
setValue
(
rul
.
getName
());
leas
.
add
(
lea
);
}
return
ResultUtil
.
data
(
leas
,
"操作成功!"
);
}
/**
* 查询列表-加班补偿方式
*/
@GetMapping
(
value
=
"/list_compensate"
)
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/kqgl/test.java
deleted
100644 → 0
View file @
03b11eb1
package
cn
.
timer
.
api
.
controller
.
kqgl
;
import
java.text.ParseException
;
import
java.text.SimpleDateFormat
;
import
java.util.ArrayList
;
import
java.util.List
;
import
cn.timer.api.dto.kqmk.AttSchedule
;
import
cn.timer.api.dto.kqmk.AttendanceCardListDto
;
import
cn.timer.api.utils.DateUtil
;
public
class
test
{
public
static
void
main
(
String
[]
args
)
throws
Exception
{
long
starttime1
,
endtime1
=
0
;
if
(
1
==
1
)
{
starttime1
=
12
l
;
}
else
{
endtime1
=
22
l
;
}
System
.
out
.
println
(
starttime1
);
System
.
out
.
println
(
endtime1
);
}
}
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