|
@@ -1196,6 +1196,19 @@ func (this *CompanyUserController) List() {
|
|
|
//}*/
|
|
|
|
|
|
list[i].ViewTotal = list[i].FiccViewTotal + list[i].RaiViewTotal
|
|
|
+ var tmpLastViewTime time.Time
|
|
|
+ tmpLastViewTime = list[i].FiccLastViewTime
|
|
|
+
|
|
|
+ if !list[i].RaiLastViewTime.IsZero() {
|
|
|
+ if tmpLastViewTime.IsZero() || list[i].RaiLastViewTime.After(tmpLastViewTime) {
|
|
|
+ tmpLastViewTime = list[i].RaiLastViewTime
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ list[i].LastViewTime = tmpLastViewTime
|
|
|
+ if !tmpLastViewTime.IsZero() {
|
|
|
+ list[i].LastViewTimeStr = tmpLastViewTime.Format(utils.FormatDateTime)
|
|
|
+ }
|
|
|
|
|
|
//如果有绑定数据,那么将数据返回对应的注册绑定数据
|
|
|
if _, ok := userRecordRegisterMap[int(item.UserId)]; ok {
|
|
@@ -2988,7 +3001,7 @@ func (this *CompanyUserController) ViewReportList() {
|
|
|
case 1:
|
|
|
baseCondition += ` AND source = ? `
|
|
|
basePars = append(basePars, 4)
|
|
|
-
|
|
|
+
|
|
|
total = item.RaiViewTotal
|
|
|
if lastViewTimeT.IsZero() {
|
|
|
if item.RaiLastViewTime != `` && item.RaiLastViewTime != `0000-00-00 00:00:00` {
|