Commit 2a0b3cb3 by zhangkb

修改获取指标正反向类型值

parent 0e0ce331
...@@ -97,7 +97,7 @@ public class DriveIndIdObjCalActor extends AbstractActor{ ...@@ -97,7 +97,7 @@ public class DriveIndIdObjCalActor extends AbstractActor{
DriveIndDef driveIndDef = driveIndDefService.getById(driveIndId); DriveIndDef driveIndDef = driveIndDefService.getById(driveIndId);
unit = driveIndDef.getIndUnit();//指标单位 unit = driveIndDef.getIndUnit();//指标单位
indType = driveIndDef.getIndType();//指标类型:正向 反向 indType = driveIndDef.getIndRule();//指标类型:正向 反向
scoreCardId = driveIndDef.getIndCalScoreRule();//指标评分规则 scoreCardId = driveIndDef.getIndCalScoreRule();//指标评分规则
code = driveIndDef.getCode(); code = driveIndDef.getCode();
......
...@@ -156,7 +156,7 @@ public class IndScorecardService { ...@@ -156,7 +156,7 @@ public class IndScorecardService {
DriveIndDef driveIndDef = driveIndDefService.getById(indId); DriveIndDef driveIndDef = driveIndDefService.getById(indId);
if(driveIndDef!=null) { if(driveIndDef!=null) {
//获取指标是正向还是反向类型 //获取指标是正向还是反向类型
String acsType = driveIndDef.getIndType(); String acsType = driveIndDef.getIndRule();
String unit = driveIndDef.getIndUnit(); String unit = driveIndDef.getIndUnit();
List<DriveIndCalResultDef> currentDriveResult = driveIndCalResultDefMapper List<DriveIndCalResultDef> currentDriveResult = driveIndCalResultDefMapper
......
...@@ -203,9 +203,9 @@ public class IndicatorsValueService { ...@@ -203,9 +203,9 @@ public class IndicatorsValueService {
allComObjDataMap.put(compareObj, dataMap); allComObjDataMap.put(compareObj, dataMap);
} }
//排列同期指标值 //排列同期指标值
Map<String,Integer> sameValueRank = CalculateUtils.rankValue(valueMap, deiveIndDef.getIndType()); Map<String,Integer> sameValueRank = CalculateUtils.rankValue(valueMap, deiveIndDef.getIndRule());
//排名增幅排名 //排名增幅排名
Map<String,Integer> gowthValueRank = CalculateUtils.rankValue(gowthMap, deiveIndDef.getIndType()); Map<String,Integer> gowthValueRank = CalculateUtils.rankValue(gowthMap, deiveIndDef.getIndRule());
for(Entry<String,Object> entry: allComObjDataMap.entrySet()) { for(Entry<String,Object> entry: allComObjDataMap.entrySet()) {
Map<String,String> dataMap = (Map<String,String>)entry.getValue(); Map<String,String> dataMap = (Map<String,String>)entry.getValue();
Integer sameRank = sameValueRank.get(entry.getKey()); Integer sameRank = sameValueRank.get(entry.getKey());
...@@ -421,7 +421,7 @@ public class IndicatorsValueService { ...@@ -421,7 +421,7 @@ public class IndicatorsValueService {
row.getCell(4).setCellValue(sameValue); row.getCell(4).setCellValue(sameValue);
row.getCell(5).setCellValue(rate); row.getCell(5).setCellValue(rate);
String acsType = driveIndDef.getIndType(); String acsType = driveIndDef.getIndRule();
if("0".equals(acsType)) { if("0".equals(acsType)) {
if(Double.valueOf(rate)>0) { if(Double.valueOf(rate)>0) {
row.getCell(6).setCellValue("同比趋好"); row.getCell(6).setCellValue("同比趋好");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment