Commit fc7d91ea authored by chenweijian's avatar chenweijian

家族

parent 86972535
......@@ -11,6 +11,7 @@ const (
LayoutDay = "2006-01-02"
LayoutDay2 = "20060102"
LayoutMonth = "2006-01"
LayoutMinute = "2006-01-02 15:04"
)
// 获取时间所在周的第一天(周一) 00:00:00,和最后一天(周日)23:59:59
......
......@@ -690,14 +690,14 @@ type FamilyMemberDetail struct {
type FamilyApplyList struct {
User *user_m.UserTiny `json:"user"`
Time time.Time `json:"time"`
Time string `json:"time"`
Status int8 `json:"status"` // 0未操作,1已接受,2.已拒绝
MgrName string `json:"mgrName"` // 管理员名称
}
type FamilyQuitList struct {
User *user_m.UserTiny `json:"user"`
Time time.Time `json:"time"`
Time string `json:"time"`
QuitType int8 `json:"status"` // 1.主动退出 2.被踢出
MgrName string `json:"mgrName"` // 管理员名称
}
......@@ -14,6 +14,7 @@ import (
"hilo-group/_const/enum/msg_e"
"hilo-group/_const/redis_key"
"hilo-group/common"
"hilo-group/common/utime"
"hilo-group/cv/group_cv"
"hilo-group/cv/group_power_cv"
"hilo-group/cv/medal_cv"
......@@ -1094,7 +1095,7 @@ func GroupPowerApplyList(c *gin.Context) (*mycontext.MyContext, error) {
result := make([]*group_power_cv.FamilyApplyList, 0, len(rows))
for _, v := range rows {
info := &group_power_cv.FamilyApplyList{User: userMap[v.UserId], Time: v.CreatedTime, Status: v.IsAccept}
info := &group_power_cv.FamilyApplyList{User: userMap[v.UserId], Time: v.CreatedTime.Format(utime.LayoutMinute), Status: v.IsAccept}
if v.MgrId > 0 {
info.MgrName = userMap[v.MgrId].Nick
}
......@@ -1197,7 +1198,7 @@ func GroupPowerQuit(c *gin.Context) (*mycontext.MyContext, error) {
// @Summary 家族退出列表
// @Param pageSize query int true "分页大小 默认:10" default(10)
// @Param pageIndex query int true "第几个分页,从1开始 默认:1" default(1)
// @Success 200
// @Success 200 {object} []group_power_cv.FamilyQuitList
// @Router /v1/groupPower/quit/list [get]
func GroupPowerQuitList(c *gin.Context) (*mycontext.MyContext, error) {
myContext := mycontext.CreateMyContext(c.Keys)
......@@ -1244,7 +1245,7 @@ func GroupPowerQuitList(c *gin.Context) (*mycontext.MyContext, error) {
result := make([]*group_power_cv.FamilyQuitList, 0, len(rows))
for _, v := range rows {
item := &group_power_cv.FamilyQuitList{User: userMap[v.UserId], Time: v.CreatedTime}
item := &group_power_cv.FamilyQuitList{User: userMap[v.UserId], Time: v.CreatedTime.Format(utime.LayoutMinute)}
if v.UserId == v.MgrId {
item.QuitType = 1 // 主动退出
} else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment