From 62bd99d03c25ff02f101a4522cf1cbd8430b31c3 Mon Sep 17 00:00:00 2001 From: yinbentan <yinbentan@live.com> Date: 星期二, 16 七月 2024 20:11:14 +0800 Subject: [PATCH] 修改变量,庄口类型默认值从0变更为1 --- constvar/const.go | 8 ++++---- controllers/dict.go | 2 +- controllers/request/system_set.go | 4 ++-- router/router.go | 9 +++++---- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/constvar/const.go b/constvar/const.go index 81d8672..72056a6 100644 --- a/constvar/const.go +++ b/constvar/const.go @@ -3,10 +3,10 @@ type DictType int const ( - DictTypeMarket DictType = iota //搴勫彛 - DictTypeWorkshop //杞﹂棿 - DictTypeColor //棰滆壊 - DictTypeSpec //瑙勬牸 + DictTypeMarket DictType = iota + 1 //搴勫彛 + DictTypeWorkshop //杞﹂棿 + DictTypeColor //棰滆壊 + DictTypeSpec //瑙勬牸 ) type UserType int diff --git a/controllers/dict.go b/controllers/dict.go index 2a550cf..084e88a 100644 --- a/controllers/dict.go +++ b/controllers/dict.go @@ -121,7 +121,7 @@ } search := models.NewDictSearch() - if params.DictType != nil { + if params.DictType > 0 { search = search.SetDictType(params.DictType) } list, err := search.SetKeyword(params.Keyword).FindAll() diff --git a/controllers/request/system_set.go b/controllers/request/system_set.go index f4622e0..bc09766 100644 --- a/controllers/request/system_set.go +++ b/controllers/request/system_set.go @@ -7,8 +7,8 @@ type GetDictList struct { PageInfo - DictType *constvar.DictType `json:"dictType" form:"dictType"` //瀛楀吀绫诲瀷 - Keyword string `json:"keyword" form:"keyword"` //鎼滅储鍏抽敭瀛� + DictType constvar.DictType `json:"dictType" form:"dictType"` //瀛楀吀绫诲瀷 + Keyword string `json:"keyword" form:"keyword"` //鎼滅储鍏抽敭瀛� } type AddDict struct { diff --git a/router/router.go b/router/router.go index e639d88..7789777 100644 --- a/router/router.go +++ b/router/router.go @@ -65,10 +65,11 @@ finenessApi.POST("register", FinenessController.RegisterAdd) // 鏂板绾ゅ害鐧昏 finenessApi.GET("register/:id", FinenessController.RegisterInfo) // 鑾峰彇绾ゅ害鐧昏璇︽儏 - finenessApi.GET("check", FinenessController.CheckList) // 鑾峰彇绾ゅ害妫�楠屽垪琛� - finenessApi.DELETE("check/:id", FinenessController.CheckDelete) // 鍒犻櫎绾ゅ害妫�楠� - finenessApi.PUT("check", FinenessController.CheckEdit) // 淇敼绾ゅ害妫�楠� - finenessApi.GET("check/:id", FinenessController.CheckInfo) // 鑾峰彇绾ゅ害妫�楠岃鎯� + finenessApi.GET("check", FinenessController.CheckList) // 鑾峰彇绾ゅ害妫�楠屽垪琛� + finenessApi.DELETE("check/:id", FinenessController.CheckDelete) // 鍒犻櫎绾ゅ害妫�楠� + finenessApi.PUT("check", FinenessController.CheckEdit) // 淇敼绾ゅ害妫�楠� + finenessApi.GET("check/:id", FinenessController.CheckInfo) // 鑾峰彇绾ゅ害妫�楠岃鎯� + finenessApi.GET("checkFinenessID/:id", FinenessController.CheckInfoByFinenessID) // 鏍规嵁绾ゅ害鐧昏ID鑾峰彇绾ゅ害妫�楠岃鎯� finenessApi.POST("saveYieldRegister", yieldController.SaveYieldRegister) // 淇濆瓨浜ч噺鐧昏琛� finenessApi.POST("getYieldRegisterList", yieldController.GetYieldRegisterList) // 鑾峰彇浜ч噺鐧昏琛� -- Gitblit v1.8.0