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

Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp

dev_shibei_match
jianjun 5 years ago
parent
1d9cf29245 95cff7bbeb
commit
5b4f68f3ff
3 changed files with 6 additions and 6 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. 4
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java
  2. 4
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
  3. 4
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java

4
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java
View File

@ -151,8 +151,8 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
scoreEntity.setSelfScore(new BigDecimal(0)); scoreEntity.setSelfScore(new BigDecimal(0));
scoreEntity.setSubScore(new BigDecimal(0)); scoreEntity.setSubScore(new BigDecimal(0));
scoreEntity.setParentIndexCode(index.getIndexCode()); scoreEntity.setParentIndexCode(index.getIndexCode());
scoreEntity.setSubWeight(weightMap.get(ProjectConstant.XIA_JI)); scoreEntity.setSubWeight(weightMap.getOrDefault(ProjectConstant.XIA_JI, new BigDecimal(0)));
scoreEntity.setSubWeight(weightMap.get(ProjectConstant.ZI_SHEN)); scoreEntity.setSelfWeight(weightMap.getOrDefault(ProjectConstant.ZI_SHEN, new BigDecimal(0)));
} }
BigDecimal partScore = score.getScore().multiply(score.getWeight()); BigDecimal partScore = score.getScore().multiply(score.getWeight());
if (selfSubParentMap.get(ProjectConstant.XIA_JI).contains(score.getIndexCode())) { if (selfSubParentMap.get(ProjectConstant.XIA_JI).contains(score.getIndexCode())) {

4
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
View File

@ -157,8 +157,8 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
scoreEntity.setSelfScore(new BigDecimal(0)); scoreEntity.setSelfScore(new BigDecimal(0));
scoreEntity.setSubScore(new BigDecimal(0)); scoreEntity.setSubScore(new BigDecimal(0));
scoreEntity.setParentIndexCode(index.getIndexCode()); scoreEntity.setParentIndexCode(index.getIndexCode());
scoreEntity.setSubWeight(weightMap.get(ProjectConstant.XIA_JI)); scoreEntity.setSubWeight(weightMap.getOrDefault(ProjectConstant.XIA_JI, new BigDecimal(0)));
scoreEntity.setSubWeight(weightMap.get(ProjectConstant.ZI_SHEN)); scoreEntity.setSelfWeight(weightMap.getOrDefault(ProjectConstant.ZI_SHEN, new BigDecimal(0)));
} }
BigDecimal partScore = score.getScore().multiply(score.getWeight()); BigDecimal partScore = score.getScore().multiply(score.getWeight());
if (selfSubParentMap.get(ProjectConstant.XIA_JI).contains(score.getIndexCode())) { if (selfSubParentMap.get(ProjectConstant.XIA_JI).contains(score.getIndexCode())) {

4
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java
View File

@ -161,8 +161,8 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
scoreEntity.setSelfScore(new BigDecimal(0)); scoreEntity.setSelfScore(new BigDecimal(0));
scoreEntity.setSubScore(new BigDecimal(0)); scoreEntity.setSubScore(new BigDecimal(0));
scoreEntity.setParentIndexCode(index.getIndexCode()); scoreEntity.setParentIndexCode(index.getIndexCode());
scoreEntity.setSubWeight(weightMap.get(ProjectConstant.XIA_JI)); scoreEntity.setSubWeight(weightMap.getOrDefault(ProjectConstant.XIA_JI, new BigDecimal(0)));
scoreEntity.setSelfWeight(weightMap.get(ProjectConstant.ZI_SHEN)); scoreEntity.setSelfWeight(weightMap.getOrDefault(ProjectConstant.ZI_SHEN, new BigDecimal(0)));
} }
BigDecimal partScore = score.getScore().multiply(score.getWeight()); BigDecimal partScore = score.getScore().multiply(score.getWeight());
if (selfSubParentMap.get(ProjectConstant.XIA_JI).contains(score.getIndexCode())) { if (selfSubParentMap.get(ProjectConstant.XIA_JI).contains(score.getIndexCode())) {

Write Preview
Loading…
Cancel
Save