Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
S
shop-Mall
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
shop-Mall
Commits
a7b52619
Commit
a7b52619
authored
Apr 07, 2021
by
licc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
最大进步奖优化
parent
35eb90ef
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
2 deletions
+7
-2
DayTaskServiceImpl.java
...ava/cn/wisenergy/service/app/impl/DayTaskServiceImpl.java
+7
-2
No files found.
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/DayTaskServiceImpl.java
View file @
a7b52619
...
@@ -402,6 +402,7 @@ public class DayTaskServiceImpl implements DayTaskService {
...
@@ -402,6 +402,7 @@ public class DayTaskServiceImpl implements DayTaskService {
}
}
teamVo
.
setGrowthRate
(
growthRate
);
teamVo
.
setGrowthRate
(
growthRate
);
double
monthPerformance
;
double
monthPerformance
;
assert
teamPerformance
!=
null
;
if
(
null
==
teamPerformance
.
getMonthTeamPerformance
())
{
if
(
null
==
teamPerformance
.
getMonthTeamPerformance
())
{
monthPerformance
=
0.00
;
monthPerformance
=
0.00
;
}
else
{
}
else
{
...
@@ -557,7 +558,11 @@ public class DayTaskServiceImpl implements DayTaskService {
...
@@ -557,7 +558,11 @@ public class DayTaskServiceImpl implements DayTaskService {
}
else
{
}
else
{
progressPrize
.
setGrowthRate
(
teamVo
.
getGrowthRate
());
progressPrize
.
setGrowthRate
(
teamVo
.
getGrowthRate
());
progressPrize
.
setAwardMoney
(
income
);
progressPrize
.
setAwardMoney
(
income
);
progressPrize
.
setGrowthRate
(
teamVo
.
getGrowthRate
());
if
(
income
>
0
)
{
progressPrize
.
setGrowthRate
(
teamVo
.
getGrowthRate
());
}
else
{
progressPrize
.
setGrowthRate
(
0.0
);
}
updateList
.
add
(
progressPrize
);
updateList
.
add
(
progressPrize
);
}
}
}
}
...
@@ -568,7 +573,7 @@ public class DayTaskServiceImpl implements DayTaskService {
...
@@ -568,7 +573,7 @@ public class DayTaskServiceImpl implements DayTaskService {
//修改或保存最大进步奖信息
//修改或保存最大进步奖信息
// flag 1: 日定时任务 2:月定时任务
// flag 1: 日定时任务 2:月定时任务
int
flag
=
1
;
int
flag
=
1
;
return
accountManager
.
updateOrSavePrize
(
updateAccountList
,
prizes
,
addList
,
updateList
,
flag
);
return
accountManager
.
updateOrSavePrize
(
updateAccountList
,
prizes
,
addList
,
updateList
,
flag
);
}
}
...
...
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