luyan
/
epmet-cloud-lingshan
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/dev_public_join' into dev_public_join

master
yinzuomei 4 years ago
parent
12771cb0a8 b34fdb9ced
commit
72a57622b1
1 changed files with 4 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java

8
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java
View File

@ -559,14 +559,14 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
if (s.getAvgIssue().compareTo(NumConstant.ZERO_DECIMAL) == 0){
l.setAvgIssueUpRate(NumConstant.ONE_HUNDRED_DECIMAL);
}else {
l.setAvgIssueUpRate(l.getAvgIssue().subtract(s.getAvgIssue()).divide(s.getAvgIssue()).multiply(NumConstant.ONE_HUNDRED_DECIMAL).setScale(NumConstant.FOUR, BigDecimal.ROUND_HALF_UP));
l.setAvgIssueUpRate(l.getAvgIssue().subtract(s.getAvgIssue()).divide(s.getAvgIssue()).setScale(NumConstant.FOUR, BigDecimal.ROUND_HALF_UP).multiply(NumConstant.ONE_HUNDRED_DECIMAL).setScale(NumConstant.FOUR, BigDecimal.ROUND_HALF_UP));
}
} else if (re.equals(NumConstant.ONE_NEG)) {
l.setAvgIssueUpFlag(GovernConstant.DECR);
if (s.getAvgIssue().compareTo(NumConstant.ZERO_DECIMAL) == 0){
l.setAvgIssueUpRate(NumConstant.ONE_HUNDRED_DECIMAL);
}else {
l.setAvgIssueUpRate(l.getAvgIssue().subtract(s.getAvgIssue()).divide(s.getAvgIssue()).multiply(NumConstant.ONE_HUNDRED_DECIMAL).setScale(NumConstant.FOUR, BigDecimal.ROUND_HALF_UP));
l.setAvgIssueUpRate(l.getAvgIssue().subtract(s.getAvgIssue()).divide(s.getAvgIssue()).setScale(NumConstant.FOUR, BigDecimal.ROUND_HALF_UP).multiply(NumConstant.ONE_HUNDRED_DECIMAL).setScale(NumConstant.FOUR, BigDecimal.ROUND_HALF_UP));
}
} else {
l.setAvgIssueUpFlag(GovernConstant.EQ);
@ -579,14 +579,14 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
if (s.getAvgJoin().compareTo(NumConstant.ZERO_DECIMAL) == 0){
l.setAgvgJoinUpRate(NumConstant.ONE_HUNDRED_DECIMAL);
}else {
l.setAgvgJoinUpRate(l.getAvgJoin().subtract(s.getAvgJoin()).divide(s.getAvgJoin()).multiply(NumConstant.ONE_HUNDRED_DECIMAL).setScale(NumConstant.FOUR, BigDecimal.ROUND_HALF_UP));
l.setAgvgJoinUpRate(l.getAvgJoin().subtract(s.getAvgJoin()).divide(s.getAvgJoin()).setScale(NumConstant.FOUR, BigDecimal.ROUND_HALF_UP).multiply(NumConstant.ONE_HUNDRED_DECIMAL).setScale(NumConstant.FOUR, BigDecimal.ROUND_HALF_UP));
}
} else if (avgJoinRe.equals(NumConstant.ONE_NEG)) {
l.setAvgIssueUpFlag(GovernConstant.DECR);
if (s.getAvgJoin().compareTo(NumConstant.ZERO_DECIMAL) == 0){
l.setAgvgJoinUpRate(NumConstant.ONE_HUNDRED_DECIMAL);
}else {
l.setAgvgJoinUpRate(l.getAvgJoin().subtract(s.getAvgJoin()).divide(s.getAvgJoin()).multiply(NumConstant.ONE_HUNDRED_DECIMAL).setScale(NumConstant.FOUR, BigDecimal.ROUND_HALF_UP));
l.setAgvgJoinUpRate(l.getAvgJoin().subtract(s.getAvgJoin()).divide(s.getAvgJoin()).setScale(NumConstant.FOUR, BigDecimal.ROUND_HALF_UP).multiply(NumConstant.ONE_HUNDRED_DECIMAL).setScale(NumConstant.FOUR, BigDecimal.ROUND_HALF_UP));
}
} else {
l.setAvgIssueUpFlag(GovernConstant.EQ);

Write Preview
Loading…
Cancel
Save