用能月报导出3

fiveep-model/src/main/java/com/bizmatics/model/vo/HtAnalogDataOneVo.java

@@ -36,7 +36,7 @@ public class HtAnalogDataOneVo implements Serializable {
     /**
      * 冻结时间
      */
-    private Date freezingTime;
+    private String freezingTime;
 
 
 }

fiveep-service/src/main/java/com/bizmatics/service/impl/HtAnalogDataServiceImpl.java

@@ -637,13 +637,19 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
         List<HtAnalogDataOneVo> maxMonthlyReport = baseMapper.energyUseListOne(deviceCode, startTime, endTime, cycle, 1, 30, startCurrent);
         List<HtAnalogDataOneVo> minMonthlyReport = baseMapper.energyUseListOne(deviceCode, startTime, endTime, cycle, 2, 30, startCurrent);
         if (maxMonthlyReport.size() > 0) {
-            for (int j = 0; j < maxMonthlyReport.size(); j++) {
+            Double epp=0.00;
+            for (int j = 0; j < maxMonthlyReport.size()+1; j++) {
                 HtAnalogDataOneVo htAnalogDataOneVo = new HtAnalogDataOneVo();
-                BigDecimal b1 = new BigDecimal(maxMonthlyReport.get(j).getEpp().toString());
-                BigDecimal b2 = new BigDecimal(minMonthlyReport.get(j).getEpp().toString());
-                htAnalogDataOneVo.setEpp(b1.subtract(b2).doubleValue());
-//                htAnalogDataOneVo.setEpp("0.01");
-                htAnalogDataOneVo.setFreezingTime(maxMonthlyReport.get(j).getFreezingTime());
+                if (j==maxMonthlyReport.size()){
+                    htAnalogDataOneVo.setEpp(epp);
+                    htAnalogDataOneVo.setFreezingTime("合计");
+                }else {
+                    BigDecimal b1 = new BigDecimal(maxMonthlyReport.get(j).getEpp().toString());
+                    BigDecimal b2 = new BigDecimal(minMonthlyReport.get(j).getEpp().toString());
+                    epp+=b1.subtract(b2).doubleValue();
+                    htAnalogDataOneVo.setEpp(b1.subtract(b2).doubleValue());
+                    htAnalogDataOneVo.setFreezingTime(maxMonthlyReport.get(j).getFreezingTime());
+                }
                 listOne.add(htAnalogDataOneVo);
             }
         }

fiveep-service/src/main/java/com/bizmatics/service/vo/HtAnalogDataTwoExportVo.java

@@ -19,11 +19,11 @@ public class HtAnalogDataTwoExportVo {
     private Integer id;
 
 
-    @Excel(name = "电量one", height = 6, width = 20)
+    @Excel(name = "电量", height = 6, width = 20)
     private Double epp;
 
 
     @Excel(name = "名称", height = 6, width = 20)
-    private Date freezingTime;
+    private String freezingTime;
 
 }