微分统计法投药量计算值

src/main/java/com/xlht/xlhtproject/controller/TXlhtAddRecordController.java

@@ -69,6 +69,8 @@ public class TXlhtAddRecordController extends BaseController{
                 Collections.singletonList("时间"),
                 Collections.singletonList("南池瞬时加药量（L/h）-秒级"),
                 Collections.singletonList("北池瞬时加药量（L/h）-秒级"),
+                Collections.singletonList("南池瞬时加药量（L/h）-秒级梯形法"),
+                Collections.singletonList("北池瞬时加药量（L/h）-秒级梯形法"),
                 Collections.singletonList("南池瞬时加药量（L/h）-5分钟"),
                 Collections.singletonList("北池瞬时加药量（L/h）-5分钟"),
                 Collections.singletonList("南池系统加药量（L/h）（系统显示）"),
@@ -82,6 +84,8 @@ public class TXlhtAddRecordController extends BaseController{
             row.add(DateUtils.parseDateToStr("YYYY-MM-dd HH", member.getCreateTime()));
             row.add(Objects.nonNull(member.getInstantTwoAmount()) ? member.getInstantTwoAmount().setScale(2, RoundingMode.HALF_UP) : null);
             row.add(Objects.nonNull(member.getInstantOneAmount()) ? member.getInstantOneAmount().setScale(2, RoundingMode.HALF_UP) : null);
+            row.add(Objects.nonNull(member.getCalculusTwoAmount()) ? member.getCalculusTwoAmount().setScale(2, RoundingMode.HALF_UP) : null);
+            row.add(Objects.nonNull(member.getCalculusOneAmount()) ? member.getCalculusOneAmount().setScale(2, RoundingMode.HALF_UP) : null);
             row.add(Objects.nonNull(member.getRealTwoAmount()) ? member.getRealTwoAmount().setScale(2, RoundingMode.HALF_UP) : null);
             row.add(Objects.nonNull(member.getRealOneAmount()) ? member.getRealOneAmount().setScale(2, RoundingMode.HALF_UP) : null);
             row.add(Objects.nonNull(member.getTwoAmount()) ? member.getTwoAmount().setScale(2, RoundingMode.HALF_UP) : null);
@@ -143,6 +147,8 @@ public class TXlhtAddRecordController extends BaseController{
                 Collections.singletonList("时间"),
                 Collections.singletonList("南池瞬时加药量（L/h）-秒级"),
                 Collections.singletonList("北池瞬时加药量（L/h）-秒级"),
+                Collections.singletonList("南池瞬时加药量（L/h）-秒级梯形法"),
+                Collections.singletonList("北池瞬时加药量（L/h）-秒级梯形法"),
                 Collections.singletonList("南池瞬时加药量（L/h）-5分钟"),
                 Collections.singletonList("北池瞬时加药量（L/h）-5分钟"),
                 Collections.singletonList("南池系统加药量（L/h）（系统显示）"),
@@ -156,6 +162,8 @@ public class TXlhtAddRecordController extends BaseController{
             row.add(DateUtils.parseDateToStr("YYYY-MM-dd", member.getCreateTime()));
             row.add(Objects.nonNull(member.getInstantTwoAmount()) ? member.getInstantTwoAmount().setScale(2, RoundingMode.HALF_UP) : null);
             row.add(Objects.nonNull(member.getInstantOneAmount()) ? member.getInstantOneAmount().setScale(2, RoundingMode.HALF_UP) : null);
+            row.add(Objects.nonNull(member.getCalculusTwoAmount()) ? member.getCalculusTwoAmount().setScale(2, RoundingMode.HALF_UP) : null);
+            row.add(Objects.nonNull(member.getCalculusOneAmount()) ? member.getCalculusOneAmount().setScale(2, RoundingMode.HALF_UP) : null);
             row.add(Objects.nonNull(member.getRealTwoAmount()) ? member.getRealTwoAmount().setScale(2, RoundingMode.HALF_UP) : null);
             row.add(Objects.nonNull(member.getRealOneAmount()) ? member.getRealOneAmount().setScale(2, RoundingMode.HALF_UP) : null);
             row.add(Objects.nonNull(member.getTwoAmount()) ? member.getTwoAmount().setScale(2, RoundingMode.HALF_UP) : null);