elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

dev_shibei_match
zxc 4 years ago
parent
039922993c 935d209e42
commit
72aff26b77
1 changed files with 24 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 45
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java

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

@ -536,18 +536,19 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
// 总的参与次数较上月增长率 // 总的参与次数较上月增长率
if (l.getJoinTotal() > s.getJoinTotal()) { if (l.getJoinTotal() > s.getJoinTotal()) {
l.setJoinTotalUpFlag(GovernConstant.INCR); l.setJoinTotalUpFlag(GovernConstant.INCR);
if (!s.getJoinTotal().equals(NumConstant.ONE_HUNDRED_DECIMAL)){ if (s.getJoinTotal().compareTo(NumConstant.ZERO) == 0){
l.setJoinTotalUpRate(new BigDecimal(((l.getJoinTotal() - s.getJoinTotal()) / s.getJoinTotal()) * NumConstant.ONE_HUNDRED).setScale(NumConstant.FOUR, BigDecimal.ROUND_HALF_UP));
}else {
l.setJoinTotalUpRate(NumConstant.ONE_HUNDRED_DECIMAL); l.setJoinTotalUpRate(NumConstant.ONE_HUNDRED_DECIMAL);
}else {
l.setJoinTotalUpRate(new BigDecimal(((l.getJoinTotal() - s.getJoinTotal()) / s.getJoinTotal()) * NumConstant.ONE_HUNDRED).setScale(NumConstant.FOUR, BigDecimal.ROUND_HALF_UP));
} }
} else if (l.getJoinTotal() < s.getJoinTotal()) { } else if (l.getJoinTotal() < s.getJoinTotal()) {
l.setJoinTotalUpFlag(GovernConstant.DECR); l.setJoinTotalUpFlag(GovernConstant.DECR);
if (!s.getJoinTotal().equals(NumConstant.ONE_HUNDRED_DECIMAL)){ if (s.getJoinTotal().compareTo(NumConstant.ZERO) == 0){
l.setJoinTotalUpRate(new BigDecimal(((l.getJoinTotal() - s.getJoinTotal()) / s.getJoinTotal()) * NumConstant.ONE_HUNDRED).setScale(NumConstant.FOUR, BigDecimal.ROUND_HALF_UP));
}else {
l.setJoinTotalUpRate(NumConstant.ONE_HUNDRED_DECIMAL); l.setJoinTotalUpRate(NumConstant.ONE_HUNDRED_DECIMAL);
} } else { }else {
l.setJoinTotalUpRate(new BigDecimal(((l.getJoinTotal() - s.getJoinTotal()) / s.getJoinTotal()) * NumConstant.ONE_HUNDRED).setScale(NumConstant.FOUR, BigDecimal.ROUND_HALF_UP));
}
} else {
l.setJoinTotalUpFlag(GovernConstant.EQ); l.setJoinTotalUpFlag(GovernConstant.EQ);
l.setJoinTotalUpRate(NumConstant.ZERO_DECIMAL); l.setJoinTotalUpRate(NumConstant.ZERO_DECIMAL);
} }
@ -555,18 +556,19 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
Integer re = l.getAvgIssue().compareTo(s.getAvgIssue()); Integer re = l.getAvgIssue().compareTo(s.getAvgIssue());
if (re.equals(NumConstant.ONE)) { if (re.equals(NumConstant.ONE)) {
l.setAvgIssueUpFlag(GovernConstant.INCR); l.setAvgIssueUpFlag(GovernConstant.INCR);
if (!s.getAvgIssue().equals(NumConstant.ZERO_DECIMAL)){ if (s.getAvgIssue().compareTo(NumConstant.ZERO_DECIMAL) == 0){
l.setAvgIssueUpRate(l.getAvgIssue().subtract(s.getAvgIssue()).divide(s.getAvgIssue()).multiply(NumConstant.ONE_HUNDRED_DECIMAL).setScale(NumConstant.FOUR, BigDecimal.ROUND_HALF_UP));
}else {
l.setAvgIssueUpRate(NumConstant.ONE_HUNDRED_DECIMAL); 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));
} }
} else if (re.equals(NumConstant.ONE_NEG)) { } else if (re.equals(NumConstant.ONE_NEG)) {
l.setAvgIssueUpFlag(GovernConstant.DECR); l.setAvgIssueUpFlag(GovernConstant.DECR);
if (!s.getAvgIssue().equals(NumConstant.ZERO_DECIMAL)){ if (s.getAvgIssue().compareTo(NumConstant.ZERO_DECIMAL) == 0){
l.setAvgIssueUpRate(l.getAvgIssue().subtract(s.getAvgIssue()).divide(s.getAvgIssue()).multiply(NumConstant.ONE_HUNDRED_DECIMAL).setScale(NumConstant.FOUR, BigDecimal.ROUND_HALF_UP));
}else {
l.setAvgIssueUpRate(NumConstant.ONE_HUNDRED_DECIMAL); l.setAvgIssueUpRate(NumConstant.ONE_HUNDRED_DECIMAL);
} } else { }else {
l.setAvgIssueUpRate(l.getAvgIssue().subtract(s.getAvgIssue()).divide(s.getAvgIssue()).multiply(NumConstant.ONE_HUNDRED_DECIMAL).setScale(NumConstant.FOUR, BigDecimal.ROUND_HALF_UP));
}
} else {
l.setAvgIssueUpFlag(GovernConstant.EQ); l.setAvgIssueUpFlag(GovernConstant.EQ);
l.setAvgIssueUpRate(NumConstant.ZERO_DECIMAL); l.setAvgIssueUpRate(NumConstant.ZERO_DECIMAL);
} }
@ -574,18 +576,19 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
Integer avgJoinRe = l.getAvgJoin().compareTo(s.getAvgJoin()); Integer avgJoinRe = l.getAvgJoin().compareTo(s.getAvgJoin());
if (avgJoinRe.equals(NumConstant.ONE)) { if (avgJoinRe.equals(NumConstant.ONE)) {
l.setAgvgJoinUpFlag(GovernConstant.INCR); l.setAgvgJoinUpFlag(GovernConstant.INCR);
if (!s.getAvgJoin().equals(NumConstant.ZERO_DECIMAL)){ if (s.getAvgJoin().compareTo(NumConstant.ZERO_DECIMAL) == 0){
l.setAgvgJoinUpRate(l.getAvgJoin().subtract(s.getAvgJoin()).divide(s.getAvgJoin()).multiply(NumConstant.ONE_HUNDRED_DECIMAL).setScale(NumConstant.FOUR, BigDecimal.ROUND_HALF_UP));
}else {
l.setAgvgJoinUpRate(NumConstant.ONE_HUNDRED_DECIMAL); 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));
} }
} else if (avgJoinRe.equals(NumConstant.ONE_NEG)) { } else if (avgJoinRe.equals(NumConstant.ONE_NEG)) {
l.setAvgIssueUpFlag(GovernConstant.DECR); l.setAvgIssueUpFlag(GovernConstant.DECR);
if (!s.getAvgJoin().equals(NumConstant.ZERO_DECIMAL)){ if (s.getAvgJoin().compareTo(NumConstant.ZERO_DECIMAL) == 0){
l.setAgvgJoinUpRate(l.getAvgJoin().subtract(s.getAvgJoin()).divide(s.getAvgJoin()).multiply(NumConstant.ONE_HUNDRED_DECIMAL).setScale(NumConstant.FOUR, BigDecimal.ROUND_HALF_UP));
}else {
l.setAgvgJoinUpRate(NumConstant.ONE_HUNDRED_DECIMAL); l.setAgvgJoinUpRate(NumConstant.ONE_HUNDRED_DECIMAL);
} } else { }else {
l.setAgvgJoinUpRate(l.getAvgJoin().subtract(s.getAvgJoin()).divide(s.getAvgJoin()).multiply(NumConstant.ONE_HUNDRED_DECIMAL).setScale(NumConstant.FOUR, BigDecimal.ROUND_HALF_UP));
}
} else {
l.setAvgIssueUpFlag(GovernConstant.EQ); l.setAvgIssueUpFlag(GovernConstant.EQ);
l.setAgvgJoinUpRate(NumConstant.ZERO_DECIMAL); l.setAgvgJoinUpRate(NumConstant.ZERO_DECIMAL);
} }

Write Preview
Loading…
Cancel
Save