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
4d20dd88
Commit
4d20dd88
authored
4 years ago
by
mobh
Browse files
Options
Browse Files
Download
Plain Diff
提交冲突
parents
7c5f786c
93b93d37
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
5 deletions
+20
-5
src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
+4
-4
src/main/java/cn/timer/api/controller/kqgl/atttimer/LastMonthtimingExport.java
+1
-1
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
+15
-0
No files found.
src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
View file @
4d20dd88
...
...
@@ -98,8 +98,8 @@ public class AttendanceTaskTiming{
//typeid:1-员工 2-考勤组
// @Scheduled(cron = "0 */5 * * * ?")
// @Scheduled(cron = "0
7 15
* * ?")
@Scheduled
(
cron
=
"0 0 8,12,16,20 * * ?"
)
//每天上午8、12点,下午16点,20点 执行
// @Scheduled(cron = "0
5 16
* * ?")
//
@Scheduled(cron = "0 0 8,12,16,20 * * ?")//每天上午8、12点,下午16点,20点 执行
public
void
AttendanceTask
()
throws
ParseException
{
boolean
implement
=
true
;
...
...
@@ -130,9 +130,9 @@ public class AttendanceTaskTiming{
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, 3));
List
<
QyzxEntInfoM
>
orgcodelist
=
qyzxentinfommapper
.
selectList
(
new
QueryWrapper
<
QyzxEntInfoM
>().
lambda
().
eq
(
QyzxEntInfoM:
:
getId
,
3
));
for
(
int
t
=
0
;
t
<
orgcodelist
.
size
();
t
++){
int
org_code
=
orgcodelist
.
get
(
t
).
getId
();
//企业组织代码
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/kqgl/atttimer/LastMonthtimingExport.java
View file @
4d20dd88
...
...
@@ -91,7 +91,7 @@ public class LastMonthtimingExport {
SimpleDateFormat
format
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
);
// @Scheduled(cron = "0 12 15 * * ?")
@Scheduled
(
cron
=
"0 0 4,20 * * ?"
)
//每天上午4点,下午20点 执行
//
@Scheduled(cron = "0 0 4,20 * * ?")//每天上午4点,下午20点 执行
public
void
LastMonthtimingAttendanceTask
()
throws
ParseException
{
//获取前月的最后一天
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
View file @
4d20dd88
...
...
@@ -1263,6 +1263,21 @@ public class SalaryManagementController {
}
}
@PostMapping
(
value
=
"/duplicatedetection"
)
@ApiOperation
(
value
=
"检测重复"
,
httpMethod
=
"POST"
,
notes
=
"接口发布说明"
)
public
ResponseResult
DuplicateDetection
(
@CurrentUser
UserBean
userBean
,
@RequestBody
PayCustomZDYDto
payc
)
{
XcglAssoXzdazdy
xzd
=
XcglAssoXzdazdy
.
builder
().
build
().
selectOne
(
new
QueryWrapper
<
XcglAssoXzdazdy
>().
lambda
().
eq
(
XcglAssoXzdazdy:
:
getQyid
,
userBean
.
getOrgCode
())
.
eq
(
XcglAssoXzdazdy:
:
getZdmc
,
payc
.
getName
()));
if
(
xzd
!=
null
)
{
return
new
ResponseResult
().
error
(
payc
.
getName
()+
"重复添加"
);
}
else
{
return
new
ResponseResult
().
success
(
""
,
null
);
}
}
/**
* 获取薪资项公式
*/
...
...
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