瀏覽代碼

fix(未出账单): 没有上机操作的预约也可手动确认和自动确认

likai 4 年之前
父節點
當前提交
8f9ceeebc3
共有 2 個文件被更改,包括 2 次插入0 次删除
  1. 1 0
      model/account/settle_account_main.go
  2. 1 0
      service/settle_account_main/settle_account_main.go

+ 1 - 0
model/account/settle_account_main.go

@@ -59,6 +59,7 @@ type MainInfo struct {
 	SettleAccountMain
 	SignInTime         *gtime.Time `orm:"SignInTime"         json:"sign_in_time"`         // 签到时间
 	SignOutTime        *gtime.Time `orm:"SignOutTime"        json:"sign_out_time"`        // 签退时间
+	AppointStatus      int         `orm:"AppointStatus"      json:"appoint_status"`       // 预约状态
 }
 
 type Instrument struct {

+ 1 - 0
service/settle_account_main/settle_account_main.go

@@ -157,6 +157,7 @@ func (s Service) List(req model.ListReq, user request.UserInfo) ([]accountModel.
 		if appointMap[item.AppointId].Id != 0 {
 			list[index].SignInTime = appointMap[item.AppointId].SignInTime
 			list[index].SignOutTime = appointMap[item.AppointId].SignOutTime
+			list[index].AppointStatus = appointMap[item.AppointId].Status
 		}
 	}