水表导出修改

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/vo/EnergyWaterVo.java

@@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -30,7 +31,7 @@ public class EnergyWaterVo implements Serializable {
     /**
      * 计录值
      */
-    private String waterValue;
+    private BigDecimal waterValue;
 
     /**
      * 原始值

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/vo/WaterVo.java

@@ -11,4 +11,5 @@ public class WaterVo {
     private String date;
     private String location;
     private String water;
+
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/mapper/EnergyWaterMapper.java

@@ -56,5 +56,7 @@ public interface EnergyWaterMapper extends BaseMapper<EnergyWater> {
 
     List<EnergyWater> listUnitMonthDetail(String farmId, String unitId);
 
-    List<EnergyWaterVo> printWater(@Param(Constants.WRAPPER) QueryWrapper<EnergyWater> queryWrapper);
+    List<EnergyWater> printWater(@Param(Constants.WRAPPER) QueryWrapper<EnergyWater> queryWrapper);
+
+    EnergyWater printWaterCount(@Param(Constants.WRAPPER) QueryWrapper<EnergyWater> queryWrapper);
 }

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

@@ -232,36 +232,37 @@ public class EnergyWaterServiceImpl extends ServiceImpl<EnergyWaterMapper, Energ
         String startTime = paramsMap.get("startTime");
         String endTime = paramsMap.get("endTime");
 
-        List<EnergyWaterVo> waterVos = new ArrayList<>();
+        List<EnergyWater> waterVos = new ArrayList<>();
         //今日
         QueryWrapper<EnergyWater> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId);
         if (type.equals("1")) {
             Date timesmorning = DataUill.getTimesmorning();
             queryWrapper.ge("create_date", timesmorning);
-            waterVos = energyWaterMapper.printWater(queryWrapper);
+            waterVos = energyWaterMapper.selectList(queryWrapper);
         }
         //本周
 
         if (type.equals("2")) {
             DateTime dateTime = DateUtil.beginOfWeek(new Date());
             queryWrapper.ge("create_date", dateTime);
-            waterVos = energyWaterMapper.printWater(queryWrapper);
+            waterVos = energyWaterMapper.selectList(queryWrapper);
         }
         //本月
 
         if (type.equals("3")) {
             Date timesMonthmorning = DataUill.getTimesMonthmorning();
             queryWrapper.ge("create_date", timesMonthmorning);
-            waterVos = energyWaterMapper.printWater(queryWrapper);
+            waterVos = energyWaterMapper.selectList(queryWrapper);
         }
         //自定义
 
         if (type.equals("4")) {
             endTime = endTime + " 23:59:59";
             queryWrapper.between("create_date", startTime, endTime);
-            waterVos = energyWaterMapper.printWater(queryWrapper);
+            waterVos = energyWaterMapper.selectList(queryWrapper);
         }
-        Print.printWater(waterVos);
+        EnergyWater water = energyWaterMapper.printWaterCount(queryWrapper);//总吨数
+        Print.printWater(waterVos,water);
     }
 }

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

@@ -82,11 +82,11 @@ public class EnvMoveCallServiceImpl extends ServiceImpl<EnvMoveCallMapper, EnvMo
         }
         QueryWrapper<EnvMoveCall> queryWrapper = new QueryWrapper<>();
         if (startDate == null || "".equals(startDate)) {
-            queryWrapper.eq("farm_id", farmId).orderByAsc("call_date");
+            queryWrapper.eq("farm_id", farmId).orderByDesc("call_date");
         } else {
             startDate = startDate + " 00:00:00";
             endDate = endDate + " 23:59:59";
-            queryWrapper.eq("farm_id", farmId).between("call_date", startDate, endDate).orderByAsc("call_date");
+            queryWrapper.eq("farm_id", farmId).between("call_date", startDate, endDate).orderByDesc("call_date");
         }
         Page<EnvMoveCall> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, moveCallMapper.selectPage(page, queryWrapper));

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

@@ -15,6 +15,7 @@ import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.math.BigDecimal;
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -162,7 +163,7 @@ public class Print {
         JxlsHelper.getInstance().processTemplate(is, os, context);
     }
 
-    public static void printWater(List<EnergyWaterVo> waterVos) throws Exception {
+    public static void printWater(List<EnergyWater> waterVos,EnergyWater water) throws Exception {
 
         //准备数据
         String path = "/opt/guowei/water.xls";
@@ -173,15 +174,31 @@ public class Print {
         //绑定数据
         Context context = new Context();
         List<WaterVo> list = new ArrayList<>();
-        for (EnergyWaterVo waterVo : waterVos) {
+        int i = 0;
+        BigDecimal count = BigDecimal.ZERO;
+        for (EnergyWater waterVo : waterVos) {
+            i=i+1;
             WaterVo waterVo1 = new WaterVo();
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-            waterVo1.setDate(sdf.format(waterVo.getCreateDate()));
+            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;
+            }
         }
         context.putVar("list", list);
+        context.putVar("waterCount", water.getWaterValue());
         //生成
         JxlsHelper.getInstance().processTemplate(is, os, context);
     }
@@ -202,7 +219,7 @@ public class Print {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
             waterVo1.setDate(sdf.format(waterVo.getCreateDate()));
             waterVo1.setLocation(waterVo.getChipName());
-            waterVo1.setWater(waterVo.getWaterValue());
+            waterVo1.setWater(waterVo.getWaterValue().toString());
             list.add(waterVo1);
         }
         context.putVar("list", list);

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

@@ -121,7 +121,7 @@ ORDER BY calendar.date;
     </select>
 
     <select id="printElectricity" resultType="com.huimv.guowei.admin.entity.vo.EnergyWaterVo">
-        SELECT (IFNUll(sum(electricity_value),'0')) 'waterValue',unit_id 'chipName',create_date 'createDate' FROM `energy_electricity`
+        SELECT electricity_value 'waterValue',unit_id 'chipName',create_date 'createDate' FROM `energy_electricity`
          ${ew.customSqlSegment}
         GROUP BY DATE_FORMAT(create_date,'%Y-%m-%d')
         ORDER BY create_date ASC

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

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