Commit cfc0c233 authored by 陈子龙's avatar 陈子龙

主机管理 fix

parent 51eebe6a
......@@ -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
}
......
......@@ -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")
//查询任务
......
......@@ -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")
//查询任务
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment