Merge remote-tracking branch 'origin/20210716' into 20210716

zoniot-common/zoniot-core-utils/src/main/java/com/zcxk/core/utils/BigDecimalUtils.java

@@ -109,4 +109,23 @@ public class BigDecimalUtils {
     public static BigDecimal add(Object value, Object value2){
         return new BigDecimal(value.toString()).add(new BigDecimal(value2.toString()));
     }
+
+    /**
+    * 相等
+    * @author Andy
+    * @date 14:45 2021/9/9
+    * @param value:
+    * @param value2:
+    * @return boolean
+    **/
+    public static boolean equals(Object value, Object value2) {
+        if (value == null && value2 == null) {
+            return true;
+        }
+        if (value == null || value2 == null) {
+            return false;
+        }
+        return new BigDecimal(value.toString()).compareTo(new BigDecimal(value2.toString())) == 0;
+    }
+
 }

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/vo/MeterReadWaterRecordVo.java

@@ -17,9 +17,6 @@ public class MeterReadWaterRecordVo {
     @ApiModelProperty(value="用水量")
     private BigDecimal waterConsumption;
 
-    @ApiModelProperty(value="小区ID")
-    private int communityId;
-
     @ApiModelProperty(value="日期")
     private int statDay;
 }

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/MeterReadWaterRecordMapper.xml

@@ -112,12 +112,12 @@
   </insert>
 
   <select id="listWaterRecord" resultType="com.zcxk.rmcp.api.vo.MeterReadWaterRecordVo">
-  select sum(rd.water_consumption) waterConsumption, community_id, stat_day
+  select sum(rd.water_consumption) waterConsumption, stat_day
   from rmcp_meter_read_water_record rd
   where
   rd.stat_day BETWEEN #{beginDate} and #{endDate}
   <include refid="permissionCondition"></include>
-  group by community_id, stat_day
+  group by stat_day
   </select>
 
   <select id="totalReadRate" resultType="com.zcxk.rmcp.api.vo.StatisticsReadRateVo">

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/impl/MeterReadWaterRecordServiceImpl.java

@@ -2,6 +2,7 @@ package com.zcxk.rmcp.web.service.impl;
 
 import com.zcxk.core.common.pojo.TotalResult;
 import com.zcxk.core.oauth2.util.UserUtil;
+import com.zcxk.core.utils.BigDecimalUtils;
 import com.zcxk.core.utils.DateUtil;
 import com.zcxk.rmcp.api.vo.MeterReadWaterRecordVo;
 import com.zcxk.rmcp.core.dao.MeterReadWaterRecordMapper;
@@ -40,7 +41,10 @@ public class MeterReadWaterRecordServiceImpl implements MeterReadWaterRecordServ
         List<MeterReadWaterRecordVo> list = meterReadWaterRecordMapper.listWaterRecord(beginDate, endDate, UserUtil.getCurrentUser().getUserCondition());
         for (MeterReadWaterRecordVo meterReadWaterRecordVo : list) {
             total = total.add(meterReadWaterRecordVo.getWaterConsumption());
+            if (!BigDecimalUtils.equals(meterReadWaterRecordVo.getWaterConsumption(), "0")) {
+                meterReadWaterRecordVo.setWaterConsumption(BigDecimalUtils.divide(meterReadWaterRecordVo.getWaterConsumption(), "10000",4));
+            }
         }
-        return new TotalResult<>(list, total);
+        return new TotalResult<>(list, BigDecimalUtils.divide(total, "10000",4));
     }
 }