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
6ad80dd4
Commit
6ad80dd4
authored
4 years ago
by
lal
Committed by
chenzg
3 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复
parent
dbab661d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
1 deletions
+28
-1
src/main/java/cn/timer/api/bean/kqmk/KqglAssoBcsz.java
+1
-1
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
+27
-0
No files found.
src/main/java/cn/timer/api/bean/kqmk/KqglAssoBcsz.java
View file @
6ad80dd4
...
...
@@ -122,7 +122,7 @@ public class KqglAssoBcsz extends Model<KqglAssoBcsz> {
@ApiModelProperty
(
value
=
"上下班次数(1/2/3 最大值为3)"
,
example
=
"101"
)
private
Integer
sxbcs
;
@ApiModelProperty
(
value
=
"是否
允许下班打卡(0:否;1:是) 是否允许下班
打卡(0:否;1:是)"
,
example
=
"101"
)
@ApiModelProperty
(
value
=
"是否
下班不用
打卡(0:否;1:是)"
,
example
=
"101"
)
private
Integer
isXbdk
;
@ApiModelProperty
(
value
=
"允许迟到分钟数 允许迟到分钟数"
,
example
=
"101"
)
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
View file @
6ad80dd4
...
...
@@ -167,9 +167,36 @@ public class TimeCardController {
@ApiOperation
(
value
=
"2:新增班次信息"
,
httpMethod
=
"POST"
,
notes
=
"接口发布说明"
)
@ApiOperationSupport
(
order
=
2
)
public
Result
<
KqglAssoBcsz
>
ShiftInformation
(
@CurrentUser
UserBean
userBean
,
@RequestBody
KqglAssoBcsz
shif
)
{
String
sdf
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
).
format
(
new
Date
());
shif
.
setQyid
(
userBean
.
getOrgCode
());
shif
.
setLusjTime
(
new
Date
().
getTime
());
shif
.
setLuryid
(
userBean
.
getEmpNum
());
//录入人员
boolean
xbbydk
=
false
;
if
(
shif
.
getIsXbdk
()
==
1
)
{
xbbydk
=
true
;
}
if
(
shif
.
getSxbcs
()
==
1
)
{
if
(
xbbydk
)
{
shif
.
setXbdk1
(
""
);
String
asd
=
ClockInTool
.
addtime
(
sdf
+
" "
+
shif
.
getSbdk1
()+
":00"
,
"1"
).
substring
(
11
,
16
);
shif
.
setXbdk1
(
asd
);
}
}
else
if
(
shif
.
getSxbcs
()
==
2
)
{
if
(
xbbydk
)
{
shif
.
setXbdk2
(
""
);
String
asd
=
ClockInTool
.
addtime
(
sdf
+
" "
+
shif
.
getSbdk2
()+
":00"
,
"1"
).
substring
(
11
,
16
);
shif
.
setXbdk2
(
asd
);
}
}
else
{
if
(
xbbydk
)
{
shif
.
setXbdk3
(
""
);
String
asd
=
ClockInTool
.
addtime
(
sdf
+
" "
+
shif
.
getSbdk3
()+
":00"
,
"1"
).
substring
(
11
,
16
);
shif
.
setXbdk3
(
asd
);
}
}
if
(
kqglassobcszmapper
.
insert
(
shif
)>
0
){
return
ResultUtil
.
data
(
shif
,
"新增班次成功"
);
}
else
{
...
...
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