Merge branch 'dev' of github.com:wenjianzhang/go-admin into table/dev
This commit is contained in:
commit
61451d149a
10 files changed
+64
-55
No files matched your search
@@ -43,7 +43,7 @@ func GetSysJob(c *gin.Context) {
|
||||
var v tools.GeneralGetDto
|
||||
err := c.BindUri(&v)
|
||||
tools.HasError(err, "", 500)
|
||||
data.JobId, _ = tools.StringToInt(v.Id)
|
||||
data.JobId = v.Id
|
||||
err = data.Get(data.JobId)
|
||||
tools.HasError(err, "抱歉未找到相关信息", -1)
|
||||
|
||||
@@ -111,7 +111,7 @@ func StartJob(c *gin.Context) {
|
||||
var v tools.GeneralGetDto
|
||||
err := c.BindUri(&v)
|
||||
tools.HasError(err, "", 500)
|
||||
data.JobId, _ = tools.StringToInt(v.Id)
|
||||
data.JobId = v.Id
|
||||
err = data.Get(data.JobId)
|
||||
tools.HasError(err, "", 500)
|
||||
if data.JobType == 1 {
|
||||
|
||||
@@ -44,12 +44,7 @@ func GetDictTypeList(c *gin.Context) {
|
||||
result, count, err := data.GetPage(pageSize, pageIndex)
|
||||
tools.HasError(err, "", -1)
|
||||
|
||||
var res app.PageResponse
|
||||
res.Data.List = result
|
||||
res.Data.Count = count
|
||||
res.Data.PageIndex = pageIndex
|
||||
res.Data.PageSize = pageSize
|
||||
c.JSON(http.StatusOK, res.ReturnOK())
|
||||
app.PageOK(c,result,count,pageIndex,pageSize,"")
|
||||
}
|
||||
|
||||
// @Summary 通过字典id获取字典类型
|
||||
|
||||
Reference in new issue
Block a user