投药报表，小时||天维度

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

@@ -79,10 +79,10 @@ 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.getTwoAmount()) ? member.getTwoAmount().setScale(2, RoundingMode.HALF_UP) : null);
-            row.add(Objects.nonNull(member.getOneAmount()) ? member.getOneAmount().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);
+            row.add(Objects.nonNull(member.getOneAmount()) ? member.getOneAmount().setScale(2, RoundingMode.HALF_UP) : null);
             row.add(Objects.nonNull(member.getTmpTwoAmount()) ? member.getTmpTwoAmount().setScale(2, RoundingMode.HALF_UP) : null);
             row.add(Objects.nonNull(member.getTmpOneAmount()) ? member.getTmpOneAmount().setScale(2, RoundingMode.HALF_UP) : null);
             data.add(row);
@@ -149,10 +149,10 @@ 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.getTwoAmount()) ? member.getTwoAmount().setScale(2, RoundingMode.HALF_UP) : null);
-            row.add(Objects.nonNull(member.getOneAmount()) ? member.getOneAmount().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);
+            row.add(Objects.nonNull(member.getOneAmount()) ? member.getOneAmount().setScale(2, RoundingMode.HALF_UP) : null);
             row.add(Objects.nonNull(member.getTmpTwoAmount()) ? member.getTmpTwoAmount().setScale(2, RoundingMode.HALF_UP) : null);
             row.add(Objects.nonNull(member.getTmpOneAmount()) ? member.getTmpOneAmount().setScale(2, RoundingMode.HALF_UP) : null);
             data.add(row);