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
98e30bc6
Commit
98e30bc6
authored
4 years ago
by
ilal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交
parent
d299c07b
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
23 additions
and
23 deletions
+23
-23
src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
+9
-10
src/main/java/cn/timer/api/controller/kqgl/atttimer/LastMonthtimingExport.java
+6
-6
src/main/java/cn/timer/api/controller/kqgl/atttimer/RealTimeUpdate.java
+5
-5
src/main/java/cn/timer/api/dao/kqmk/KqglAssoRelationSummaryMapper.java
+1
-1
src/main/resources/mapping/kqmk/KqglAssoRelationSummaryMapper.xml
+1
-0
src/main/resources/mapping/xcgl/XcglAssoZxfjkcMapper.xml
+1
-1
No files found.
src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
View file @
98e30bc6
...
@@ -98,8 +98,8 @@ public class AttendanceTaskTiming{
...
@@ -98,8 +98,8 @@ public class AttendanceTaskTiming{
//typeid:1-员工 2-考勤组
//typeid:1-员工 2-考勤组
// @Scheduled(cron = "0 */5 * * * ?")
// @Scheduled(cron = "0 */5 * * * ?")
// @Scheduled(cron = "0
39 10
* * ?")
// @Scheduled(cron = "0
14 17
* * ?")
//
@Scheduled(cron = "0 0 8,12,16,20 * * ?")//每天上午8、12点,下午16点,20点 执行
@Scheduled
(
cron
=
"0 0 8,12,16,20 * * ?"
)
//每天上午8、12点,下午16点,20点 执行
public
void
AttendanceTask
()
throws
ParseException
{
public
void
AttendanceTask
()
throws
ParseException
{
boolean
implement
=
true
;
boolean
implement
=
true
;
...
@@ -124,16 +124,15 @@ public class AttendanceTaskTiming{
...
@@ -124,16 +124,15 @@ public class AttendanceTaskTiming{
String
[]
rangeArray
=
ClockInTool
.
listToString
(
ClockInTool
.
getDays
(
sdf1
.
format
(
c
.
getTime
()),
str
)).
split
(
";"
);
//目前为止所有日期
String
[]
rangeArray
=
ClockInTool
.
listToString
(
ClockInTool
.
getDays
(
sdf1
.
format
(
c
.
getTime
()),
str
)).
split
(
";"
);
//目前为止所有日期
String
[]
range
=
rangeArray
[
0
].
split
(
","
);
String
[]
range
=
rangeArray
[
0
].
split
(
","
);
// Long endDateyesterday = DateUtil.getnowEndTime(23,DateUtil.getStringTime(yesterday,"yyyy-MM-dd")).getTime();
int
year
=
Calendar
.
getInstance
().
get
(
Calendar
.
YEAR
);
int
year
=
Calendar
.
getInstance
().
get
(
Calendar
.
YEAR
);
int
month
=
Calendar
.
getInstance
().
get
(
Calendar
.
MONTH
)
+
1
;
int
month
=
Calendar
.
getInstance
().
get
(
Calendar
.
MONTH
)
+
1
;
int
summaryid
=
0
;
//汇总id
int
summaryid
=
0
;
//汇总id
List
<
QyzxEntInfoM
>
orgcodelist
=
qyzxentinfommapper
.
selectList
(
new
QueryWrapper
<
QyzxEntInfoM
>());
//系统中的所有公司 所有未到期的公司
//
List<QyzxEntInfoM> orgcodelist = qyzxentinfommapper.selectList(new QueryWrapper<QyzxEntInfoM>());//系统中的所有公司 所有未到期的公司
// List<QyzxEntInfoM> orgcodelist = qyzxentinfommapper.selectList(new QueryWrapper<QyzxEntInfoM>().lambda().eq(QyzxEntInfoM::getId, 6
));
List
<
QyzxEntInfoM
>
orgcodelist
=
qyzxentinfommapper
.
selectList
(
new
QueryWrapper
<
QyzxEntInfoM
>().
lambda
().
eq
(
QyzxEntInfoM:
:
getId
,
3
));
for
(
int
t
=
0
;
t
<
orgcodelist
.
size
();
t
++){
for
(
int
t
=
0
;
t
<
orgcodelist
.
size
();
t
++){
int
org_code
=
orgcodelist
.
get
(
t
).
getId
();
//企业组织代码
int
org_code
=
orgcodelist
.
get
(
t
).
getId
();
//企业组织代码
...
@@ -490,7 +489,7 @@ public class AttendanceTaskTiming{
...
@@ -490,7 +489,7 @@ public class AttendanceTaskTiming{
absenlatetimes
=
subs
.
getKgcdfzstotal
();
absenlatetimes
=
subs
.
getKgcdfzstotal
();
}
}
//具体请假天数
//具体请假天数
List
<
KqglAssoRelationSummary
>
leavetotal
=
kqglassorelationsummarymapper
.
SpecificLeave
(
user
.
getEmpnum
(),
2
,
ttstr
);
List
<
KqglAssoRelationSummary
>
leavetotal
=
kqglassorelationsummarymapper
.
SpecificLeave
(
user
.
getEmpnum
(),
2
,
ttstr
,
org_code
);
String
[]
leaves
=
new
String
[
leavetotal
.
size
()];
String
[]
leaves
=
new
String
[
leavetotal
.
size
()];
int
l
=
0
;
int
l
=
0
;
if
(
leavetotal
.
size
()>
0
)
{
if
(
leavetotal
.
size
()>
0
)
{
...
@@ -500,7 +499,7 @@ public class AttendanceTaskTiming{
...
@@ -500,7 +499,7 @@ public class AttendanceTaskTiming{
}
}
}
}
//具体加班天数
//具体加班天数
List
<
KqglAssoRelationSummary
>
overtitotal
=
kqglassorelationsummarymapper
.
SpecificLeave
(
user
.
getEmpnum
(),
1
,
ttstr
);
List
<
KqglAssoRelationSummary
>
overtitotal
=
kqglassorelationsummarymapper
.
SpecificLeave
(
user
.
getEmpnum
(),
1
,
ttstr
,
org_code
);
String
[]
overtimes
=
new
String
[
overtitotal
.
size
()];
String
[]
overtimes
=
new
String
[
overtitotal
.
size
()];
int
o
=
0
;
int
o
=
0
;
if
(
overtitotal
.
size
()
>
0
)
{
if
(
overtitotal
.
size
()
>
0
)
{
...
@@ -510,7 +509,7 @@ public class AttendanceTaskTiming{
...
@@ -510,7 +509,7 @@ public class AttendanceTaskTiming{
}
}
}
}
//具体出差天数
//具体出差天数
List
<
KqglAssoRelationSummary
>
trtotal
=
kqglassorelationsummarymapper
.
SpecificLeave
(
user
.
getEmpnum
(),
3
,
ttstr
);
List
<
KqglAssoRelationSummary
>
trtotal
=
kqglassorelationsummarymapper
.
SpecificLeave
(
user
.
getEmpnum
(),
3
,
ttstr
,
org_code
);
String
[]
travels
=
new
String
[
trtotal
.
size
()];
String
[]
travels
=
new
String
[
trtotal
.
size
()];
int
cx
=
0
;
int
cx
=
0
;
if
(
trtotal
.
size
()>
0
)
{
if
(
trtotal
.
size
()>
0
)
{
...
@@ -520,7 +519,7 @@ public class AttendanceTaskTiming{
...
@@ -520,7 +519,7 @@ public class AttendanceTaskTiming{
}
}
}
}
//具体外出天数
//具体外出天数
List
<
KqglAssoRelationSummary
>
goouttotal
=
kqglassorelationsummarymapper
.
SpecificLeave
(
user
.
getEmpnum
(),
4
,
ttstr
);
List
<
KqglAssoRelationSummary
>
goouttotal
=
kqglassorelationsummarymapper
.
SpecificLeave
(
user
.
getEmpnum
(),
4
,
ttstr
,
org_code
);
String
[]
goouts
=
new
String
[
goouttotal
.
size
()];
String
[]
goouts
=
new
String
[
goouttotal
.
size
()];
int
wc
=
0
;
int
wc
=
0
;
if
(
goouttotal
.
size
()>
0
)
{
if
(
goouttotal
.
size
()>
0
)
{
...
@@ -530,7 +529,7 @@ public class AttendanceTaskTiming{
...
@@ -530,7 +529,7 @@ public class AttendanceTaskTiming{
}
}
}
}
//具体补卡天数
//具体补卡天数
List
<
KqglAssoRelationSummary
>
cardtotal
=
kqglassorelationsummarymapper
.
SpecificLeave
(
user
.
getEmpnum
(),
5
,
ttstr
);
List
<
KqglAssoRelationSummary
>
cardtotal
=
kqglassorelationsummarymapper
.
SpecificLeave
(
user
.
getEmpnum
(),
5
,
ttstr
,
org_code
);
String
[]
cards
=
new
String
[
cardtotal
.
size
()];
String
[]
cards
=
new
String
[
cardtotal
.
size
()];
int
bk
=
0
;
int
bk
=
0
;
if
(
cardtotal
.
size
()>
0
)
{
if
(
cardtotal
.
size
()>
0
)
{
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/kqgl/atttimer/LastMonthtimingExport.java
View file @
98e30bc6
...
@@ -91,7 +91,7 @@ public class LastMonthtimingExport {
...
@@ -91,7 +91,7 @@ public class LastMonthtimingExport {
SimpleDateFormat
format
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
);
SimpleDateFormat
format
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
);
// @Scheduled(cron = "0 5 11 * * ?")
// @Scheduled(cron = "0 5 11 * * ?")
//
@Scheduled(cron = "0 0 4,20 * * ?")//每天上午4点,下午20点 执行
@Scheduled
(
cron
=
"0 0 4,20 * * ?"
)
//每天上午4点,下午20点 执行
public
void
LastMonthtimingAttendanceTask
()
throws
ParseException
{
public
void
LastMonthtimingAttendanceTask
()
throws
ParseException
{
//获取前月的最后一天
//获取前月的最后一天
...
@@ -471,7 +471,7 @@ public class LastMonthtimingExport {
...
@@ -471,7 +471,7 @@ public class LastMonthtimingExport {
absenlatetimes
=
subs
.
getKgcdfzstotal
();
absenlatetimes
=
subs
.
getKgcdfzstotal
();
}
}
//具体请假天数
//具体请假天数
List
<
KqglAssoRelationSummary
>
leavetotal
=
kqglassorelationsummarymapper
.
SpecificLeave
(
user
.
getEmpnum
(),
2
,
ttstr
);
List
<
KqglAssoRelationSummary
>
leavetotal
=
kqglassorelationsummarymapper
.
SpecificLeave
(
user
.
getEmpnum
(),
2
,
ttstr
,
org_code
);
String
[]
leaves
=
new
String
[
leavetotal
.
size
()];
String
[]
leaves
=
new
String
[
leavetotal
.
size
()];
int
l
=
0
;
int
l
=
0
;
if
(
leavetotal
.
size
()>
0
)
{
if
(
leavetotal
.
size
()>
0
)
{
...
@@ -481,7 +481,7 @@ public class LastMonthtimingExport {
...
@@ -481,7 +481,7 @@ public class LastMonthtimingExport {
}
}
}
}
//具体加班天数
//具体加班天数
List
<
KqglAssoRelationSummary
>
overtitotal
=
kqglassorelationsummarymapper
.
SpecificLeave
(
user
.
getEmpnum
(),
1
,
ttstr
);
List
<
KqglAssoRelationSummary
>
overtitotal
=
kqglassorelationsummarymapper
.
SpecificLeave
(
user
.
getEmpnum
(),
1
,
ttstr
,
org_code
);
String
[]
overtimes
=
new
String
[
overtitotal
.
size
()];
String
[]
overtimes
=
new
String
[
overtitotal
.
size
()];
int
o
=
0
;
int
o
=
0
;
if
(
overtitotal
.
size
()
>
0
)
{
if
(
overtitotal
.
size
()
>
0
)
{
...
@@ -491,7 +491,7 @@ public class LastMonthtimingExport {
...
@@ -491,7 +491,7 @@ public class LastMonthtimingExport {
}
}
}
}
//具体出差天数
//具体出差天数
List
<
KqglAssoRelationSummary
>
trtotal
=
kqglassorelationsummarymapper
.
SpecificLeave
(
user
.
getEmpnum
(),
3
,
ttstr
);
List
<
KqglAssoRelationSummary
>
trtotal
=
kqglassorelationsummarymapper
.
SpecificLeave
(
user
.
getEmpnum
(),
3
,
ttstr
,
org_code
);
String
[]
travels
=
new
String
[
trtotal
.
size
()];
String
[]
travels
=
new
String
[
trtotal
.
size
()];
int
cx
=
0
;
int
cx
=
0
;
if
(
trtotal
.
size
()>
0
)
{
if
(
trtotal
.
size
()>
0
)
{
...
@@ -501,7 +501,7 @@ public class LastMonthtimingExport {
...
@@ -501,7 +501,7 @@ public class LastMonthtimingExport {
}
}
}
}
//具体外出天数
//具体外出天数
List
<
KqglAssoRelationSummary
>
goouttotal
=
kqglassorelationsummarymapper
.
SpecificLeave
(
user
.
getEmpnum
(),
4
,
ttstr
);
List
<
KqglAssoRelationSummary
>
goouttotal
=
kqglassorelationsummarymapper
.
SpecificLeave
(
user
.
getEmpnum
(),
4
,
ttstr
,
org_code
);
String
[]
goouts
=
new
String
[
goouttotal
.
size
()];
String
[]
goouts
=
new
String
[
goouttotal
.
size
()];
int
wc
=
0
;
int
wc
=
0
;
if
(
goouttotal
.
size
()>
0
)
{
if
(
goouttotal
.
size
()>
0
)
{
...
@@ -511,7 +511,7 @@ public class LastMonthtimingExport {
...
@@ -511,7 +511,7 @@ public class LastMonthtimingExport {
}
}
}
}
//具体补卡天数
//具体补卡天数
List
<
KqglAssoRelationSummary
>
cardtotal
=
kqglassorelationsummarymapper
.
SpecificLeave
(
user
.
getEmpnum
(),
5
,
ttstr
);
List
<
KqglAssoRelationSummary
>
cardtotal
=
kqglassorelationsummarymapper
.
SpecificLeave
(
user
.
getEmpnum
(),
5
,
ttstr
,
org_code
);
String
[]
cards
=
new
String
[
cardtotal
.
size
()];
String
[]
cards
=
new
String
[
cardtotal
.
size
()];
int
bk
=
0
;
int
bk
=
0
;
if
(
cardtotal
.
size
()>
0
)
{
if
(
cardtotal
.
size
()>
0
)
{
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/kqgl/atttimer/RealTimeUpdate.java
View file @
98e30bc6
...
@@ -463,7 +463,7 @@ public class RealTimeUpdate{
...
@@ -463,7 +463,7 @@ public class RealTimeUpdate{
absenlatetimes
=
subs
.
getKgcdfzstotal
();
absenlatetimes
=
subs
.
getKgcdfzstotal
();
}
}
//具体请假天数
//具体请假天数
List
<
KqglAssoRelationSummary
>
leavetotal
=
kqglassorelationsummarymapper
.
SpecificLeave
(
user
.
getEmpnum
(),
2
,
ttstr
);
List
<
KqglAssoRelationSummary
>
leavetotal
=
kqglassorelationsummarymapper
.
SpecificLeave
(
user
.
getEmpnum
(),
2
,
ttstr
,
org_code
);
String
[]
leaves
=
new
String
[
leavetotal
.
size
()];
String
[]
leaves
=
new
String
[
leavetotal
.
size
()];
int
l
=
0
;
int
l
=
0
;
if
(
leavetotal
.
size
()>
0
)
{
if
(
leavetotal
.
size
()>
0
)
{
...
@@ -473,7 +473,7 @@ public class RealTimeUpdate{
...
@@ -473,7 +473,7 @@ public class RealTimeUpdate{
}
}
}
}
//具体加班天数
//具体加班天数
List
<
KqglAssoRelationSummary
>
overtitotal
=
kqglassorelationsummarymapper
.
SpecificLeave
(
user
.
getEmpnum
(),
1
,
ttstr
);
List
<
KqglAssoRelationSummary
>
overtitotal
=
kqglassorelationsummarymapper
.
SpecificLeave
(
user
.
getEmpnum
(),
1
,
ttstr
,
org_code
);
String
[]
overtimes
=
new
String
[
overtitotal
.
size
()];
String
[]
overtimes
=
new
String
[
overtitotal
.
size
()];
int
o
=
0
;
int
o
=
0
;
if
(
overtitotal
.
size
()
>
0
)
{
if
(
overtitotal
.
size
()
>
0
)
{
...
@@ -483,7 +483,7 @@ public class RealTimeUpdate{
...
@@ -483,7 +483,7 @@ public class RealTimeUpdate{
}
}
}
}
//具体出差天数
//具体出差天数
List
<
KqglAssoRelationSummary
>
trtotal
=
kqglassorelationsummarymapper
.
SpecificLeave
(
user
.
getEmpnum
(),
3
,
ttstr
);
List
<
KqglAssoRelationSummary
>
trtotal
=
kqglassorelationsummarymapper
.
SpecificLeave
(
user
.
getEmpnum
(),
3
,
ttstr
,
org_code
);
String
[]
travels
=
new
String
[
trtotal
.
size
()];
String
[]
travels
=
new
String
[
trtotal
.
size
()];
int
cx
=
0
;
int
cx
=
0
;
if
(
trtotal
.
size
()>
0
)
{
if
(
trtotal
.
size
()>
0
)
{
...
@@ -493,7 +493,7 @@ public class RealTimeUpdate{
...
@@ -493,7 +493,7 @@ public class RealTimeUpdate{
}
}
}
}
//具体外出天数
//具体外出天数
List
<
KqglAssoRelationSummary
>
goouttotal
=
kqglassorelationsummarymapper
.
SpecificLeave
(
user
.
getEmpnum
(),
4
,
ttstr
);
List
<
KqglAssoRelationSummary
>
goouttotal
=
kqglassorelationsummarymapper
.
SpecificLeave
(
user
.
getEmpnum
(),
4
,
ttstr
,
org_code
);
String
[]
goouts
=
new
String
[
goouttotal
.
size
()];
String
[]
goouts
=
new
String
[
goouttotal
.
size
()];
int
wc
=
0
;
int
wc
=
0
;
if
(
goouttotal
.
size
()>
0
)
{
if
(
goouttotal
.
size
()>
0
)
{
...
@@ -503,7 +503,7 @@ public class RealTimeUpdate{
...
@@ -503,7 +503,7 @@ public class RealTimeUpdate{
}
}
}
}
//具体补卡天数
//具体补卡天数
List
<
KqglAssoRelationSummary
>
cardtotal
=
kqglassorelationsummarymapper
.
SpecificLeave
(
user
.
getEmpnum
(),
5
,
ttstr
);
List
<
KqglAssoRelationSummary
>
cardtotal
=
kqglassorelationsummarymapper
.
SpecificLeave
(
user
.
getEmpnum
(),
5
,
ttstr
,
org_code
);
String
[]
cards
=
new
String
[
cardtotal
.
size
()];
String
[]
cards
=
new
String
[
cardtotal
.
size
()];
int
bk
=
0
;
int
bk
=
0
;
if
(
cardtotal
.
size
()>
0
)
{
if
(
cardtotal
.
size
()>
0
)
{
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dao/kqmk/KqglAssoRelationSummaryMapper.java
View file @
98e30bc6
...
@@ -18,7 +18,7 @@ public interface KqglAssoRelationSummaryMapper extends BaseMapper<KqglAssoRelati
...
@@ -18,7 +18,7 @@ public interface KqglAssoRelationSummaryMapper extends BaseMapper<KqglAssoRelati
KqglAssoRelationSummary
SecondaryValue
(
int
userid
,
int
approvaltype
,
String
time
);
KqglAssoRelationSummary
SecondaryValue
(
int
userid
,
int
approvaltype
,
String
time
);
List
<
KqglAssoRelationSummary
>
SpecificLeave
(
int
userid
,
int
approvaltype
,
String
apptime
);
List
<
KqglAssoRelationSummary
>
SpecificLeave
(
int
userid
,
int
approvaltype
,
String
apptime
,
int
orgcode
);
List
<
KqglAssoRelationSummary
>
LeaveInvestigation
(
int
userid
,
int
approvaltype
,
String
apptime
,
int
orgcode
);
List
<
KqglAssoRelationSummary
>
LeaveInvestigation
(
int
userid
,
int
approvaltype
,
String
apptime
,
int
orgcode
);
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/kqmk/KqglAssoRelationSummaryMapper.xml
View file @
98e30bc6
...
@@ -66,6 +66,7 @@
...
@@ -66,6 +66,7 @@
where res.user_id = #{userid}
where res.user_id = #{userid}
and res.approval_type = #{approvaltype}
and res.approval_type = #{approvaltype}
and SUBSTR(res.app_time,1,7) = #{apptime}
and SUBSTR(res.app_time,1,7) = #{apptime}
and res.org_code = #{orgcode}
</select>
</select>
<select
id=
"LeaveInvestigation"
resultMap=
"BaseResultMap"
>
<select
id=
"LeaveInvestigation"
resultMap=
"BaseResultMap"
>
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/xcgl/XcglAssoZxfjkcMapper.xml
View file @
98e30bc6
...
@@ -72,7 +72,7 @@
...
@@ -72,7 +72,7 @@
zxfj.continueedu as jxjy,
zxfj.continueedu as jxjy,
zxfj.totalmoney as lj
zxfj.totalmoney as lj
from yggl_main_emp emp
from yggl_main_emp emp
LEFT JOIN xcgl_asso_zxfjkc as zxfj on zxfj.userid = emp.emp_num
LEFT JOIN xcgl_asso_zxfjkc as zxfj on zxfj.userid = emp.emp_num
and zxfj.qyid = #{param.orgcode}
<if
test=
"param.datetime != ''"
>
<if
test=
"param.datetime != ''"
>
and zxfj.taxmonth = #{param.datetime}
and zxfj.taxmonth = #{param.datetime}
</if>
</if>
...
...
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