接受数据修改6

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnergyElectricityServiceImpl.java

@@ -224,9 +224,11 @@ public class EnergyElectricityServiceImpl extends ServiceImpl<EnergyElectricityM
         List<EnergyWaterVo> waterVoList = new ArrayList<>();
         for (EnergyWaterVo waterVo : waterVos) {
             EnergyWaterVo waterVo1 = new EnergyWaterVo();
-            BaseBuilding baseBuilding = buildingMapper.selectById(waterVo.getUnitId());
+            BaseBuilding baseBuilding = buildingMapper.selectById(waterVo.getChipName());
             waterVo1.setWaterValue(waterVo.getWaterValue());
-            waterVo1.setChipName(baseBuilding.getBuildName());
+            if (ObjectUtil.isNotEmpty(baseBuilding)) {
+                waterVo1.setChipName(baseBuilding.getBuildName());
+            }
             waterVo1.setCreateDate(waterVo.getCreateDate());
             waterVoList.add(waterVo1);
         }

huimv-admin/src/main/java/com/huimv/guowei/admin/utils/Print.java

@@ -181,21 +181,24 @@ public class Print {
             WaterVo waterVo1 = new WaterVo();
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
             String format = sdf.format(waterVo.getCreateDate());
-            waterVo1.setDate(format);
-            waterVo1.setLocation(waterVo.getChipName());
-            waterVo1.setWater(waterVo.getWaterValue());
-            BigDecimal bd = new BigDecimal(waterVo.getWaterValue());
-            BigDecimal result = bd.setScale(2, BigDecimal.ROUND_HALF_UP);
-            count = count.add(result);
-            list.add(waterVo1);
-            if (i == 4) {
-                WaterVo one = new WaterVo();
-                one.setDate(format);
-                one.setLocation("合计：");
-                one.setWater(count.toString());
-                list.add(one);
-                i = 0;
+            if (!"0".equals(waterVo.getWaterValue())) {
+                waterVo1.setWater(waterVo.getWaterValue());
+                waterVo1.setDate(format);
+                waterVo1.setLocation(waterVo.getChipCode());
             }
+                BigDecimal bd = new BigDecimal(waterVo.getWaterValue());
+                BigDecimal result = bd.setScale(2, BigDecimal.ROUND_HALF_UP);
+                count = count.add(result);
+                list.add(waterVo1);
+                if (i == 4) {
+                    WaterVo one = new WaterVo();
+                    one.setDate(format);
+                    one.setLocation("合计：");
+                    one.setWater(count.toString());
+                    list.add(one);
+                    i = 0;
+                }
+
         }
         context.putVar("list", list);
         context.putVar("waterCount", water.getWaterValue());

huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnergyWaterMapper.xml

@@ -172,10 +172,10 @@
     </select>
 
     <select id="printWater" resultType="com.huimv.guowei.admin.entity.EnergyWater">
-        SELECT IFNULL(sum(water_value),0) 'waterValue'  FROM `energy_water`
+        SELECT water_value 'waterValue',unit_id 'chipCode',create_date 'createDate' FROM `energy_water`
          ${ew.customSqlSegment}
         GROUP BY DATE_FORMAT(create_date,'%Y-%m-%d')
-        ORDER BY create_date DESC
+        ORDER BY create_date ASC
     </select>
 
     <select id="printWaterCount" resultType="com.huimv.guowei.admin.entity.EnergyWater">