访问时间离开时间格式转换

master
dlcios 10 months ago
parent 901ab0d2ee
commit 229db02212
  1. 4
      api/v1/visitor.go
  2. 21
      internal/model/visitor_record.go
  3. 3
      internal/service/visitor.go

@ -2,7 +2,7 @@ package v1
import ( import (
"github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/frame/g"
"vistor/internal/model/entity" "vistor/internal/model"
) )
type VisitorAccessReq struct { type VisitorAccessReq struct {
@ -54,7 +54,7 @@ type VisitorListReq struct {
type VisitorListRes struct { type VisitorListRes struct {
g.Meta `mime:"text/html" example:"string"` g.Meta `mime:"text/html" example:"string"`
List []*entity.VisitorRecord `json:"list"` List []*model.VisitorRecord `json:"list"`
Current int `json:"current"` Current int `json:"current"`
Total int `json:"total"` Total int `json:"total"`
} }

@ -1,6 +1,27 @@
package model package model
import "github.com/gogf/gf/v2/os/gtime"
type ResRecord struct { type ResRecord struct {
XAxis string `json:"x_axis,omitempty"` XAxis string `json:"x_axis,omitempty"`
YAxis string `json:"y_axis,omitempty"` YAxis string `json:"y_axis,omitempty"`
} }
// VisitorRecord is the golang structure for table visitor_record.
type VisitorRecord struct {
Id uint `json:"id" ` // 自增id
VisitorName string `json:"visitorName" ` // 访客姓名
VisitorIdentity string `json:"visitorIdentity" ` // 访客身份证号码
VisitorPhone string `json:"visitorPhone" ` // 访客手机号
VisitorDepartment string `json:"visitorDepartment" ` // 来访单位
DstDepartment string `json:"dstDepartment" ` // 拜访人部门
DstName string `json:"dstName" ` // 拜访人姓名
DstLocation string `json:"dstLocation" ` // 地址(楼宇和层数)
Reason string `json:"reason" ` // 来访事由
VehicleNumber string `json:"vehicleNumber" ` // 车牌号码
Remark string `json:"remark" ` // 备注
LeftAt *gtime.Time `json:"leftAt" ` // 离场时间
VisitAt *gtime.Time `json:"visitAt" ` // 拜访时间
CreatedAt *gtime.Time `json:"createdAt" ` // 创建时间
UpdatedAt *gtime.Time `json:"updatedAt" ` // 更新时间
}

@ -12,7 +12,6 @@ import (
"vistor/internal/consts" "vistor/internal/consts"
"vistor/internal/dao" "vistor/internal/dao"
"vistor/internal/model" "vistor/internal/model"
"vistor/internal/model/entity"
) )
type visitorService struct{} type visitorService struct{}
@ -32,7 +31,7 @@ type IVisitor interface {
func (s *visitorService) VisitorList(ctx context.Context, req *v1.VisitorListReq) (res *v1.VisitorListRes, err error) { func (s *visitorService) VisitorList(ctx context.Context, req *v1.VisitorListReq) (res *v1.VisitorListRes, err error) {
condition := g.Map{} condition := g.Map{}
var records []*entity.VisitorRecord var records []*model.VisitorRecord
if req.PageNum == 0 { if req.PageNum == 0 {
req.PageNum = 1 req.PageNum = 1

Loading…
Cancel
Save