ZiHangQin/electricity_bill_calc_service
1
0
Fork 0
forked from free-lancers/electricity_bill_calc_service
Code Pull Requests Activity

Merge branch 'master' into god-mode

Browse Source
This commit is contained in:
徐涛
2022-09-06 16:08:45 +08:00
parent 901cbf23bb 0d2b1431b6
commit 0ec7f5fba1
15 changed files with 157 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
controller/park.go
View File

@@ -49,7 +49,8 @@ func listAllParksUnderSessionUser(c *gin.Context) {
result.Unauthorized(err.Error())
return
}
parks, err := service.ParkService.ListAllParkBelongsTo(userSession.Uid)
keyword := c.DefaultQuery("keyword", "")
parks, err := service.ParkService.ListAllParkBelongsTo(userSession.Uid, keyword)
if err != nil {
result.Error(http.StatusInternalServerError, err.Error())
return
@@ -60,7 +61,8 @@ func listAllParksUnderSessionUser(c *gin.Context) {
func listAllParksUnderSpecificUser(c *gin.Context) {
result := response.NewResult(c)
requestUserId := c.Param("uid")
parks, err := service.ParkService.ListAllParkBelongsTo(requestUserId)
keyword := c.DefaultQuery("keyword", "")
parks, err := service.ParkService.ListAllParkBelongsTo(requestUserId, keyword)
if err != nil {
result.Error(http.StatusInternalServerError, err.Error())
return
@@ -69,16 +71,16 @@ func listAllParksUnderSpecificUser(c *gin.Context) {
}
type _ParkInfoFormData struct {
Name string `json:"name" form:"name"`
Region *string `json:"region" form:"region"`
Address *string `json:"address" form:"address"`
Contact *string `json:"contact" form:"contact"`
Phone *string `json:"phone" from:"phone"`
Area decimal.NullDecimal `json:"area" from:"area"`
Capacity decimal.NullDecimal `json:"capacity" from:"capacity"`
Tenement decimal.NullDecimal `json:"tenement" from:"tenement"`
Category int `json:"category" form:"category"`
Submeter int `json:"submeter" form:"submeter"`
Name string `json:"name" form:"name"`
Region *string `json:"region" form:"region"`
Address *string `json:"address" form:"address"`
Contact *string `json:"contact" form:"contact"`
Phone *string `json:"phone" from:"phone"`
Area decimal.NullDecimal `json:"area" from:"area"`
Capacity decimal.NullDecimal `json:"capacity" from:"capacity"`
TenementQuantity decimal.NullDecimal `json:"tenement" from:"tenement"`
Category int `json:"category" form:"category"`
Submeter int `json:"submeter" form:"submeter"`
}
func createNewPark(c *gin.Context) {