From 4df3efacd8845633ad94a8e8fb8641ae13be96ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E6=B6=9B?= <midnite@outlook.com>
Date: Tue, 27 Jun 2023 15:11:46 +0800
Subject: [PATCH] =?UTF-8?q?fix(tenement):=E4=BF=AE=E6=AD=A3=E5=88=97?=
 =?UTF-8?q?=E4=B8=BE=E5=95=86=E6=88=B7=E6=97=B6=E7=9A=84=E8=BF=81=E5=85=A5?=
 =?UTF-8?q?=E8=BF=81=E5=87=BA=E6=9D=A1=E4=BB=B6=E7=AD=9B=E9=80=89=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controller/tenement.go |  2 +-
 repository/tenement.go | 13 ++++++++++---
 vo/tenement.go         |  4 ++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/controller/tenement.go b/controller/tenement.go
index 9ba138a..a77a902 100644
--- a/controller/tenement.go
+++ b/controller/tenement.go
@@ -52,7 +52,7 @@ func listTenement(c *fiber.Ctx) error {
 		tenementLog.Error("列出园区中的商户失败，未能解析查询结束日期", zap.Error(err))
 		return result.BadRequest(err.Error())
 	}
-	state := tools.EmptyToNil(c.Query("state"))
+	state := c.QueryInt("state", 0)
 	tenements, total, err := repository.TenementRepository.ListTenements(parkId, uint(page), keyword, building, startDate, endDate, state)
 	if err != nil {
 		tenementLog.Error("列出园区中的商户失败，未能获取商户列表", zap.Error(err))
diff --git a/repository/tenement.go b/repository/tenement.go
index e3c1339..1d09ff3 100644
--- a/repository/tenement.go
+++ b/repository/tenement.go
@@ -53,7 +53,7 @@ func (tr _TenementRepository) IsTenementBelongs(tid, uid string) (bool, error) {
 }
 
 // 列出指定园区中的所有商户
-func (tr _TenementRepository) ListTenements(pid string, page uint, keyword, building *string, startDate, endDate *types.Date, state *string) ([]*model.Tenement, int64, error) {
+func (tr _TenementRepository) ListTenements(pid string, page uint, keyword, building *string, startDate, endDate *types.Date, state int) ([]*model.Tenement, int64, error) {
 	tr.log.Info(
 		"检索查询指定园区中符合条件的商户",
 		zap.String("Park", pid),
@@ -62,7 +62,7 @@ func (tr _TenementRepository) ListTenements(pid string, page uint, keyword, buil
 		zap.Stringp("Building", building),
 		logger.DateFieldp("StartDate", startDate),
 		logger.DateFieldp("EndDate", endDate),
-		zap.Stringp("State", state),
+		zap.Int("State", state),
 	)
 	ctx, cancel := global.TimeoutContext()
 	defer cancel()
@@ -136,13 +136,20 @@ func (tr _TenementRepository) ListTenements(pid string, page uint, keyword, buil
 		)
 	}
 
-	if state != nil && *state == "1" {
+	if state == 0 {
 		tenementQuery = tenementQuery.Where(
 			goqu.I("t.moved_out_at").IsNull(),
 		)
 		countQuery = countQuery.Where(
 			goqu.I("t.moved_out_at").IsNull(),
 		)
+	} else {
+		tenementQuery = tenementQuery.Where(
+			goqu.I("t.moved_out_at").IsNotNull(),
+		)
+		countQuery = countQuery.Where(
+			goqu.I("t.moved_out_at").IsNotNull(),
+		)
 	}
 
 	startRow := (page - 1) * config.ServiceSettings.ItemsPageSize
diff --git a/vo/tenement.go b/vo/tenement.go
index c5508be..1cc743f 100644
--- a/vo/tenement.go
+++ b/vo/tenement.go
@@ -25,8 +25,8 @@ type TenementQueryResponse struct {
 	FullName       string          `json:"fullName"`
 	ShortName      *string         `json:"shortName"`
 	Address        *string         `json:"address"`
-	Contact        *string         `json:"contact"`
-	Phone          *string         `json:"phone"`
+	Contact        *string         `json:"contact" copier:"ContactName"`
+	Phone          *string         `json:"phone" copier:"ContactPhone"`
 	Building       *string         `json:"building"`
 	BuildingName   *string         `json:"buildingName"`
 	OnFloor        *string         `json:"onFloor"`