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
45d89e3e
Commit
45d89e3e
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!163
parents
5cbb7c39
00462547
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
50 additions
and
0 deletions
+50
-0
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
+0
-0
src/main/java/cn/timer/api/controller/kqgl/EmptyUtil.java
+35
-0
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
+15
-0
No files found.
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
View file @
45d89e3e
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/kqgl/EmptyUtil.java
0 → 100644
View file @
45d89e3e
package
cn
.
timer
.
api
.
controller
.
kqgl
;
import
java.util.List
;
public
class
EmptyUtil
{
/**
* 判断对象为空
*
* @param obj 对象名
* @return 是否为空
*/
// @SuppressWarnings("rawtypes")
public
static
boolean
isEmpty
(
Object
obj
)
{
if
(
obj
==
null
)
{
return
true
;
}
if
((
obj
instanceof
List
))
{
return
((
List
)
obj
).
size
()
==
0
;
}
if
((
obj
instanceof
String
))
{
return
((
String
)
obj
).
trim
().
equals
(
""
);
}
return
false
;
}
/**
* 判断对象不为空
*
* @param obj 对象名
* @return 是否不为空
*/
public
static
boolean
isNotEmpty
(
Object
obj
)
{
return
!
isEmpty
(
obj
);
}
}
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
View file @
45d89e3e
...
@@ -302,15 +302,23 @@ public class TimeCardController {
...
@@ -302,15 +302,23 @@ public class TimeCardController {
}
else
if
(
launchs
!=
null
&&
launchs
.
length
>
0
){
}
else
if
(
launchs
!=
null
&&
launchs
.
length
>
0
){
for
(
int
p
=
0
;
p
<
launchs
.
length
;
p
++){
for
(
int
p
=
0
;
p
<
launchs
.
length
;
p
++){
KqglAssoOvertimeRange
.
builder
().
build
().
delete
(
new
QueryWrapper
<
KqglAssoOvertimeRange
>().
lambda
().
eq
(
KqglAssoOvertimeRange:
:
getOvertimeRulesId
,
id
));
KqglAssoOvertimeRange
.
builder
().
build
().
delete
(
new
QueryWrapper
<
KqglAssoOvertimeRange
>().
lambda
().
eq
(
KqglAssoOvertimeRange:
:
getOvertimeRulesId
,
id
));
KqglAssoOvertimeRange
.
builder
().
build
().
delete
(
new
QueryWrapper
<
KqglAssoOvertimeRange
>().
lambda
().
eq
(
KqglAssoOvertimeRange:
:
getAttgroupId
,
Integer
.
valueOf
(
launchs
[
p
])));
KqglAssoOvertimeRange
vice
=
KqglAssoOvertimeRange
.
builder
().
build
();
KqglAssoOvertimeRange
vice
=
KqglAssoOvertimeRange
.
builder
().
build
();
vice
.
setOvertimeRulesId
(
id
);
vice
.
setOvertimeRulesId
(
id
);
vice
.
setAttgroupId
(
Integer
.
valueOf
(
launchs
[
p
]));
vice
.
setAttgroupId
(
Integer
.
valueOf
(
launchs
[
p
]));
overatts
.
add
(
vice
);
overatts
.
add
(
vice
);
//应用范围应用到相对应的考勤组************
KqglMainKqz
.
builder
().
id
(
Integer
.
valueOf
(
launchs
[
p
])).
overtimeRulesId
(
id
).
build
().
updateById
();
}
}
}
}
if
(
overatts
.
size
()
>
0
)
{
if
(
overatts
.
size
()
>
0
)
{
kqglassoovertimerangemapper
.
insertovertimerangelist
(
overatts
);
kqglassoovertimerangemapper
.
insertovertimerangelist
(
overatts
);
}
}
List
<
KqglAssOvertimeVice
>
overtimes
=
new
ArrayList
<
KqglAssOvertimeVice
>();
List
<
KqglAssOvertimeVice
>
overtimes
=
new
ArrayList
<
KqglAssOvertimeVice
>();
StartTimeRestDto
[]
rest
=
overrules
.
getStarttime
();
StartTimeRestDto
[]
rest
=
overrules
.
getStarttime
();
if
(
rest
!=
null
&&
rest
.
length
>
0
){
if
(
rest
!=
null
&&
rest
.
length
>
0
){
...
@@ -364,6 +372,13 @@ public class TimeCardController {
...
@@ -364,6 +372,13 @@ public class TimeCardController {
if
(!
KqglAssoOvertimeRules
.
builder
().
id
(
id
).
build
().
deleteById
())
{
if
(!
KqglAssoOvertimeRules
.
builder
().
id
(
id
).
build
().
deleteById
())
{
throw
new
Exception
();
throw
new
Exception
();
}
else
{
}
else
{
List
<
KqglAssoOvertimeRange
>
rans
=
kqglassoovertimerangemapper
.
selectList
(
new
QueryWrapper
<
KqglAssoOvertimeRange
>().
lambda
().
eq
(
KqglAssoOvertimeRange:
:
getOvertimeRulesId
,
id
));
for
(
KqglAssoOvertimeRange
ran:
rans
)
{
KqglMainKqz
.
builder
().
id
(
ran
.
getAttgroupId
()).
overtimeRulesId
(
0
).
build
().
updateById
();
}
KqglAssoOvertimeRange
.
builder
().
build
().
delete
(
new
QueryWrapper
<
KqglAssoOvertimeRange
>().
lambda
().
eq
(
KqglAssoOvertimeRange:
:
getOvertimeRulesId
,
id
));
KqglAssOvertimeVice
.
builder
().
build
().
delete
(
new
QueryWrapper
<
KqglAssOvertimeVice
>().
lambda
().
eq
(
KqglAssOvertimeVice:
:
getOvertimeRulesId
,
id
));
KqglAssOvertimeVice
.
builder
().
build
().
delete
(
new
QueryWrapper
<
KqglAssOvertimeVice
>().
lambda
().
eq
(
KqglAssOvertimeVice:
:
getOvertimeRulesId
,
id
));
return
ResultUtil
.
success
(
"删除成功!"
);
return
ResultUtil
.
success
(
"删除成功!"
);
}
}
...
...
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