|
@@ -300,7 +300,7 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
resultMap.put("contractCharged",nowMonthCost.getString("contractCharged"));//激励
|
|
|
|
|
|
//当前月消耗
|
|
|
- JSONObject monthCost = materialStareMapper.getKuaiShouAccountCostMonth(null, monthFirstDay,nowDate);
|
|
|
+ JSONObject monthCost = materialStareMapper.getKuaiShouAccountCostMonth(userId, monthFirstDay,nowDate);
|
|
|
resultMap.put("monthCost",Check.isNull(monthCost) ? "0" : monthCost.getString("cost"));
|
|
|
|
|
|
|
|
@@ -593,9 +593,6 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
//0-开 1-关
|
|
|
resultMap.put("state", Check.isNull(totalCost) ? "1" : totalCost.getString("accountStatus"));
|
|
|
|
|
|
- //月消耗
|
|
|
- JSONObject monthCost = materialStareMapper.getKuaiShouAccountCostMonth(accountId, monthFirstDay,nowDate);
|
|
|
- resultMap.put("monthCost",Check.isNull(monthCost) ? "0" : monthCost.getString("cost"));
|
|
|
return Result.successMsg("账户查询成功",resultMap);
|
|
|
}
|
|
|
|