Skip to content

I
indicators
Commit 944dc0f6 by hzc
Options

同步代码

parent d31b98d5
Showing with 35 additions and 35 deletions
src/main/java/com/keymobile/indicators/service/report/IndicatorsReportService.java
...@@ -909,8 +909,8 @@ public class IndicatorsReportService { ...@@ -909,8 +909,8 @@ public class IndicatorsReportService {
bestUnitsDesc.append(calData.getCompareObjDesc()).append(";"); bestUnitsDesc.append(calData.getCompareObjDesc()).append(";");
} }
} }
indReportData.setBestUnit(bestUnits.deleteCharAt(bestUnits.length()-1).toString()); indReportData.setBestUnit(bestUnits.length()>0?bestUnits.deleteCharAt(bestUnits.length()-1).toString():"");
indReportData.setBestUnitDesc(bestUnitsDesc.deleteCharAt(bestUnitsDesc.length()-1).toString()); indReportData.setBestUnitDesc(bestUnitsDesc.length()>0?bestUnitsDesc.deleteCharAt(bestUnitsDesc.length()-1).toString():"");
//标杆值 //标杆值
indReportData.setBestUnitValue(calDatas.get(0).getValue()); indReportData.setBestUnitValue(calDatas.get(0).getValue());
//优于平均数单位数 //优于平均数单位数
...@@ -968,17 +968,17 @@ public class IndicatorsReportService { ...@@ -968,17 +968,17 @@ public class IndicatorsReportService {
break; break;
} }
} }
indReportData.setSameImproveHeadThree(sameImproveHeadThree.deleteCharAt(sameImproveHeadThree.length()-1).toString()); indReportData.setSameImproveHeadThree(sameImproveHeadThree.length()>0?sameImproveHeadThree.deleteCharAt(sameImproveHeadThree.length()-1).toString():"");
indReportData.setSameImproveHeadThreeDesc(sameImproveHeadThreeDesc.deleteCharAt(sameImproveHeadThreeDesc.length()-1).toString()); indReportData.setSameImproveHeadThreeDesc(sameImproveHeadThreeDesc.length()>0?sameImproveHeadThreeDesc.deleteCharAt(sameImproveHeadThreeDesc.length()-1).toString():"");
indReportData.setSameImproveOne(sameImproveOne.deleteCharAt(sameImproveOne.length()-1).toString()); indReportData.setSameImproveOne(sameImproveOne.length()>0?sameImproveOne.deleteCharAt(sameImproveOne.length()-1).toString():"");
indReportData.setSameImproveOneDesc(sameImproveOneDesc.deleteCharAt(sameImproveOneDesc.length()-1).toString()); indReportData.setSameImproveOneDesc(sameImproveOneDesc.length()>0?sameImproveOneDesc.deleteCharAt(sameImproveOneDesc.length()-1).toString():"");
indReportData.setSameImproveTwo(sameImproveTwo.deleteCharAt(sameImproveTwo.length()-1).toString()); indReportData.setSameImproveTwo(sameImproveTwo.length()>0?sameImproveTwo.deleteCharAt(sameImproveTwo.length()-1).toString():"");
indReportData.setSameImproveTwoDesc(sameImproveTwoDesc.deleteCharAt(sameImproveTwoDesc.length()-1).toString()); indReportData.setSameImproveTwoDesc(sameImproveTwoDesc.length()>0?sameImproveTwoDesc.deleteCharAt(sameImproveTwoDesc.length()-1).toString():"");
indReportData.setSameImproveThree(sameImproveThree.deleteCharAt(sameImproveThree.length()-1).toString()); indReportData.setSameImproveThree(sameImproveThree.length()>0?sameImproveThree.deleteCharAt(sameImproveThree.length()-1).toString():"");
indReportData.setSameImproveThreeDesc(sameImproveThreeDesc.deleteCharAt(sameImproveThreeDesc.length()-1).toString()); indReportData.setSameImproveThreeDesc(sameImproveThreeDesc.length()>0?sameImproveThreeDesc.deleteCharAt(sameImproveThreeDesc.length()-1).toString():"");
start = 0; start = 0;
//同比提升末三 //同比提升末三
...@@ -1027,17 +1027,17 @@ public class IndicatorsReportService { ...@@ -1027,17 +1027,17 @@ public class IndicatorsReportService {
} }
} }
indReportData.setSameImproveAfterThree(sameImproveAfterThree.deleteCharAt(sameImproveAfterThree.length()-1).toString()); indReportData.setSameImproveAfterThree(sameImproveAfterThree.length()>0?sameImproveAfterThree.deleteCharAt(sameImproveAfterThree.length()-1).toString():"");
indReportData.setSameImproveAfterThreeDesc(sameImproveAfterThreeDesc.deleteCharAt(sameImproveAfterThreeDesc.length()-1).toString()); indReportData.setSameImproveAfterThreeDesc(sameImproveAfterThreeDesc.length()>0?sameImproveAfterThreeDesc.deleteCharAt(sameImproveAfterThreeDesc.length()-1).toString():"");
indReportData.setSameImproveLastOne(sameImproveLastOne.deleteCharAt(sameImproveLastOne.length()-1).toString()); indReportData.setSameImproveLastOne(sameImproveLastOne.length()>0?sameImproveLastOne.deleteCharAt(sameImproveLastOne.length()-1).toString():"");
indReportData.setSameImproveLastOneDesc(sameImproveLastOneDesc.deleteCharAt(sameImproveLastOneDesc.length()-1).toString()); indReportData.setSameImproveLastOneDesc(sameImproveLastOneDesc.length()>0?sameImproveLastOneDesc.deleteCharAt(sameImproveLastOneDesc.length()-1).toString():"");
indReportData.setSameImproveLastTwo(sameImproveLastTwo.deleteCharAt(sameImproveLastTwo.length()-1).toString()); indReportData.setSameImproveLastTwo(sameImproveLastTwo.length()>0?sameImproveLastTwo.deleteCharAt(sameImproveLastTwo.length()-1).toString():"");
indReportData.setSameImproveLastTwoDesc(sameImproveLastTwoDesc.deleteCharAt(sameImproveLastTwoDesc.length()-1).toString()); indReportData.setSameImproveLastTwoDesc(sameImproveLastTwoDesc.length()>0?sameImproveLastTwoDesc.deleteCharAt(sameImproveLastTwoDesc.length()-1).toString():"");
indReportData.setSameImproveLastThree(sameImproveLastThree.deleteCharAt(sameImproveLastThree.length()-1).toString()); indReportData.setSameImproveLastThree(sameImproveLastThree.length()>0?sameImproveLastThree.deleteCharAt(sameImproveLastThree.length()-1).toString():"");
indReportData.setSameImproveLastThreeDesc(sameImproveLastThreeDesc.deleteCharAt(sameImproveLastThreeDesc.length()-1).toString()); indReportData.setSameImproveLastThreeDesc(sameImproveLastThreeDesc.length()>0?sameImproveLastThreeDesc.deleteCharAt(sameImproveLastThreeDesc.length()-1).toString():"");
}else {//置为空 }else {//置为空
indReportData.setSameImproveHeadThree(null); indReportData.setSameImproveHeadThree(null);
...@@ -1087,15 +1087,15 @@ public class IndicatorsReportService { ...@@ -1087,15 +1087,15 @@ public class IndicatorsReportService {
break; break;
} }
} }
indReportData.setRankHeadThree(rankHeadThree.deleteCharAt(rankHeadThree.length()-1).toString()); indReportData.setRankHeadThree(rankHeadThree.length()>0?rankHeadThree.deleteCharAt(rankHeadThree.length()-1).toString():"");
indReportData.setRankHeadThreeDesc(rankHeadThreeDesc.deleteCharAt(rankHeadThreeDesc.length()-1).toString()); indReportData.setRankHeadThreeDesc(rankHeadThreeDesc.length()>0?rankHeadThreeDesc.deleteCharAt(rankHeadThreeDesc.length()-1).toString():"");
//填充具体排名前几名次对象 //填充具体排名前几名次对象
indReportData.setRankOne(rankOne.deleteCharAt(rankOne.length()-1).toString()); indReportData.setRankOne(rankOne.length()>0?rankOne.deleteCharAt(rankOne.length()-1).toString():"");
indReportData.setRankOneDesc(rankOneDesc.deleteCharAt(rankOneDesc.length()-1).toString()); indReportData.setRankOneDesc(rankOneDesc.length()>0?rankOneDesc.deleteCharAt(rankOneDesc.length()-1).toString():"");
indReportData.setRankTwo(rankTwo.deleteCharAt(rankTwo.length()-1).toString()); indReportData.setRankTwo(rankTwo.length()>0?rankTwo.deleteCharAt(rankTwo.length()-1).toString():"");
indReportData.setRankTwoDesc(rankTwoDesc.deleteCharAt(rankTwoDesc.length()-1).toString()); indReportData.setRankTwoDesc(rankTwoDesc.length()>0?rankTwoDesc.deleteCharAt(rankTwoDesc.length()-1).toString():"");
indReportData.setRankThree(rankThree.deleteCharAt(rankThree.length()-1).toString()); indReportData.setRankThree(rankThree.length()>0?rankThree.deleteCharAt(rankThree.length()-1).toString():"");
indReportData.setRankThreeDesc(rankThreeDesc.deleteCharAt(rankThreeDesc.length()-1).toString()); indReportData.setRankThreeDesc(rankThreeDesc.length()>0?rankThreeDesc.deleteCharAt(rankThreeDesc.length()-1).toString():"");
rankMap.clear(); rankMap.clear();
//排名末三 //排名末三
...@@ -1142,15 +1142,15 @@ public class IndicatorsReportService { ...@@ -1142,15 +1142,15 @@ public class IndicatorsReportService {
break; break;
} }
} }
indReportData.setRankAfterThree(rankAfterThree.deleteCharAt(rankAfterThree.length()-1).toString()); indReportData.setRankAfterThree(rankAfterThree.length()>0?rankAfterThree.deleteCharAt(rankAfterThree.length()-1).toString():"");
indReportData.setRankAfterThreeDesc(rankAfterThreeDesc.deleteCharAt(rankAfterThreeDesc.length()-1).toString()); indReportData.setRankAfterThreeDesc(rankAfterThreeDesc.length()>0?rankAfterThreeDesc.deleteCharAt(rankAfterThreeDesc.length()-1).toString():"");
//填充具体排名末几名次对象 //填充具体排名末几名次对象
indReportData.setRankLastOne(rankLastOne.deleteCharAt(rankLastOne.length()-1).toString()); indReportData.setRankLastOne(rankLastOne.length()>0?rankLastOne.deleteCharAt(rankLastOne.length()-1).toString():"");
indReportData.setRankLastOneDesc(rankLastOneDesc.deleteCharAt(rankLastOneDesc.length()-1).toString()); indReportData.setRankLastOneDesc(rankLastOneDesc.length()>0?rankLastOneDesc.deleteCharAt(rankLastOneDesc.length()-1).toString():"");
indReportData.setRankLastTwo(rankLastTwo.deleteCharAt(rankLastTwo.length()-1).toString()); indReportData.setRankLastTwo(rankLastTwo.length()>0?rankLastTwo.deleteCharAt(rankLastTwo.length()-1).toString():"");
indReportData.setRankLastTwoDesc(rankLastTwoDesc.deleteCharAt(rankLastTwoDesc.length()-1).toString()); indReportData.setRankLastTwoDesc(rankLastTwoDesc.length()>0?rankLastTwoDesc.deleteCharAt(rankLastTwoDesc.length()-1).toString():"");
indReportData.setRankLastThree(rankLastThree.deleteCharAt(rankLastThree.length()-1).toString()); indReportData.setRankLastThree(rankLastThree.length()>0?rankLastThree.deleteCharAt(rankLastThree.length()-1).toString():"");
indReportData.setRankLastThreeDesc(rankLastThreeDesc.deleteCharAt(rankLastThreeDesc.length()-1).toString()); indReportData.setRankLastThreeDesc(rankLastThreeDesc.length()>0?rankLastThreeDesc.deleteCharAt(rankLastThreeDesc.length()-1).toString():"");
} }
return indReportData; return indReportData;
} }
......
src/main/resources/mybatis/mapping/TaskIndicatorValueMapper.xml
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
<foreach collection="newValues" item="val" separator=";"> <foreach collection="newValues" item="val" separator=";">
delete from data_enter_task_ind_val delete from data_enter_task_ind_val
where ind_id = #{val.indId} and obj_id = #{val.objId} and value_time=#{val.valueTime} where task_id=#{val.taskId} and ind_id = #{val.indId} and obj_id = #{val.objId} and value_time=#{val.valueTime}
</foreach> </foreach>
</delete> </delete>
......
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