|
@@ -48,12 +48,9 @@ public class AppPageReportServiceImpl implements AppPageReportService {
|
|
*/
|
|
*/
|
|
@Override
|
|
@Override
|
|
public List<DeviceWaterSupply> deviceWaterReportForSameMonth(Integer companyOrgId, String sceneType, Integer parmType) {
|
|
public List<DeviceWaterSupply> deviceWaterReportForSameMonth(Integer companyOrgId, String sceneType, Integer parmType) {
|
|
- LoginUser loginUser = UserUtil.getCurrentUser();
|
|
|
|
LocalDate localDate = LocalDate.now();
|
|
LocalDate localDate = LocalDate.now();
|
|
List<DeviceWaterSupply> deviceWaterSupplies = new ArrayList<DeviceWaterSupply>();
|
|
List<DeviceWaterSupply> deviceWaterSupplies = new ArrayList<DeviceWaterSupply>();
|
|
-
|
|
|
|
BigDecimal AmountCountMonth = MonitorDataReportService.getAmountCount(companyOrgId,null, sceneType, parmType,2 );
|
|
BigDecimal AmountCountMonth = MonitorDataReportService.getAmountCount(companyOrgId,null, sceneType, parmType,2 );
|
|
-
|
|
|
|
DeviceWaterSupply deviceWaterSupplyMonth = new DeviceWaterSupply();
|
|
DeviceWaterSupply deviceWaterSupplyMonth = new DeviceWaterSupply();
|
|
deviceWaterSupplyMonth.setOrderNo(1);
|
|
deviceWaterSupplyMonth.setOrderNo(1);
|
|
deviceWaterSupplyMonth.setAmount(AmountCountMonth!=null?AmountCountMonth.divide(new BigDecimal("10000")):BigDecimal.ZERO);
|
|
deviceWaterSupplyMonth.setAmount(AmountCountMonth!=null?AmountCountMonth.divide(new BigDecimal("10000")):BigDecimal.ZERO);
|