Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
so-operation-api
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
smart-operation
so-operation-api
Commits
81f49e5b
Commit
81f49e5b
authored
Jul 06, 2023
by
黄智
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
字典新增单位字段
parent
c31ca2e5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
2 deletions
+7
-2
src/bean/entity/dictionary.go
src/bean/entity/dictionary.go
+1
-0
src/bean/vo/request/dict.go
src/bean/vo/request/dict.go
+2
-0
src/bean/vo/response/dict.go
src/bean/vo/response/dict.go
+1
-0
src/service/component_dict.go
src/service/component_dict.go
+3
-2
No files found.
src/bean/entity/dictionary.go
View file @
81f49e5b
...
@@ -37,6 +37,7 @@ type Dict struct {
...
@@ -37,6 +37,7 @@ type Dict struct {
UpdatedAt
jsontime
.
Time
`json:"updated_time" xorm:"updated_at"`
//修改时间
UpdatedAt
jsontime
.
Time
`json:"updated_time" xorm:"updated_at"`
//修改时间
MinVal
string
`json:"min_val" xorm:"min_val"`
//最大值
MinVal
string
`json:"min_val" xorm:"min_val"`
//最大值
MaxVal
string
`json:"max_val" xorm:"max_val"`
//最小值
MaxVal
string
`json:"max_val" xorm:"max_val"`
//最小值
Unit
string
`json:"unit" xorm:"unit"`
//单位
Sort
int
`json:"sort" xorm:"sort autoincr"`
//排序字段 降序排列
Sort
int
`json:"sort" xorm:"sort autoincr"`
//排序字段 降序排列
}
}
...
...
src/bean/vo/request/dict.go
View file @
81f49e5b
...
@@ -24,6 +24,7 @@ type AddDictReq struct {
...
@@ -24,6 +24,7 @@ type AddDictReq struct {
Description
string
`json:"description" form:"description" binding:"lte=200"`
//描述
Description
string
`json:"description" form:"description" binding:"lte=200"`
//描述
MinVal
string
`json:"min_val" form:"min_val"`
//最大值
MinVal
string
`json:"min_val" form:"min_val"`
//最大值
MaxVal
string
`json:"max_val" form:"max_val"`
//最小值
MaxVal
string
`json:"max_val" form:"max_val"`
//最小值
Unit
string
`json:"unit" form:"unit"`
//最小值
}
}
type
UpdateDictReq
struct
{
type
UpdateDictReq
struct
{
...
@@ -34,6 +35,7 @@ type UpdateDictReq struct {
...
@@ -34,6 +35,7 @@ type UpdateDictReq struct {
Description
string
`json:"description" form:"description" binding:"lte=200"`
//描述
Description
string
`json:"description" form:"description" binding:"lte=200"`
//描述
MinVal
string
`json:"min_val" form:"min_val"`
//最大值
MinVal
string
`json:"min_val" form:"min_val"`
//最大值
MaxVal
string
`json:"max_val" form:"max_val"`
//最小值
MaxVal
string
`json:"max_val" form:"max_val"`
//最小值
Unit
string
`json:"unit" form:"unit"`
//最小值
UpdatedBy
int
`json:"updated_by" `
//修改人
UpdatedBy
int
`json:"updated_by" `
//修改人
UpdatedAt
jsontime
.
Time
`json:"updated_at"`
//修改时间
UpdatedAt
jsontime
.
Time
`json:"updated_at"`
//修改时间
}
}
...
...
src/bean/vo/response/dict.go
View file @
81f49e5b
...
@@ -12,6 +12,7 @@ type DictListRes struct {
...
@@ -12,6 +12,7 @@ type DictListRes struct {
UpdatedAt
jsontime
.
Time
`json:"updated_at"`
UpdatedAt
jsontime
.
Time
`json:"updated_at"`
MinVal
string
`json:"min_val" `
//最大值
MinVal
string
`json:"min_val" `
//最大值
MaxVal
string
`json:"max_val"`
MaxVal
string
`json:"max_val"`
Unit
string
`json:"unit"`
Sort
int
`json:"sort"`
Sort
int
`json:"sort"`
Children
[]
*
DictListRes
`json:"children,omitempty"`
Children
[]
*
DictListRes
`json:"children,omitempty"`
}
}
...
...
src/service/component_dict.go
View file @
81f49e5b
...
@@ -64,7 +64,7 @@ func (c *Dict) List(req request.DictReq) (dictListRes []*response.DictListRes, c
...
@@ -64,7 +64,7 @@ func (c *Dict) List(req request.DictReq) (dictListRes []*response.DictListRes, c
}
}
session
:=
db
.
NewSession
()
session
:=
db
.
NewSession
()
session
.
Select
(
"id,class,name,parent_id,status,min_val,max_val,sort,description,updated_at"
)
.
Table
(
"dict"
)
session
.
Select
(
"id,class,name,parent_id,status,min_val,max_val,sort,description,updated_at
,unit
"
)
.
Table
(
"dict"
)
session
.
Where
(
"is_delete = 0 "
)
session
.
Where
(
"is_delete = 0 "
)
if
req
.
Id
!=
""
{
if
req
.
Id
!=
""
{
...
@@ -148,6 +148,7 @@ func (c *Dict) Add(req request.AddDictReq) (err error) {
...
@@ -148,6 +148,7 @@ func (c *Dict) Add(req request.AddDictReq) (err error) {
UpdatedAt
:
jsontime
.
Time
(
time
.
Now
()),
UpdatedAt
:
jsontime
.
Time
(
time
.
Now
()),
MinVal
:
req
.
MinVal
,
MinVal
:
req
.
MinVal
,
MaxVal
:
req
.
MaxVal
,
MaxVal
:
req
.
MaxVal
,
Unit
:
req
.
Unit
,
}
}
db
,
err
:=
client
.
GetDbClient
()
db
,
err
:=
client
.
GetDbClient
()
...
@@ -185,7 +186,7 @@ func (c *Dict) Update(req request.UpdateDictReq) (err error) {
...
@@ -185,7 +186,7 @@ func (c *Dict) Update(req request.UpdateDictReq) (err error) {
req
.
UpdatedAt
=
jsontime
.
Time
(
time
.
Now
())
req
.
UpdatedAt
=
jsontime
.
Time
(
time
.
Now
())
_
,
err
=
session
.
Table
(
"dict"
)
.
_
,
err
=
session
.
Table
(
"dict"
)
.
Cols
(
"name,status,description,updated_by,updated_at,min_val,max_val"
)
.
Cols
(
"name,status,description,updated_by,updated_at,min_val,max_val
,unit
"
)
.
Where
(
"id = ? and is_delete = 0"
,
req
.
Id
)
.
Update
(
&
req
)
Where
(
"id = ? and is_delete = 0"
,
req
.
Id
)
.
Update
(
&
req
)
if
err
!=
nil
{
if
err
!=
nil
{
err
=
errors
.
Wrap
(
err
,
"修改字典失败!"
)
err
=
errors
.
Wrap
(
err
,
"修改字典失败!"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment