|
@@ -8,7 +8,6 @@ import (
|
|
|
"eta/eta_mini_api/services"
|
|
|
"eta/eta_mini_api/utils"
|
|
|
"fmt"
|
|
|
- "strconv"
|
|
|
"strings"
|
|
|
"time"
|
|
|
)
|
|
@@ -272,13 +271,13 @@ func (this *UserAuthController) AddReportRecord() {
|
|
|
var insertId int64
|
|
|
if req.RecordId == 0 {
|
|
|
// 如果不存在就新增一条记录
|
|
|
- permission1Ids := make([]string, 0)
|
|
|
- permission2Ids := make([]string, 0)
|
|
|
+ permission1Ids := make([]int, 0)
|
|
|
+ permission2Ids := make([]int, 0)
|
|
|
permissionNames := make([]string, 0)
|
|
|
for _, item := range items {
|
|
|
curPermission := chartMap[item.ChartPermissionId]
|
|
|
- permission1Ids = append(permission1Ids, strconv.Itoa(curPermission.ParentId))
|
|
|
- permission2Ids = append(permission2Ids, strconv.Itoa(curPermission.ChartPermissionId))
|
|
|
+ permission1Ids = append(permission1Ids, curPermission.ParentId)
|
|
|
+ permission2Ids = append(permission2Ids, curPermission.ChartPermissionId)
|
|
|
permissionNames = append(permissionNames, curPermission.PermissionName)
|
|
|
}
|
|
|
permission1Ids = utils.Unique(permission1Ids)
|
|
@@ -288,8 +287,6 @@ func (this *UserAuthController) AddReportRecord() {
|
|
|
UserId: user.UserId,
|
|
|
ReportId: req.ReportId,
|
|
|
ReportTitle: req.ReportTitle,
|
|
|
- ChartPermissionId1: strings.Join(permission1Ids, ","),
|
|
|
- ChartPermissionId2: strings.Join(permission2Ids, ","),
|
|
|
ChartPermissionName: strings.Join(permissionNames, ","),
|
|
|
ClassifyId1: req.ClassifyIdFirst,
|
|
|
ClassifyName1: req.ClassifyNameFirst,
|
|
@@ -299,7 +296,39 @@ func (this *UserAuthController) AddReportRecord() {
|
|
|
CreateTime: curTime,
|
|
|
CreateDate: curTime.Format(utils.FormatDate),
|
|
|
}
|
|
|
- insertId, _ = userReadRecord.Insert()
|
|
|
+ insertId, err = userReadRecord.Insert()
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "添加阅读记录失败"
|
|
|
+ br.ErrMsg = "添加阅读记录失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ userReadPermission1 := make([]*models.UserReadPermission1, 0)
|
|
|
+ for _, id := range permission1Ids {
|
|
|
+ userReadPermission1 = append(userReadPermission1, &models.UserReadPermission1{
|
|
|
+ UserReadRecordId: int(insertId),
|
|
|
+ ChartPermissionId: id,
|
|
|
+ })
|
|
|
+ }
|
|
|
+ err = models.UserReadPermission1MultiInsert(userReadPermission1)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "添加阅读记录失败"
|
|
|
+ br.ErrMsg = "添加阅读记录失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ userReadPermission2 := make([]*models.UserReadPermission2, 0)
|
|
|
+ for _, id := range permission2Ids {
|
|
|
+ userReadPermission2 = append(userReadPermission2, &models.UserReadPermission2{
|
|
|
+ UserReadRecordId: int(insertId),
|
|
|
+ ChartPermissionId: id,
|
|
|
+ })
|
|
|
+ }
|
|
|
+ err = models.UserReadPermission2MultiInsert(userReadPermission2)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "添加阅读记录失败"
|
|
|
+ br.ErrMsg = "添加阅读记录失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
} else {
|
|
|
// 如果存在就计算停留时间
|
|
|
userRecord, err := models.GetUserReadRecordListById(req.RecordId)
|