|
@@ -117,34 +117,34 @@ public class WorkOrderStatisticsController {
|
|
|
DecimalFormat df = new DecimalFormat("#0.00");
|
|
|
|
|
|
if (sameStatistic.get("工单完成率") == null || sameStatistic.get("工单完成率").toString().equals("0")) {
|
|
|
- statistics.put("工单完成率同比", "-");
|
|
|
+ statistics.put("工单完成率同比", null);
|
|
|
} else {
|
|
|
Double finishedSameRate = (Double.parseDouble(statistics.get("工单完成率").toString()) - Double.parseDouble(sameStatistic.get("工单完成率").toString())) * 100 / Double.parseDouble(sameStatistic.get("工单完成率").toString());
|
|
|
statistics.put("工单完成率同比", df.format(finishedSameRate));
|
|
|
}
|
|
|
|
|
|
if (chainStatistic.get("工单完成率") == null || chainStatistic.get("工单完成率").toString().equals("0")) {
|
|
|
- statistics.put("工单完成率环比", "-");
|
|
|
+ statistics.put("工单完成率环比", null);
|
|
|
} else {
|
|
|
Double finishedChainRate = (Double.parseDouble(statistics.get("工单完成率").toString()) - Double.parseDouble(chainStatistic.get("工单完成率").toString())) * 100 / Double.parseDouble(chainStatistic.get("工单完成率").toString());
|
|
|
statistics.put("工单完成率环比", df.format(finishedChainRate));
|
|
|
}
|
|
|
|
|
|
if (sameStatistic.get("工单总数") == null || sameStatistic.get("工单总数").toString().equals("0")) {
|
|
|
- statistics.put("工单总数同比", "-");
|
|
|
+ statistics.put("工单总数同比", null);
|
|
|
} else {
|
|
|
Double orderSameTotalNumberRate = (Double.parseDouble(statistics.get("工单总数").toString()) - Double.parseDouble(sameStatistic.get("工单总数").toString())) * 100 / Double.parseDouble(sameStatistic.get("工单总数").toString());
|
|
|
statistics.put("工单总数同比", df.format(orderSameTotalNumberRate));
|
|
|
}
|
|
|
if (chainStatistic.get("工单总数") == null || chainStatistic.get("工单总数").toString().equals("0")) {
|
|
|
- statistics.put("工单总数环比", "-");
|
|
|
+ statistics.put("工单总数环比", null);
|
|
|
} else {
|
|
|
Double orderChainTotalNumberRate = (Double.parseDouble(statistics.get("工单总数").toString()) - Double.parseDouble(chainStatistic.get("工单总数").toString())) * 100 / Double.parseDouble(chainStatistic.get("工单总数").toString());
|
|
|
statistics.put("工单总数环比", df.format(orderChainTotalNumberRate));
|
|
|
}
|
|
|
|
|
|
if (sameStatistic.get("工单完成数") == null || sameStatistic.get("工单完成数").toString().equals("0")) {
|
|
|
- statistics.put("工单完成数同比", "-");
|
|
|
+ statistics.put("工单完成数同比", null);
|
|
|
|
|
|
} else {
|
|
|
Double finishedSameNumber = (Double.parseDouble(statistics.get("工单完成数").toString()) - Double.parseDouble(sameStatistic.get("工单完成数").toString())) * 100 / Double.parseDouble(sameStatistic.get("工单完成数").toString());
|
|
@@ -152,7 +152,7 @@ public class WorkOrderStatisticsController {
|
|
|
}
|
|
|
|
|
|
if (chainStatistic.get("工单完成数") == null || chainStatistic.get("工单完成数").toString().equals("0")) {
|
|
|
- statistics.put("工单完成数环比", "-");
|
|
|
+ statistics.put("工单完成数环比", null);
|
|
|
} else {
|
|
|
Double finishedChainNumber = (Double.parseDouble(statistics.get("工单完成数").toString()) - Double.parseDouble(chainStatistic.get("工单完成数").toString())) * 100 / Double.parseDouble(chainStatistic.get("工单完成数").toString());
|
|
|
statistics.put("工单完成数环比", df.format(finishedChainNumber));
|