Commit ce1247a8 by hzc

去掉报表二值结尾分号

parent 0b1f6dbc
......@@ -909,8 +909,8 @@ public class IndicatorsReportService {
bestUnitsDesc.append(calData.getCompareObjDesc()).append(";");
}
}
indReportData.setBestUnit(bestUnits.toString());
indReportData.setBestUnitDesc(bestUnitsDesc.toString());
indReportData.setBestUnit(bestUnits.deleteCharAt(bestUnits.length()-1).toString());
indReportData.setBestUnitDesc(bestUnitsDesc.deleteCharAt(bestUnits.length()-1).toString());
//标杆值
indReportData.setBestUnitValue(calDatas.get(0).getValue());
//优于平均数单位数
......@@ -968,17 +968,17 @@ public class IndicatorsReportService {
break;
}
}
indReportData.setSameImproveHeadThree(sameImproveHeadThree.toString());
indReportData.setSameImproveHeadThreeDesc(sameImproveHeadThreeDesc.toString());
indReportData.setSameImproveHeadThree(sameImproveHeadThree.deleteCharAt(bestUnits.length()-1).toString());
indReportData.setSameImproveHeadThreeDesc(sameImproveHeadThreeDesc.deleteCharAt(bestUnits.length()-1).toString());
indReportData.setSameImproveOne(sameImproveOne.toString());
indReportData.setSameImproveOneDesc(sameImproveOneDesc.toString());
indReportData.setSameImproveOne(sameImproveOne.deleteCharAt(bestUnits.length()-1).toString());
indReportData.setSameImproveOneDesc(sameImproveOneDesc.deleteCharAt(bestUnits.length()-1).toString());
indReportData.setSameImproveTwo(sameImproveTwo.toString());
indReportData.setSameImproveTwoDesc(sameImproveTwoDesc.toString());
indReportData.setSameImproveTwo(sameImproveTwo.deleteCharAt(bestUnits.length()-1).toString());
indReportData.setSameImproveTwoDesc(sameImproveTwoDesc.deleteCharAt(bestUnits.length()-1).toString());
indReportData.setSameImproveThree(sameImproveThree.toString());
indReportData.setSameImproveThreeDesc(sameImproveThreeDesc.toString());
indReportData.setSameImproveThree(sameImproveThree.deleteCharAt(bestUnits.length()-1).toString());
indReportData.setSameImproveThreeDesc(sameImproveThreeDesc.deleteCharAt(bestUnits.length()-1).toString());
start = 0;
//同比提升末三
......@@ -1027,17 +1027,17 @@ public class IndicatorsReportService {
}
}
indReportData.setSameImproveAfterThree(sameImproveAfterThree.toString());
indReportData.setSameImproveAfterThreeDesc(sameImproveAfterThreeDesc.toString());
indReportData.setSameImproveAfterThree(sameImproveAfterThree.deleteCharAt(bestUnits.length()-1).toString());
indReportData.setSameImproveAfterThreeDesc(sameImproveAfterThreeDesc.deleteCharAt(bestUnits.length()-1).toString());
indReportData.setSameImproveLastOne(sameImproveLastOne.toString());
indReportData.setSameImproveLastOneDesc(sameImproveLastOneDesc.toString());
indReportData.setSameImproveLastOne(sameImproveLastOne.deleteCharAt(bestUnits.length()-1).toString());
indReportData.setSameImproveLastOneDesc(sameImproveLastOneDesc.deleteCharAt(bestUnits.length()-1).toString());
indReportData.setSameImproveLastTwo(sameImproveLastTwo.toString());
indReportData.setSameImproveLastTwoDesc(sameImproveLastTwoDesc.toString());
indReportData.setSameImproveLastTwo(sameImproveLastTwo.deleteCharAt(bestUnits.length()-1).toString());
indReportData.setSameImproveLastTwoDesc(sameImproveLastTwoDesc.deleteCharAt(bestUnits.length()-1).toString());
indReportData.setSameImproveLastThree(sameImproveLastThree.toString());
indReportData.setSameImproveLastThreeDesc(sameImproveLastThreeDesc.toString());
indReportData.setSameImproveLastThree(sameImproveLastThree.deleteCharAt(bestUnits.length()-1).toString());
indReportData.setSameImproveLastThreeDesc(sameImproveLastThreeDesc.deleteCharAt(bestUnits.length()-1).toString());
}else {//置为空
indReportData.setSameImproveHeadThree(null);
......@@ -1087,15 +1087,15 @@ public class IndicatorsReportService {
break;
}
}
indReportData.setRankHeadThree(rankHeadThree.toString());
indReportData.setRankHeadThreeDesc(rankHeadThreeDesc.toString());
indReportData.setRankHeadThree(rankHeadThree.deleteCharAt(bestUnits.length()-1).toString());
indReportData.setRankHeadThreeDesc(rankHeadThreeDesc.deleteCharAt(bestUnits.length()-1).toString());
//填充具体排名前几名次对象
indReportData.setRankOne(rankOne.toString());
indReportData.setRankOneDesc(rankOneDesc.toString());
indReportData.setRankTwo(rankTwo.toString());
indReportData.setRankTwoDesc(rankTwoDesc.toString());
indReportData.setRankThree(rankThree.toString());
indReportData.setRankThreeDesc(rankThreeDesc.toString());
indReportData.setRankOne(rankOne.deleteCharAt(bestUnits.length()-1).toString());
indReportData.setRankOneDesc(rankOneDesc.deleteCharAt(bestUnits.length()-1).toString());
indReportData.setRankTwo(rankTwo.deleteCharAt(bestUnits.length()-1).toString());
indReportData.setRankTwoDesc(rankTwoDesc.deleteCharAt(bestUnits.length()-1).toString());
indReportData.setRankThree(rankThree.deleteCharAt(bestUnits.length()-1).toString());
indReportData.setRankThreeDesc(rankThreeDesc.deleteCharAt(bestUnits.length()-1).toString());
rankMap.clear();
//排名末三
......@@ -1142,15 +1142,15 @@ public class IndicatorsReportService {
break;
}
}
indReportData.setRankAfterThree(rankAfterThree.toString());
indReportData.setRankAfterThreeDesc(rankAfterThreeDesc.toString());
indReportData.setRankAfterThree(rankAfterThree.deleteCharAt(bestUnits.length()-1).toString());
indReportData.setRankAfterThreeDesc(rankAfterThreeDesc.deleteCharAt(bestUnits.length()-1).toString());
//填充具体排名末几名次对象
indReportData.setRankLastOne(rankLastOne.toString());
indReportData.setRankLastOneDesc(rankLastOneDesc.toString());
indReportData.setRankLastTwo(rankLastTwo.toString());
indReportData.setRankLastTwoDesc(rankLastTwoDesc.toString());
indReportData.setRankLastThree(rankLastThree.toString());
indReportData.setRankLastThreeDesc(rankLastThreeDesc.toString());
indReportData.setRankLastOne(rankLastOne.deleteCharAt(bestUnits.length()-1).toString());
indReportData.setRankLastOneDesc(rankLastOneDesc.deleteCharAt(bestUnits.length()-1).toString());
indReportData.setRankLastTwo(rankLastTwo.deleteCharAt(bestUnits.length()-1).toString());
indReportData.setRankLastTwoDesc(rankLastTwoDesc.deleteCharAt(bestUnits.length()-1).toString());
indReportData.setRankLastThree(rankLastThree.deleteCharAt(bestUnits.length()-1).toString());
indReportData.setRankLastThreeDesc(rankLastThreeDesc.deleteCharAt(bestUnits.length()-1).toString());
}
return indReportData;
}
......
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