预约详情优化

model/meeting_reservation.go

@@ -85,13 +85,14 @@ type ReserveReq struct {
 
 // ReservationList 预约详情
 type ReservationList struct {
-	Day       int    `json:"day"`        // 日期
-	Dept      string `json:"dept"`       // 部门
-	StartTime string `json:"start_time"` // 预约开始时间
-	Tel       string `json:"tel"`        // 手机号
-	Uid       int    `json:"uid"`        // 用户ID
-	Uname     string `json:"uname"`      // 用户名称
-	Week      int    `json:"week"`       // 本周时间
+	ReservationId int    `json:"reservation_id"` // 预约ID
+	Day           int    `json:"day"`            // 日期
+	Dept          string `json:"dept"`           // 部门
+	StartTime     string `json:"start_time"`     // 预约开始时间
+	Tel           string `json:"tel"`            // 手机号
+	Uid           int    `json:"uid"`            // 用户ID
+	Uname         string `json:"uname"`          // 用户名称
+	Week          int    `json:"week"`           // 本周时间
 }
 
 // EndingReq 预约请求

service/reservation/reservation.go

@@ -391,13 +391,14 @@ func (s Service) getCurrentWeekReservation(ctx context.Context, req model.Reserv
 		for i := 0; i < int(grid); i++ {
 			startAt := v.StartTime.Add(time.Duration(i) * 30 * time.Minute)
 			resultList = append(resultList, model.ReservationList{
-				Day:       v.StartTime.Day(),
-				Dept:      usersMap[v.UserId].DepartmentName,
-				StartTime: fmt.Sprintf("%.2v:%.2v", startAt.Hour(), startAt.Minute()),
-				Tel:       usersMap[v.UserId].Mobile,
-				Uid:       v.UserId,
-				Uname:     usersMap[v.UserId].Realname,
-				Week:      common.GetCNWeekday(v.StartTime),
+				ReservationId: int(v.Id),
+				Day:           v.StartTime.Day(),
+				Dept:          usersMap[v.UserId].DepartmentName,
+				StartTime:     fmt.Sprintf("%.2v:%.2v", startAt.Hour(), startAt.Minute()),
+				Tel:           usersMap[v.UserId].Mobile,
+				Uid:           v.UserId,
+				Uname:         usersMap[v.UserId].Realname,
+				Week:          common.GetCNWeekday(v.StartTime),
 			})
 		}
 	}