Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
I
indicators
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhangkb
indicators
Commits
c7a7367f
Commit
c7a7367f
authored
Jul 31, 2020
by
zhangkb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改对标计算逻辑以及计算单位得分逻辑
parent
79fd08f9
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
0 deletions
+13
-0
CompareUnitCalActor.java
...indicators/akka/actor/indicators/CompareUnitCalActor.java
+11
-0
ScoreRuleService.java
...mobile/indicators/service/hytobacco/ScoreRuleService.java
+2
-0
No files found.
src/main/java/com/keymobile/indicators/akka/actor/indicators/CompareUnitCalActor.java
View file @
c7a7367f
...
...
@@ -96,6 +96,17 @@ public class CompareUnitCalActor extends AbstractActor{
()->
new
DriveIndIdCalActor
(
getSelf
())));
driveIndIdCalActor
.
tell
(
driveIndIdCalMsg
,
getSelf
());
}
}
else
{
//如果是先执行且没有平均分参考对象
if
(
"1"
.
equals
(
firstExe
)
&&
StringUtils
.
isBlank
(
averageObj
))
{
//发送确认信息给父actor
FirstExeConfirmMsg
confirmMsg
=
new
FirstExeConfirmMsg
(
1
,
""
);
startCompareUnitCalActor
.
tell
(
confirmMsg
,
ActorRef
.
noSender
());
}
else
{
//发送后执行的确认消息给父actor
AfterExeConfirmMsg
afterConfirmMsg
=
new
AfterExeConfirmMsg
(
1
,
""
);
startCompareUnitCalActor
.
tell
(
afterConfirmMsg
,
ActorRef
.
noSender
());
}
}
})
.
match
(
FirstExeConfirmMsg
.
class
,
firstExeConfirmMsg
->
{
...
...
src/main/java/com/keymobile/indicators/service/hytobacco/ScoreRuleService.java
View file @
c7a7367f
...
...
@@ -359,6 +359,7 @@ public class ScoreRuleService {
ScoreRule
scoreRule
=
this
.
getById
(
scoreRuleId
);
List
<
ObjScoreCalResult
>
datas
=
new
ArrayList
<>();
if
(
scoreRule
!=
null
)
{
if
(!
indIds
.
isEmpty
()
&&
!
compareObjs
.
isEmpty
())
{
for
(
String
compareObj
:
compareObjs
)
{
//判断库表是否已存在改结果数据
ObjScoreCalResult
objScoreCalResult
=
objScoreCalResultMapper
.
...
...
@@ -383,6 +384,7 @@ public class ScoreRuleService {
}
//批量新增或修改
this
.
batchSaveOrUpdateObjScoreCalResult
(
datas
);
}
}
else
{
logger
.
info
(
"单位评分卡id:"
+
scoreRuleId
+
" 不存在"
);
}
...
...
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