diff --git a/src/bean/vo/response/host_manage.go b/src/bean/vo/response/host_manage.go index 4b6c211a186291c6e413807ec8fc7b5f6373b60f..8ad6dd4fa1d53a5e3be435c704ccea006ed828a9 100644 --- a/src/bean/vo/response/host_manage.go +++ b/src/bean/vo/response/host_manage.go @@ -29,6 +29,9 @@ type HostList struct { Id int `json:"id"` // id Ip string `json:"ip"` // ip Port string `json:"port"` // 端口 + VoucherType int `json:"voucher_type"` // 凭证类型(0密码验证 密钥验证) + UserName string `json:"user_name"` // 用户名 + Password string `json:"password"` // 密码 HostFileUrl string `json:"host_file_url"` // 主机文件url } diff --git a/src/service/host_manage.go b/src/service/host_manage.go index c72e3c775e20fd5564580460c3a4346311805cc9..6e8a3562b60859c214efb0590bb8f8fdf7d2acb3 100644 --- a/src/service/host_manage.go +++ b/src/service/host_manage.go @@ -307,10 +307,11 @@ func (h *HostManageSvc) PageListHostManage(req request.ListHostManageReq) (total finder.Where("hm.host_name LIKE ?", "%"+req.Search+"%") } if req.CreateDateFrom != "" { + finder.Where("hm.create_time >= ?", req.CreateDateFrom) } if req.CreateDateTo != "" { - finder.Where("hm.create_time <= ?", req.CreateDateFrom) + finder.Where("hm.create_time <= ?", req.CreateDateTo) } finder.OrderBy("hm.id") //查询任务 diff --git a/src/service/task_manage.go b/src/service/task_manage.go index f8c9c70676ace54b49abbb405cc564557599f90c..e03e09d92fc9142a3514f930e8b82ad375318cd0 100644 --- a/src/service/task_manage.go +++ b/src/service/task_manage.go @@ -134,7 +134,7 @@ func (t *TaskManageSvc) ListTaskManage(req request.ListTaskManageReq) (total int finder.Where("create_time >= ?", req.CreateDateFrom) } if req.CreateDateTo != "" { - finder.Where("create_time <= ?", req.CreateDateFrom) + finder.Where("create_time <= ?", req.CreateDateTo) } finder.OrderBy("id") //查询任务