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
9ff4824b
Commit
9ff4824b
authored
4 years ago
by
leialin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'lal' into 'develop'
提交 See merge request 8timerv2/8timerapiv200!392
parents
9c09c7ef
3b645bf7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
13 deletions
+13
-13
src/main/java/cn/timer/api/controller/LoginController.java
+1
-1
src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
+6
-6
src/main/java/cn/timer/api/controller/kqgl/atttimer/LastMonthtimingExport.java
+6
-6
No files found.
src/main/java/cn/timer/api/controller/LoginController.java
View file @
9ff4824b
...
...
@@ -1062,7 +1062,7 @@ public class LoginController {
}
@GetMapping
(
value
=
"/switch/{orgcodeid}"
)
@GetMapping
(
value
=
"/switch
ing_enterprises
/{orgcodeid}"
)
@ApiOperation
(
value
=
"切换企业"
,
httpMethod
=
"GET"
,
notes
=
"是否有账号"
)
public
Result
<
QyzxEmpLogin
>
Switching_Enterprises
(
@CurrentUser
UserBean
userBean
,
@PathVariable
(
"orgcodeid"
)
Integer
orgcodeid
,
HttpServletRequest
request
)
{
//
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
View file @
9ff4824b
...
...
@@ -96,7 +96,7 @@ public class AttendanceTaskTiming{
//typeid:1-员工 2-考勤组
// @Scheduled(cron = "0 */5 * * * ?")
// @Scheduled(cron = "0 50
1
8 * * ?")
// @Scheduled(cron = "0 50 8 * * ?")
@Scheduled
(
cron
=
"0 0 8,12,16,20 * * ?"
)
//每天上午8、12点,下午16点,20点 执行
public
void
AttendanceTask
()
throws
ParseException
{
...
...
@@ -544,23 +544,23 @@ public class AttendanceTaskTiming{
}
}
rowData
.
remove
(
u
);
rowData
.
add
(
u
,
lea
.
getStartTime
()
+
"到"
+
lea
.
getEndTime
(
)+
"请"
+
leavetype
+
lea
.
getDuration
()+
company
);
rowData
.
add
(
u
,
(
lea
.
getStartTime
()).
substring
(
5
,
16
)
+
"到"
+
(
lea
.
getEndTime
()).
substring
(
5
,
16
)+
"请"
+
leavetype
+
lea
.
getDuration
()+
company
);
}
if
(
ClockInTool
.
contains
(
ClockInTool
.
deleteArrayNull
(
travels
),
num
))
{
KqglAssoRelationSummary
lea
=
KqglAssoRelationSummary
.
builder
().
build
().
selectOne
(
new
QueryWrapper
<
KqglAssoRelationSummary
>().
lambda
().
eq
(
KqglAssoRelationSummary:
:
getUserId
,
user
.
getEmpnum
()).
eq
(
KqglAssoRelationSummary:
:
getAppTime
,
num
).
eq
(
KqglAssoRelationSummary:
:
getApprovalType
,
3
));
rowData
.
remove
(
u
);
rowData
.
add
(
u
,
lea
.
getStartTime
()
+
"到"
+
lea
.
getEndTime
(
)+
"出差"
+
lea
.
getDuration
()+
"天"
);
rowData
.
add
(
u
,
(
lea
.
getStartTime
()).
substring
(
5
,
16
)
+
"到"
+
(
lea
.
getEndTime
()).
substring
(
5
,
16
)+
"出差"
+
lea
.
getDuration
()+
"天"
);
}
if
(
ClockInTool
.
contains
(
ClockInTool
.
deleteArrayNull
(
goouts
),
num
))
{
KqglAssoRelationSummary
lea
=
KqglAssoRelationSummary
.
builder
().
build
().
selectOne
(
new
QueryWrapper
<
KqglAssoRelationSummary
>().
lambda
().
eq
(
KqglAssoRelationSummary:
:
getUserId
,
user
.
getEmpnum
()).
eq
(
KqglAssoRelationSummary:
:
getAppTime
,
num
).
eq
(
KqglAssoRelationSummary:
:
getApprovalType
,
4
));
rowData
.
remove
(
u
);
rowData
.
add
(
u
,
lea
.
getStartTime
()
+
"到"
+
lea
.
getEndTime
(
)+
"外出"
+
lea
.
getDuration
()+
"天"
);
rowData
.
add
(
u
,
(
lea
.
getStartTime
()).
substring
(
5
,
16
)
+
"到"
+
(
lea
.
getEndTime
()).
substring
(
5
,
16
)+
"外出"
+
lea
.
getDuration
()+
"天"
);
}
if
(
ClockInTool
.
contains
(
ClockInTool
.
deleteArrayNull
(
cards
),
num
))
{
KqglAssoRelationSummary
lea
=
KqglAssoRelationSummary
.
builder
().
build
().
selectOne
(
new
QueryWrapper
<
KqglAssoRelationSummary
>().
lambda
().
eq
(
KqglAssoRelationSummary:
:
getUserId
,
user
.
getEmpnum
()).
eq
(
KqglAssoRelationSummary:
:
getAppTime
,
num
).
eq
(
KqglAssoRelationSummary:
:
getApprovalType
,
5
));
rowData
.
remove
(
u
);
rowData
.
add
(
u
,
"已补卡:"
+
lea
.
getStartTime
(
));
rowData
.
add
(
u
,
"已补卡:"
+
(
lea
.
getStartTime
()).
substring
(
5
,
16
));
}
if
(
ClockInTool
.
contains
(
ClockInTool
.
deleteArrayNull
(
overtimes
),
num
))
{
...
...
@@ -582,7 +582,7 @@ public class AttendanceTaskTiming{
else
{
method
=
"转调休或加班费"
;}
rowData
.
remove
(
u
);
rowData
.
add
(
u
,
lea
.
getStartTime
()
+
"到"
+
lea
.
getEndTime
(
)+
"加班"
+
lea
.
getDuration
()+
company
+
"["
+
method
+
"]"
);
rowData
.
add
(
u
,
(
lea
.
getStartTime
()).
substring
(
5
,
16
)
+
"到"
+
(
lea
.
getEndTime
()).
substring
(
5
,
16
)+
"加班"
+
lea
.
getDuration
()+
company
+
"["
+
method
+
"]"
);
//防止多运算
if
(
lea
.
getOrdernum
()
==
lea
.
getTotals
())
{
//加班补偿方式 1:转调休;2:转加班费;3:转调休或加班费
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/kqgl/atttimer/LastMonthtimingExport.java
View file @
9ff4824b
...
...
@@ -89,7 +89,7 @@ public class LastMonthtimingExport {
SimpleDateFormat
format
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
);
// @Scheduled(cron = "0
53 1
8 * * ?")
// @Scheduled(cron = "0
44
8 * * ?")
public
void
LastMonthtimingAttendanceTask
()
throws
ParseException
{
//获取前月的最后一天
...
...
@@ -534,23 +534,23 @@ public class LastMonthtimingExport {
}
}
rowData
.
remove
(
u
);
rowData
.
add
(
u
,
lea
.
getStartTime
()
+
"到"
+
lea
.
getEndTime
(
)+
"请"
+
leavetype
+
lea
.
getDuration
()+
company
);
rowData
.
add
(
u
,
(
lea
.
getStartTime
()).
substring
(
5
,
16
)
+
"到"
+
(
lea
.
getEndTime
()).
substring
(
5
,
16
)+
"请"
+
leavetype
+
lea
.
getDuration
()+
company
);
}
if
(
ClockInTool
.
contains
(
ClockInTool
.
deleteArrayNull
(
travels
),
num
))
{
KqglAssoRelationSummary
lea
=
KqglAssoRelationSummary
.
builder
().
build
().
selectOne
(
new
QueryWrapper
<
KqglAssoRelationSummary
>().
lambda
().
eq
(
KqglAssoRelationSummary:
:
getUserId
,
user
.
getEmpnum
()).
eq
(
KqglAssoRelationSummary:
:
getAppTime
,
num
).
eq
(
KqglAssoRelationSummary:
:
getApprovalType
,
3
));
rowData
.
remove
(
u
);
rowData
.
add
(
u
,
lea
.
getStartTime
()
+
"到"
+
lea
.
getEndTime
(
)+
"出差"
+
lea
.
getDuration
()+
"天"
);
rowData
.
add
(
u
,
(
lea
.
getStartTime
()).
substring
(
5
,
16
)
+
"到"
+
(
lea
.
getEndTime
()).
substring
(
5
,
16
)+
"出差"
+
lea
.
getDuration
()+
"天"
);
}
if
(
ClockInTool
.
contains
(
ClockInTool
.
deleteArrayNull
(
goouts
),
num
))
{
KqglAssoRelationSummary
lea
=
KqglAssoRelationSummary
.
builder
().
build
().
selectOne
(
new
QueryWrapper
<
KqglAssoRelationSummary
>().
lambda
().
eq
(
KqglAssoRelationSummary:
:
getUserId
,
user
.
getEmpnum
()).
eq
(
KqglAssoRelationSummary:
:
getAppTime
,
num
).
eq
(
KqglAssoRelationSummary:
:
getApprovalType
,
4
));
rowData
.
remove
(
u
);
rowData
.
add
(
u
,
lea
.
getStartTime
()
+
"到"
+
lea
.
getEndTime
(
)+
"外出"
+
lea
.
getDuration
()+
"天"
);
rowData
.
add
(
u
,
(
lea
.
getStartTime
()).
substring
(
5
,
16
)
+
"到"
+
(
lea
.
getEndTime
()).
substring
(
5
,
16
)+
"外出"
+
lea
.
getDuration
()+
"天"
);
}
if
(
ClockInTool
.
contains
(
ClockInTool
.
deleteArrayNull
(
cards
),
num
))
{
KqglAssoRelationSummary
lea
=
KqglAssoRelationSummary
.
builder
().
build
().
selectOne
(
new
QueryWrapper
<
KqglAssoRelationSummary
>().
lambda
().
eq
(
KqglAssoRelationSummary:
:
getUserId
,
user
.
getEmpnum
()).
eq
(
KqglAssoRelationSummary:
:
getAppTime
,
num
).
eq
(
KqglAssoRelationSummary:
:
getApprovalType
,
5
));
rowData
.
remove
(
u
);
rowData
.
add
(
u
,
"已补卡:"
+
lea
.
getStartTime
(
));
rowData
.
add
(
u
,
"已补卡:"
+
(
lea
.
getStartTime
()).
substring
(
5
,
16
));
}
if
(
ClockInTool
.
contains
(
ClockInTool
.
deleteArrayNull
(
overtimes
),
num
))
{
...
...
@@ -572,7 +572,7 @@ public class LastMonthtimingExport {
else
{
method
=
"转调休或加班费"
;}
rowData
.
remove
(
u
);
rowData
.
add
(
u
,
lea
.
getStartTime
()
+
"到"
+
lea
.
getEndTime
(
)+
"加班"
+
lea
.
getDuration
()+
company
+
"["
+
method
+
"]"
);
rowData
.
add
(
u
,
(
lea
.
getStartTime
()).
substring
(
5
,
16
)
+
"到"
+
(
lea
.
getEndTime
()).
substring
(
5
,
16
)+
"加班"
+
lea
.
getDuration
()+
company
+
"["
+
method
+
"]"
);
//防止多运算
if
(
lea
.
getOrdernum
()
==
lea
.
getTotals
())
{
//加班补偿方式 1:转调休;2:转加班费;3:转调休或加班费
...
...
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