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
7f676ce7
Commit
7f676ce7
authored
5 years ago
by
lal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交BUG
parent
5d8e0f09
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
4 deletions
+28
-4
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
+23
-3
src/main/java/cn/timer/api/dto/kqmk/KqglAssoOvertimeRulesDto.java
+5
-1
No files found.
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
View file @
7f676ce7
...
...
@@ -257,20 +257,40 @@ public class TimeCardController {
List
<
KqglAssoOvertimeRulesDto
>
rulesdto
=
new
ArrayList
<
KqglAssoOvertimeRulesDto
>();
for
(
int
i
=
0
,
n
=
listAs
.
size
();
i
<
n
;
i
++)
{
String
[]
nary
=
null
;
String
[]
naryid
=
null
;
if
(
listAs
.
get
(
i
).
getAppliedScope
()
==
0
)
{
//全公司
nary
=
new
String
[
1
];
//用户名
naryid
=
new
String
[
1
];
//用户名
nary
[
0
]
=
"全公司"
;
naryid
[
0
]
=
"0"
;
}
else
{
List
<
KqglAssoOvertimeRange
>
overtim
=
kqglassoovertimerangemapper
.
selectList
(
new
QueryWrapper
<
KqglAssoOvertimeRange
>().
lambda
().
eq
(
KqglAssoOvertimeRange:
:
getOvertimeRulesId
,
listAs
.
get
(
i
).
getId
()));
nary
=
new
String
[
overtim
.
size
()];
//用户名
naryid
=
new
String
[
overtim
.
size
()];
//用户名
for
(
int
y
=
0
,
l
=
overtim
.
size
();
y
<
l
;
y
++)
{
KqglMainKqz
kqzmc
=
kqglmainkqzmapper
.
selectOne
(
new
QueryWrapper
<
KqglMainKqz
>().
lambda
().
eq
(
KqglMainKqz:
:
getId
,
overtim
.
get
(
y
).
getAttgroupId
()));
nary
[
y
]
=
kqzmc
.
getName
();
naryid
[
y
]
=
String
.
valueOf
(
kqzmc
.
getId
());
}
}
List
<
KqglAssOvertimeVice
>
vice
=
kqglassovertimevicemapper
.
selectList
(
new
QueryWrapper
<
KqglAssOvertimeVice
>().
lambda
().
eq
(
KqglAssOvertimeVice:
:
getOvertimeRulesId
,
listAs
.
get
(
i
).
getId
()));
StartTimeRestDto
[]
starttime
=
new
StartTimeRestDto
[
vice
.
size
()];
//用户名;
for
(
int
r
=
0
,
t
=
vice
.
size
();
r
<
t
;
r
++)
{
StartTimeRestDto
startt
=
new
StartTimeRestDto
(
vice
.
get
(
r
).
getBreakStartTime
(),
vice
.
get
(
r
).
getBreakEndTime
(),
vice
.
get
(
r
).
getOverType
());
starttime
[
r
]
=
startt
;
}
KqglAssoOvertimeRulesDto
ruldto
=
KqglAssoOvertimeRulesDto
.
builder
().
build
();
ruldto
.
setApplyrange
(
nary
);
BeanUtil
.
copyProperties
(
listAs
.
get
(
i
),
ruldto
,
"starttime"
,
"applyrange"
);
ruldto
.
setApplyrangeid
(
naryid
);
ruldto
.
setStarttime
(
starttime
);
BeanUtil
.
copyProperties
(
listAs
.
get
(
i
),
ruldto
,
"starttime"
,
"applyrange"
,
"applyrangeid"
);
rulesdto
.
add
(
ruldto
);
}
return
ResultUtil
.
data
(
pageAs
,
rulesdto
,
"操作成功!"
);
...
...
@@ -296,7 +316,7 @@ public class TimeCardController {
Integer
id
=
rul
.
getId
();
Console
.
log
(
"新增/修改加班规则id: "
+
id
);
List
<
KqglAssoOvertimeRange
>
overatts
=
new
ArrayList
<
KqglAssoOvertimeRange
>();
String
[]
launchs
=
overrules
.
getApplyrange
();
String
[]
launchs
=
overrules
.
getApplyrange
id
();
if
(
launchs
.
length
==
0
)
{
KqglAssoOvertimeRange
.
builder
().
build
().
delete
(
new
QueryWrapper
<
KqglAssoOvertimeRange
>().
lambda
().
eq
(
KqglAssoOvertimeRange:
:
getOvertimeRulesId
,
id
));
}
else
if
(
launchs
!=
null
&&
launchs
.
length
>
0
){
...
...
@@ -2006,7 +2026,7 @@ public class TimeCardController {
public
Result
<
Object
>
LeaveBalanceList
(
@CurrentUser
UserBean
userBean
,
@Validated
@RequestBody
AttqueryCriteriaDto
attquerycriteriadto
)
{
IPage
<
EmployeeLeaveBalanceDto
>
page
=
new
Page
<
EmployeeLeaveBalanceDto
>(
attquerycriteriadto
.
getCurrentPage
()
==
null
?
1
:
attquerycriteriadto
.
getCurrentPage
(),
attquerycriteriadto
.
getTotalPage
()
==
null
?
10
:
attquerycriteriadto
.
getTotalPage
());
attquerycriteriadto
.
getTotalPage
()
==
10
?
9999
:
attquerycriteriadto
.
getTotalPage
());
attquerycriteriadto
.
setOrgCode
(
userBean
.
getOrgCode
());
attquerycriteriadto
.
setEmpNum
(
userBean
.
getEmpNum
());
// 缺-部门id 搜索
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dto/kqmk/KqglAssoOvertimeRulesDto.java
View file @
7f676ce7
...
...
@@ -98,7 +98,10 @@ public class KqglAssoOvertimeRulesDto {
@ApiModelProperty
(
value
=
"扣除休息时间段"
,
example
=
"12:00-13:30"
)
private
StartTimeRestDto
[]
starttime
;
@ApiModelProperty
(
value
=
"应用范围"
,
example
=
"[]"
)
@ApiModelProperty
(
value
=
"应用范围
name
"
,
example
=
"[]"
)
private
String
[]
applyrange
;
@ApiModelProperty
(
value
=
"应用范围id"
,
example
=
"[]"
)
private
String
[]
applyrangeid
;
}
\ No newline at end of file
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