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
6c80175b
Commit
6c80175b
authored
4 years ago
by
lal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交
parent
b2124c94
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
9 deletions
+11
-9
src/main/java/cn/timer/api/controller/kqgl/AttController.java
+9
-7
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
+2
-2
No files found.
src/main/java/cn/timer/api/controller/kqgl/AttController.java
View file @
6c80175b
...
@@ -1749,7 +1749,7 @@ public class AttController {
...
@@ -1749,7 +1749,7 @@ public class AttController {
appmaps
[
d1
]
=
spe
.
getTsrq
();
appmaps
[
d1
]
=
spe
.
getTsrq
();
d1
++;
d1
++;
}
}
List
<
AttendanceWeeklySch
>
atwek
=
attendanceweeklyschservice
.
selectAttendanceMadeByUserid
(
Integer
.
valueOf
(
kqry
.
getEmpNum
()));
List
<
AttendanceWeeklySch
>
atwek
=
attendanceweeklyschservice
.
selectAttendanceMadeByUserid
(
Integer
.
valueOf
(
kqry
.
getEmpNum
())
,
kqry
.
getOrgCode
()
);
String
[]
week
=
new
String
[
atwek
.
size
()];
String
[]
week
=
new
String
[
atwek
.
size
()];
int
e
=
0
;
int
e
=
0
;
for
(
AttendanceWeeklySch
awek
:
atwek
){
for
(
AttendanceWeeklySch
awek
:
atwek
){
...
@@ -1811,7 +1811,7 @@ public class AttController {
...
@@ -1811,7 +1811,7 @@ public class AttController {
apr
.
setRestday
(
xiuxi
);
//休息天数
apr
.
setRestday
(
xiuxi
);
//休息天数
apr
.
setAnswerday
(
shangban
);
//应出勤
apr
.
setAnswerday
(
shangban
);
//应出勤
}
else
{
}
else
{
List
<
AttendanceWeeklySch
>
atwek
=
attendanceweeklyschservice
.
selectAttendanceMadeByUserid
(
Integer
.
valueOf
(
kqry
.
getEmpNum
()));
List
<
AttendanceWeeklySch
>
atwek
=
attendanceweeklyschservice
.
selectAttendanceMadeByUserid
(
Integer
.
valueOf
(
kqry
.
getEmpNum
())
,
kqry
.
getOrgCode
()
);
String
[]
week
=
new
String
[
atwek
.
size
()];
String
[]
week
=
new
String
[
atwek
.
size
()];
int
e
=
0
;
int
e
=
0
;
for
(
AttendanceWeeklySch
awek
:
atwek
){
for
(
AttendanceWeeklySch
awek
:
atwek
){
...
@@ -2130,7 +2130,7 @@ public class AttController {
...
@@ -2130,7 +2130,7 @@ public class AttController {
d
++;
d
++;
}
}
List
<
AttendanceWeeklySch
>
atwek
=
attendanceweeklyschservice
.
selectAttendanceMadeByUserid
(
userid
);
List
<
AttendanceWeeklySch
>
atwek
=
attendanceweeklyschservice
.
selectAttendanceMadeByUserid
(
userid
,
qyid
);
String
[]
week
=
new
String
[
atwek
.
size
()];
String
[]
week
=
new
String
[
atwek
.
size
()];
int
e
=
0
;
int
e
=
0
;
for
(
AttendanceWeeklySch
awek
:
atwek
){
for
(
AttendanceWeeklySch
awek
:
atwek
){
...
@@ -2185,7 +2185,7 @@ public class AttController {
...
@@ -2185,7 +2185,7 @@ public class AttController {
attcal
.
setAttshouldmade
(
shangban
);
//应出勤
attcal
.
setAttshouldmade
(
shangban
);
//应出勤
}
else
{
}
else
{
List
<
AttendanceWeeklySch
>
atwek
=
attendanceweeklyschservice
.
selectAttendanceMadeByUserid
(
userid
);
List
<
AttendanceWeeklySch
>
atwek
=
attendanceweeklyschservice
.
selectAttendanceMadeByUserid
(
userid
,
qyid
);
String
[]
week
=
new
String
[
atwek
.
size
()];
String
[]
week
=
new
String
[
atwek
.
size
()];
int
e
=
0
;
int
e
=
0
;
for
(
AttendanceWeeklySch
awek
:
atwek
){
for
(
AttendanceWeeklySch
awek
:
atwek
){
...
@@ -2275,7 +2275,9 @@ public class AttController {
...
@@ -2275,7 +2275,9 @@ public class AttController {
}
}
/***********APP--调用接口结束*****************/
/********************************************************************************************************************************************************************************************************************************************************************************/
/**************************************************************************** APP--调用接口结束 *****************************************************************************************************************************************************************************/
/********************************************************************************************************************************************************************************************************************************************************************************/
/**
/**
* 根据 年、月 获取对应的月份 的 天数
* 根据 年、月 获取对应的月份 的 天数
...
@@ -5138,7 +5140,7 @@ public class AttController {
...
@@ -5138,7 +5140,7 @@ public class AttController {
appmaps
[
d1
]
=
spe
.
getTsrq
();
appmaps
[
d1
]
=
spe
.
getTsrq
();
d1
++;
d1
++;
}
}
List
<
AttendanceWeeklySch
>
atwek
=
attendanceweeklyschservice
.
selectAttendanceMadeByUserid
(
Integer
.
valueOf
(
kqry
.
getEmpNum
()));
List
<
AttendanceWeeklySch
>
atwek
=
attendanceweeklyschservice
.
selectAttendanceMadeByUserid
(
Integer
.
valueOf
(
kqry
.
getEmpNum
())
,
qyid
);
String
[]
week
=
new
String
[
atwek
.
size
()];
String
[]
week
=
new
String
[
atwek
.
size
()];
int
e
=
0
;
int
e
=
0
;
for
(
AttendanceWeeklySch
awek
:
atwek
){
for
(
AttendanceWeeklySch
awek
:
atwek
){
...
@@ -5200,7 +5202,7 @@ public class AttController {
...
@@ -5200,7 +5202,7 @@ public class AttController {
apr
.
setRestday
(
xiuxi
);
//休息天数
apr
.
setRestday
(
xiuxi
);
//休息天数
apr
.
setAnswerday
(
shangban
);
//应出勤
apr
.
setAnswerday
(
shangban
);
//应出勤
}
else
{
}
else
{
List
<
AttendanceWeeklySch
>
atwek
=
attendanceweeklyschservice
.
selectAttendanceMadeByUserid
(
Integer
.
valueOf
(
kqry
.
getEmpNum
()));
List
<
AttendanceWeeklySch
>
atwek
=
attendanceweeklyschservice
.
selectAttendanceMadeByUserid
(
Integer
.
valueOf
(
kqry
.
getEmpNum
())
,
qyid
);
String
[]
week
=
new
String
[
atwek
.
size
()];
String
[]
week
=
new
String
[
atwek
.
size
()];
int
e
=
0
;
int
e
=
0
;
for
(
AttendanceWeeklySch
awek
:
atwek
){
for
(
AttendanceWeeklySch
awek
:
atwek
){
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
View file @
6c80175b
...
@@ -1581,7 +1581,7 @@ public class SalaryManagementController {
...
@@ -1581,7 +1581,7 @@ public class SalaryManagementController {
appmaps
[
d1
]
=
spe
.
getTsrq
();
appmaps
[
d1
]
=
spe
.
getTsrq
();
d1
++;
d1
++;
}
}
List
<
AttendanceWeeklySch
>
atwek
=
attendanceweeklyschservice
.
selectAttendanceMadeByUserid
(
userid
);
List
<
AttendanceWeeklySch
>
atwek
=
attendanceweeklyschservice
.
selectAttendanceMadeByUserid
(
userid
,
orgCode
);
String
[]
week
=
new
String
[
atwek
.
size
()];
String
[]
week
=
new
String
[
atwek
.
size
()];
int
e
=
0
;
int
e
=
0
;
for
(
AttendanceWeeklySch
awek
:
atwek
){
for
(
AttendanceWeeklySch
awek
:
atwek
){
...
@@ -1642,7 +1642,7 @@ public class SalaryManagementController {
...
@@ -1642,7 +1642,7 @@ public class SalaryManagementController {
attrep
.
setRestday
(
xiuxi
);
//休息天数
attrep
.
setRestday
(
xiuxi
);
//休息天数
attrep
.
setAnswerday
(
shangban
);
//应出勤
attrep
.
setAnswerday
(
shangban
);
//应出勤
}
else
{
}
else
{
List
<
AttendanceWeeklySch
>
atwek
=
attendanceweeklyschservice
.
selectAttendanceMadeByUserid
(
userid
);
List
<
AttendanceWeeklySch
>
atwek
=
attendanceweeklyschservice
.
selectAttendanceMadeByUserid
(
userid
,
orgCode
);
String
[]
week
=
new
String
[
atwek
.
size
()];
String
[]
week
=
new
String
[
atwek
.
size
()];
int
e
=
0
;
int
e
=
0
;
for
(
AttendanceWeeklySch
awek
:
atwek
){
for
(
AttendanceWeeklySch
awek
:
atwek
){
...
...
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