|
@@ -26,6 +26,16 @@ var (
|
|
|
"C": {"累计阅读次数", "ReadCount"},
|
|
|
"D": {"注册时间", "CreatedTime"},
|
|
|
}
|
|
|
+
|
|
|
+ userCols = map[string]utils.ExcelColMapping{
|
|
|
+ "A": {"姓名", "RealName"},
|
|
|
+ "B": {"手机号", "Mobile"},
|
|
|
+ "C": {"公司名称", "CompanyName"},
|
|
|
+ "D": {"注册时间", "CreatedTime"},
|
|
|
+ "E": {"是否关注公众号", "FollowingGzhStr"},
|
|
|
+ "F": {"最近一次阅读时间", "LastReadTime"},
|
|
|
+ "G": {"累计阅读次数", "ReadCount"},
|
|
|
+ }
|
|
|
)
|
|
|
|
|
|
// TemplateList
|
|
@@ -441,7 +451,7 @@ func (this *UserController) ExportTemplateUsers() {
|
|
|
year, month, day := time.Now().Date()
|
|
|
yearStr := strconv.Itoa(year)[2:]
|
|
|
fileName := fmt.Sprintf("临时用户表%s.%d.%d.xlsx", yearStr, month, day)
|
|
|
- file, err := utils.ExportExcel("用户列表", templateCols, models.TemplateUsersItem{}, list)
|
|
|
+ file, err := utils.ExportExcel("临时用户表", templateCols, list)
|
|
|
_ = this.downloadExcelFile(file, fileName)
|
|
|
br.Ret = 200
|
|
|
br.Success = true
|
|
@@ -488,29 +498,10 @@ func (this *UserController) ExportOfficialUsers() {
|
|
|
this.Data["json"] = br
|
|
|
this.ServeJSON()
|
|
|
}()
|
|
|
- pageSize, _ := this.GetInt("PageSize")
|
|
|
- currentIndex, _ := this.GetInt("CurrentIndex")
|
|
|
keyword := this.GetString("Keyword")
|
|
|
FollowingGzh := this.GetString("FollowingGzh")
|
|
|
RegisterBeginDate := this.GetString("RegisterBeginDate")
|
|
|
RegisterEndDate := this.GetString("RegisterEndDate")
|
|
|
- if pageSize <= 0 {
|
|
|
- pageSize = utils.PageSize20
|
|
|
- } else if pageSize > utils.PageSize100 {
|
|
|
- pageSize = utils.PageSize100
|
|
|
- }
|
|
|
- if currentIndex <= 0 {
|
|
|
- currentIndex = 1
|
|
|
- }
|
|
|
- if pageSize <= 0 {
|
|
|
- pageSize = utils.PageSize20
|
|
|
- } else if pageSize > utils.PageSize100 {
|
|
|
- pageSize = utils.PageSize100
|
|
|
- }
|
|
|
- if currentIndex <= 0 {
|
|
|
- currentIndex = 1
|
|
|
- }
|
|
|
- startSize := utils.StartIndex(currentIndex, pageSize)
|
|
|
|
|
|
sortParamInt, _ := this.GetInt("SortParam", 0)
|
|
|
sortTypeInt, _ := this.GetInt("SortType", 0)
|
|
@@ -589,31 +580,18 @@ func (this *UserController) ExportOfficialUsers() {
|
|
|
condition += ` AND ( mobile LIKE ? or real_name like ?)`
|
|
|
pars = utils.GetLikeKeywordPars(pars, keyword, 2)
|
|
|
}
|
|
|
+ userList, err := models.GetPageOfficialUserByCondition(condition, pars, sortStr)
|
|
|
|
|
|
- resp := new(response.UserListResp)
|
|
|
- total, userList, err := models.GetPageOfficialUserList(condition, pars, sortStr, startSize, pageSize)
|
|
|
if err != nil {
|
|
|
br.Msg = "查询用户失败"
|
|
|
br.Msg = "查询用户失败,系统错误,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
-
|
|
|
- //list := make([]*models.UserView, 0)
|
|
|
- //var wg sync.WaitGroup
|
|
|
- //wg.Add(len(userList))
|
|
|
- //for _, v := range userList {
|
|
|
- // go func(v *models.User) {
|
|
|
- // defer wg.Done()
|
|
|
- // tempUser, _ := models.GetTemplateUser(v.TemplateUserId)
|
|
|
- // userView := v.FillUserInfo(tempUser)
|
|
|
- // list = append(list, &userView)
|
|
|
- // }(&v)
|
|
|
- //}
|
|
|
- //wg.Wait()
|
|
|
- page := paging.GetPaging(currentIndex, pageSize, total)
|
|
|
- resp.Paging = page
|
|
|
- resp.List = userList
|
|
|
- br.Data = resp
|
|
|
+ year, month, day := time.Now().Date()
|
|
|
+ yearStr := strconv.Itoa(year)[2:]
|
|
|
+ fileName := fmt.Sprintf("用户表%s.%d.%d.xlsx", yearStr, month, day)
|
|
|
+ file, err := utils.ExportExcel("用户列表", userCols, userList)
|
|
|
+ _ = this.downloadExcelFile(file, fileName)
|
|
|
br.Ret = 200
|
|
|
br.Success = true
|
|
|
br.Msg = "获取成功"
|