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
6d552d65
Commit
6d552d65
authored
4 years ago
by
Your Name
Committed by
chenzg
3 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新了考勤设置数据不全的问题
parent
9beaa760
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
16 deletions
+17
-16
src/main/java/cn/timer/api/controller/kqgl/AttController.java
+8
-5
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
+9
-11
No files found.
src/main/java/cn/timer/api/controller/kqgl/AttController.java
View file @
6d552d65
package
cn
.
timer
.
api
.
controller
.
kqgl
;
import
java.math.BigDecimal
;
import
java.text.DateFormat
;
import
java.text.ParseException
;
import
java.text.SimpleDateFormat
;
import
java.util.ArrayList
;
...
...
@@ -11,8 +10,8 @@ import java.util.Comparator;
import
java.util.Date
;
import
java.util.HashSet
;
import
java.util.List
;
import
java.util.Locale
;
import
java.util.Set
;
import
java.util.concurrent.locks.ReentrantLock
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
...
...
@@ -166,6 +165,7 @@ public class AttController {
@Autowired
private
CalendarAlarmMapper
calendaralarmservice
;
SimpleDateFormat
mat
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
);
SimpleDateFormat
famt
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
);
...
...
@@ -173,6 +173,8 @@ public class AttController {
SimpleDateFormat
sdf2
=
new
SimpleDateFormat
(
"EEE"
);
private
static
ReentrantLock
lock
=
new
ReentrantLock
();
//出现一个页面多次访问一个接口
/*********考勤机***********/
...
...
@@ -1237,10 +1239,10 @@ public class AttController {
@ApiOperation
(
value
=
""
,
httpMethod
=
"GET"
,
notes
=
"接口发布说明"
)
@ApiOperationSupport
(
order
=
33
)
public
Result
<
List
<
UserAttendanceRel
>>
getAttUserGroupList
(
@CurrentUser
UserBean
userBean
,
@PathVariable
(
"id"
)
Integer
id
)
{
lock
.
lock
();
int
qyid
=
userBean
.
getOrgCode
();
//坏小孩【企业id】
List
<
UserAttendanceRel
>
userattgor
=
userattendancerelservice
.
selectAttendanceOfficerByKqzid
(
id
,
qyid
);
lock
.
unlock
();
return
ResultUtil
.
data
(
userattgor
);
}
...
...
@@ -1251,7 +1253,7 @@ public class AttController {
@ApiOperation
(
value
=
"提醒人员"
,
httpMethod
=
"GET"
,
notes
=
"接口发布说明"
)
@ApiOperationSupport
(
order
=
34
)
public
Result
<
List
<
YgglMainEmp
>>
getAttReminderStaff
(
@PathVariable
(
"id"
)
Integer
id
,
@CurrentUser
UserBean
userBean
)
{
lock
.
lock
();
List
<
YgglMainEmp
>
yggl
=
new
ArrayList
<
YgglMainEmp
>();
AttendanceGroup
attgro
=
attendancegroupservice
.
selectByPrimaryKey
(
id
);
String
launchsstr
=
null
;
...
...
@@ -1272,6 +1274,7 @@ public class AttController {
yggl
.
add
(
txyy
);
}
}
lock
.
unlock
();
return
ResultUtil
.
data
(
yggl
);
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
View file @
6d552d65
...
...
@@ -8,6 +8,7 @@ import java.util.Calendar;
import
java.util.Date
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.concurrent.locks.ReentrantLock
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
...
...
@@ -148,6 +149,7 @@ public class TimeCardController {
@Value
(
"${config-8timer.machine8timerUrl}"
)
public
String
mac_command
;
// 回调地址
@Autowired
private
KqglAssoBcszMapper
kqglassobcszmapper
;
@Autowired
...
...
@@ -159,6 +161,7 @@ public class TimeCardController {
@Autowired
private
UserAttendanceRelMapper
userattendancerelmapper
;
private
static
ReentrantLock
lock
=
new
ReentrantLock
();
/**
* 查询列表-获取班次数据-分页
*/
...
...
@@ -1203,19 +1206,14 @@ public class TimeCardController {
@ApiOperation
(
value
=
"38:获取员工数据-根据 组织机构代码"
,
httpMethod
=
"GET"
,
notes
=
"接口发布说明"
)
@ApiOperationSupport
(
order
=
38
)
public
Result
<
Object
>
getEmployeeData
(
@CurrentUser
UserBean
userBean
)
{
lock
.
lock
();
List
<
YgglMainEmp
>
yggl
=
YgglMainEmp
.
builder
().
build
().
selectList
(
new
QueryWrapper
<
YgglMainEmp
>().
lambda
().
eq
(
YgglMainEmp:
:
getOrgCode
,
userBean
.
getOrgCode
()).
ne
(
YgglMainEmp:
:
getJobStatus
,
"3"
));
lock
.
unlock
();
return
ResultUtil
.
data
(
yggl
);
}
/**
* 成员设置数据
*/
@GetMapping
(
value
=
"/EmployeeNum"
)
@ApiOperation
(
value
=
"38.1:成员设置数据-根据 组织机构代码"
,
httpMethod
=
"GET"
,
notes
=
"接口发布说明"
)
@ApiOperationSupport
(
order
=
38
)
public
Result
<
Object
>
getEmployeeNum
(
@CurrentUser
UserBean
userBean
)
{
List
<
YgglMainEmp
>
yggl
=
YgglMainEmp
.
builder
().
build
().
selectList
(
new
QueryWrapper
<
YgglMainEmp
>().
lambda
().
eq
(
YgglMainEmp:
:
getOrgCode
,
userBean
.
getOrgCode
()).
ne
(
YgglMainEmp:
:
getJobStatus
,
"3"
));
return
ResultUtil
.
data
(
yggl
);
}
//用户与设备关系表
@Autowired
...
...
@@ -1510,7 +1508,7 @@ public class TimeCardController {
return
ResultUtil
.
data
(
usatt
);
}
// @SuppressWarnings("all")
// @SuppressWarnings("all")
@PostMapping
(
value
=
"/setmembers"
)
@ApiOperation
(
value
=
"考勤设置成员"
,
httpMethod
=
"POST"
,
notes
=
"接口发布说明"
)
public
Result
<
Object
>
Attsetmembers
(
@CurrentUser
UserBean
userBean
,
@RequestBody
AttMemberSettings
attsetuser
)
{
...
...
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