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
c88df658
Commit
c88df658
authored
4 years ago
by
Your Name
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新了每个页面的数据都有一定的概率不加载数据问题
parent
1f5f9255
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
src/main/java/cn/timer/api/controller/kqgl/AttController.java
+5
-1
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
+3
-3
No files found.
src/main/java/cn/timer/api/controller/kqgl/AttController.java
View file @
c88df658
...
@@ -293,9 +293,13 @@ public class AttController {
...
@@ -293,9 +293,13 @@ public class AttController {
Schedule
sch
=
new
Schedule
();
Schedule
sch
=
new
Schedule
();
sch
.
setUserid
(
yhr
.
getUserid
());
sch
.
setUserid
(
yhr
.
getUserid
());
YgglMainEmp
yhna
=
YgglMainEmp
.
builder
().
build
().
selectOne
(
new
QueryWrapper
<
YgglMainEmp
>().
lambda
().
eq
(
YgglMainEmp:
:
getEmpNum
,
yhr
.
getUserid
()));
YgglMainEmp
yhna
=
YgglMainEmp
.
builder
().
build
().
selectOne
(
new
QueryWrapper
<
YgglMainEmp
>().
lambda
().
eq
(
YgglMainEmp:
:
getEmpNum
,
yhr
.
getUserid
()));
if
(
yhna
!=
null
){
sch
.
setUsername
(
yhna
.
getName
());
sch
.
setUsername
(
yhna
.
getName
());
}
sch
.
setKqzid
(
attscheduling
.
getKqzid
());
sch
.
setKqzid
(
attscheduling
.
getKqzid
());
schlist
.
add
(
sch
);
schlist
.
add
(
sch
);
}
}
return
ResultUtil
.
data
(
schlist
);
return
ResultUtil
.
data
(
schlist
);
...
@@ -4351,7 +4355,7 @@ public class AttController {
...
@@ -4351,7 +4355,7 @@ public class AttController {
}
}
/**
/**
* @param
clock
* @param
remind
* @return 日历提醒
* @return 日历提醒
*/
*/
@PostMapping
(
value
=
"/Attendancecalendar"
)
@PostMapping
(
value
=
"/Attendancecalendar"
)
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
View file @
c88df658
...
@@ -1170,7 +1170,7 @@ public class TimeCardController {
...
@@ -1170,7 +1170,7 @@ public class TimeCardController {
@ApiOperation
(
value
=
"35:获取打卡地址数据"
,
httpMethod
=
"GET"
,
notes
=
"接口发布说明"
)
@ApiOperation
(
value
=
"35:获取打卡地址数据"
,
httpMethod
=
"GET"
,
notes
=
"接口发布说明"
)
@ApiOperationSupport
(
order
=
35
)
@ApiOperationSupport
(
order
=
35
)
public
Result
<
Object
>
getInGroupPunchAddress
(
@CurrentUser
UserBean
userBean
)
{
public
Result
<
Object
>
getInGroupPunchAddress
(
@CurrentUser
UserBean
userBean
)
{
List
<
KqglAssoDkdz
>
shiftList
=
KqglAssoDkdz
.
builder
().
build
().
selectList
(
new
QueryWrapper
<
KqglAssoDkdz
>().
lambda
().
eq
(
KqglAssoDkdz:
:
getQyid
,
userBean
.
getOrgCode
())
.
orderByAsc
(
KqglAssoDkdz:
:
getId
)
);
List
<
KqglAssoDkdz
>
shiftList
=
KqglAssoDkdz
.
builder
().
build
().
selectList
(
new
QueryWrapper
<
KqglAssoDkdz
>().
lambda
().
eq
(
KqglAssoDkdz:
:
getQyid
,
userBean
.
getOrgCode
()));
return
ResultUtil
.
data
(
shiftList
);
return
ResultUtil
.
data
(
shiftList
);
}
}
...
@@ -1181,7 +1181,7 @@ public class TimeCardController {
...
@@ -1181,7 +1181,7 @@ public class TimeCardController {
@ApiOperation
(
value
=
"36:获取打卡WIFI数据"
,
httpMethod
=
"GET"
,
notes
=
"接口发布说明"
)
@ApiOperation
(
value
=
"36:获取打卡WIFI数据"
,
httpMethod
=
"GET"
,
notes
=
"接口发布说明"
)
@ApiOperationSupport
(
order
=
36
)
@ApiOperationSupport
(
order
=
36
)
public
Result
<
Object
>
getInGroupPunchWIFI
(
@CurrentUser
UserBean
userBean
)
{
public
Result
<
Object
>
getInGroupPunchWIFI
(
@CurrentUser
UserBean
userBean
)
{
List
<
KqglAssoDkwx
>
shiftList
=
KqglAssoDkwx
.
builder
().
build
().
selectList
(
new
QueryWrapper
<
KqglAssoDkwx
>().
lambda
().
eq
(
KqglAssoDkwx:
:
getQyid
,
userBean
.
getOrgCode
())
.
orderByAsc
(
KqglAssoDkwx:
:
getId
)
);
List
<
KqglAssoDkwx
>
shiftList
=
KqglAssoDkwx
.
builder
().
build
().
selectList
(
new
QueryWrapper
<
KqglAssoDkwx
>().
lambda
().
eq
(
KqglAssoDkwx:
:
getQyid
,
userBean
.
getOrgCode
()));
return
ResultUtil
.
data
(
shiftList
);
return
ResultUtil
.
data
(
shiftList
);
}
}
...
@@ -1192,7 +1192,7 @@ public class TimeCardController {
...
@@ -1192,7 +1192,7 @@ public class TimeCardController {
@ApiOperation
(
value
=
"37:获取班次-根据 组织机构代码"
,
httpMethod
=
"GET"
,
notes
=
"接口发布说明"
)
@ApiOperation
(
value
=
"37:获取班次-根据 组织机构代码"
,
httpMethod
=
"GET"
,
notes
=
"接口发布说明"
)
@ApiOperationSupport
(
order
=
37
)
@ApiOperationSupport
(
order
=
37
)
public
Result
<
Object
>
getAttShiftList
(
@CurrentUser
UserBean
userBean
)
{
public
Result
<
Object
>
getAttShiftList
(
@CurrentUser
UserBean
userBean
)
{
List
<
KqglAssoBcsz
>
attshiftList
=
KqglAssoBcsz
.
builder
().
build
().
selectList
(
new
QueryWrapper
<
KqglAssoBcsz
>().
lambda
().
eq
(
KqglAssoBcsz:
:
getQyid
,
userBean
.
getOrgCode
())
.
orderByAsc
(
KqglAssoBcsz:
:
getId
)
);
List
<
KqglAssoBcsz
>
attshiftList
=
KqglAssoBcsz
.
builder
().
build
().
selectList
(
new
QueryWrapper
<
KqglAssoBcsz
>().
lambda
().
eq
(
KqglAssoBcsz:
:
getQyid
,
userBean
.
getOrgCode
()));
return
ResultUtil
.
data
(
attshiftList
);
return
ResultUtil
.
data
(
attshiftList
);
}
}
...
...
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