|
@@ -287,8 +287,8 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
|
|
|
//上阶段消耗
|
|
|
JSONObject timeLastCost = materialStareMapper.getKuaiShouTotalCostDaily(lastTimeStart,lastTimeEnd,userSet);
|
|
|
- //同比 = (当前总消耗 - 上阶段总消耗 ) / 当前总消耗
|
|
|
- Double timeCompare = (Double.valueOf(timeNowCost.getString("totalCost")) - Double.valueOf(timeLastCost.getString("totalCost"))) / Double.valueOf(timeNowCost.getString("totalCost"));
|
|
|
+ //环比 = (当前总消耗 - 上阶段总消耗 ) / 上阶段总消耗
|
|
|
+ Double timeCompare = (Double.valueOf(timeNowCost.getString("totalCost")) - Double.valueOf(timeLastCost.getString("totalCost"))) / Double.valueOf(timeLastCost.getString("totalCost"));
|
|
|
resultMap.put("timeCompare",decimalFormat.format(timeCompare));
|
|
|
|
|
|
//当前月份的框返 和 激励
|