Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
W
work_service
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
licc
work_service
Commits
4585ce43
Commit
4585ce43
authored
Feb 01, 2021
by
cq990612
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化代码结构
parent
26fd5151
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
5 deletions
+4
-5
WorkCollectMapper.xml
...gy-mapper/src/main/resources/mapper/WorkCollectMapper.xml
+2
-2
WorkCollectServiceImpl.java
...ava/cn/wisenergy/service/impl/WorkCollectServiceImpl.java
+1
-2
Trigger.java
...n/src/main/java/cn/wisenergy/web/config/auto/Trigger.java
+1
-1
No files found.
wisenergy-mapper/src/main/resources/mapper/WorkCollectMapper.xml
View file @
4585ce43
...
...
@@ -20,10 +20,10 @@
<!-- 通用查询结果列 -->
<sql
id=
"Base_Column_List"
>
id, user_id, work_day, total_time, status,reject_time,
create_time, modify_time,
id, user_id, work_day, total_time, status,reject_time,
create_time,modify_time
</sql>
<sql
id=
"cols_exclude_id"
>
user_id, work_day, total_time, status,reject_time,
create_time,
modify_time
user_id, work_day, total_time, status,reject_time,
create_time,
modify_time
</sql>
<sql
id=
"table"
>
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkCollectServiceImpl.java
View file @
4585ce43
...
...
@@ -104,10 +104,9 @@ public class WorkCollectServiceImpl implements WorkCollectService {
int
modifyTime
=
1
;
Date
date
=
new
Date
();
WorkSubmitAdopt
submitAdopt
=
workSubmitAdoptService
.
getById
(
1
);
if
(
3
==
workCollect
.
getStatus
())
{
if
(
null
!=
workCollect
.
getRejectTime
())
{
Date
rejectTime
=
workCollect
.
getRejectTime
();
rejectTime
=
DateUtil
.
convertStrToDate
(
DateUtil
.
convertDateToStr
(
rejectTime
,
"yyyy-MM-dd"
),
"yyyy-MM-dd"
);
System
.
out
.
println
(
modifyTime
);
if
(
date
.
getTime
()
-
rejectTime
.
getTime
()
>
submitAdopt
.
getSubmitTime
()
*
24
*
60
*
60
*
1000
)
{
modifyTime
=
0
;
}
...
...
wisenergy-web-admin/src/main/java/cn/wisenergy/web/config/auto/Trigger.java
View file @
4585ce43
...
...
@@ -77,7 +77,7 @@ public class Trigger implements SchedulingConfigurer {
,
triggerContext
->
{
Integer
autoAdopt
=
workSubmitAdoptService
.
getById
(
1
).
getAutoAdopt
();
String
time
=
"0
30 17
*/"
+
autoAdopt
+
" * ?"
;
String
time
=
"0
0 0
*/"
+
autoAdopt
+
" * ?"
;
//返回执行的周期
return
new
CronTrigger
(
time
).
nextExecutionTime
(
triggerContext
);
});
...
...
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