From a8430e012f422eef07b217177768f80a78bbc2e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E6=B6=9B?= <midnite@outlook.com>
Date: Tue, 13 Sep 2022 16:00:41 +0800
Subject: [PATCH] =?UTF-8?q?enhance(enduser):=E5=AF=BC=E5=87=BA=E6=8A=84?=
 =?UTF-8?q?=E8=A1=A8=E8=AE=B0=E5=BD=95=E6=A8=A1=E6=9D=BF=E4=B8=AD=E6=90=BA?=
 =?UTF-8?q?=E5=B8=A6=E6=9C=89=E5=B7=B2=E7=BB=8F=E4=BF=9D=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=B8=AD=E7=9A=84=E6=8A=84=E8=A1=A8=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 excel/meter_non_pv_template.go |  4 ++--
 excel/meter_pv_template.go     | 16 ++++++++--------
 service/end_user.go            |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/excel/meter_non_pv_template.go b/excel/meter_non_pv_template.go
index 752c256..33392fd 100644
--- a/excel/meter_non_pv_template.go
+++ b/excel/meter_non_pv_template.go
@@ -75,8 +75,8 @@ func (t *MeterNonPVExcelTemplateGenerator) WriteMeterData(meters []model.EndUser
 				meter.MeterId,
 				meter.Ratio,
 				meter.LastPeriodOverall,
-				"0",
-				"0",
+				meter.CurrentPeriodOverall,
+				meter.AdjustOverall,
 			},
 			excelize.RowOpts{Height: 15},
 		); err != nil {
diff --git a/excel/meter_pv_template.go b/excel/meter_pv_template.go
index 5c1c18e..0121699 100644
--- a/excel/meter_pv_template.go
+++ b/excel/meter_pv_template.go
@@ -84,17 +84,17 @@ func (t *MeterPVExcelTemplateGenerator) WriteMeterData(meters []model.EndUserDet
 				meter.MeterId,
 				meter.Ratio,
 				meter.LastPeriodOverall,
-				"0",
+				meter.CurrentPeriodOverall,
 				meter.LastPeriodCritical,
-				"0",
+				meter.CurrentPeriodCritical,
 				meter.LastPeriodPeak,
-				"0",
+				meter.CurrentPeriodPeak,
 				meter.LastPeriodValley,
-				"0",
-				"0",
-				"0",
-				"0",
-				"0",
+				meter.CurrentPeriodValley,
+				meter.AdjustOverall,
+				meter.AdjustCritical,
+				meter.AdjustPeak,
+				meter.AdjustValley,
 			},
 			excelize.RowOpts{Height: 15},
 		); err != nil {
diff --git a/service/end_user.go b/service/end_user.go
index a45891d..022e810 100644
--- a/service/end_user.go
+++ b/service/end_user.go
@@ -78,7 +78,7 @@ func (_EndUserService) AllEndUserRecord(reportId string) ([]model.EndUserDetail,
 	users := make([]model.EndUserDetail, 0)
 	err := global.DBConn.
 		Where(builder.Eq{"report_id": reportId}).
-		Asc("seq").
+		Asc("seq", "meter_04kv_id").
 		Find(&users)
 	cache.CacheSearch(users, []string{"end_user_detail", "report", "park"}, "end_user_detail", "report", reportId)
 	return users, err