From cfc0c233b0675e2f76cac92e522062f09f63100e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=AD=90=E9=BE=99?= Date: Sun, 2 Jul 2023 14:47:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E6=9C=BA=E7=AE=A1=E7=90=86=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/bean/vo/response/host_manage.go | 3 +++ src/service/host_manage.go | 3 ++- src/service/task_manage.go | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/bean/vo/response/host_manage.go b/src/bean/vo/response/host_manage.go index 4b6c211..8ad6dd4 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 c72e3c7..6e8a356 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 f8c9c70..e03e09d 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") //查询任务 -- 2.26.0