diff --git a/app/hdl/institutional_management/egg_energy/hdl_basic.go b/app/hdl/institutional_management/egg_energy/hdl_basic.go index de8541b..964cd82 100644 --- a/app/hdl/institutional_management/egg_energy/hdl_basic.go +++ b/app/hdl/institutional_management/egg_energy/hdl_basic.go @@ -646,7 +646,6 @@ func AddFundData(c *gin.Context) { if req.Hours > 24 { hour = 24 } - // 十分钟执行一次 times := req.Hours * 60 / req.Frequency m := model.EggEnergyFundData{ Kind: req.Kind, diff --git a/app/hdl/institutional_management/egg_energy/hdl_egg_point.go b/app/hdl/institutional_management/egg_energy/hdl_egg_point.go index 6d35877..7aa2771 100644 --- a/app/hdl/institutional_management/egg_energy/hdl_egg_point.go +++ b/app/hdl/institutional_management/egg_energy/hdl_egg_point.go @@ -188,6 +188,22 @@ func UserEggFlow(c *gin.Context) { } var resp md.UserEggFlowReqResp var err error + //评分类型(0:未知 1:人工 2:系统) + scoreValueKindMap := []map[string]interface{}{ + { + "name": "未知", + "value": 0, + }, + { + "name": "人工", + "value": 1, + }, + { + "name": "系统", + "value": 2, + }, + } + resp.ScoreValueKindMap = scoreValueKindMap var esIndexName string if req.Year == "" && req.Week == "" { diff --git a/app/md/institutional_management/egg_energy/md_egg_point.go b/app/md/institutional_management/egg_energy/md_egg_point.go index ab3827e..46f51c0 100644 --- a/app/md/institutional_management/egg_energy/md_egg_point.go +++ b/app/md/institutional_management/egg_energy/md_egg_point.go @@ -86,12 +86,13 @@ type ManualScoreReq struct { } type UserEggFlowReqResp struct { - Page int `json:"page,required"` // 页数 - PageSize int `json:"page_size,required"` // 每页大小 - Year string `json:"year" example:"年份"` - Week string `json:"week" example:"周份"` - Total int64 `json:"total"` //总数量 - List []UserEggFlowReqRespList `json:"list"` + ScoreValueKindMap []map[string]interface{} `json:"score_value_kind_map"` // 评分类型(0:未知 1:人工 2:系统) + Page int `json:"page,required"` // 页数 + PageSize int `json:"page_size,required"` // 每页大小 + Year string `json:"year" example:"年份"` + Week string `json:"week" example:"周份"` + Total int64 `json:"total"` //总数量 + List []UserEggFlowReqRespList `json:"list"` } type UserEggFlowReqRespList struct { diff --git a/docs/docs.go b/docs/docs.go index 2c39fcc..9e917ef 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -6041,6 +6041,14 @@ const docTemplate = `{ "description": "每页大小", "type": "integer" }, + "score_value_kind_map": { + "description": "评分类型(0:未知 1:人工 2:系统)", + "type": "array", + "items": { + "type": "object", + "additionalProperties": true + } + }, "total": { "description": "总数量", "type": "integer" diff --git a/docs/swagger.json b/docs/swagger.json index e4a1753..0d35b51 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -6034,6 +6034,14 @@ "description": "每页大小", "type": "integer" }, + "score_value_kind_map": { + "description": "评分类型(0:未知 1:人工 2:系统)", + "type": "array", + "items": { + "type": "object", + "additionalProperties": true + } + }, "total": { "description": "总数量", "type": "integer" diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 38b869b..b8cb52f 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -2086,6 +2086,12 @@ definitions: page_size: description: 每页大小 type: integer + score_value_kind_map: + description: 评分类型(0:未知 1:人工 2:系统) + items: + additionalProperties: true + type: object + type: array total: description: 总数量 type: integer