Merge branch 'test' of http://gitlab.fjmaimaimai.com/allied-creation/performance into test
正在显示
1 个修改的文件
包含
5 行增加
和
3 行删除
@@ -90,7 +90,8 @@ func compareTask(u *domain.UserAuth, srcTask *domain.Task, newTask *domain.Task) | @@ -90,7 +90,8 @@ func compareTask(u *domain.UserAuth, srcTask *domain.Task, newTask *domain.Task) | ||
90 | if newTask.EndTime == 0 { | 90 | if newTask.EndTime == 0 { |
91 | logOpt.OptValue = "未设置时间" | 91 | logOpt.OptValue = "未设置时间" |
92 | } else { | 92 | } else { |
93 | - logOpt.OptValue = time.Unix(newTask.EndTime, 0).Local().Format("2006-01-02 15:04:05") | 93 | + logOpt.OptValue = time.Unix(newTask.EndTime, 0).Local().Format("2006-01-02") |
94 | + //logOpt.OptValue = time.Unix(newTask.EndTime, 0).Local().Format("2006-01-02 15:04:05") | ||
94 | } | 95 | } |
95 | logArray = append(logArray, logOpt) | 96 | logArray = append(logArray, logOpt) |
96 | } | 97 | } |
@@ -123,7 +124,7 @@ func compareTask(u *domain.UserAuth, srcTask *domain.Task, newTask *domain.Task) | @@ -123,7 +124,7 @@ func compareTask(u *domain.UserAuth, srcTask *domain.Task, newTask *domain.Task) | ||
123 | if srcTask.AssistFlagMax != newTask.AssistFlagMax { | 124 | if srcTask.AssistFlagMax != newTask.AssistFlagMax { |
124 | logOpt := createdLogOpt(u, taskId) | 125 | logOpt := createdLogOpt(u, taskId) |
125 | logOpt.OptField = "修改了上级辅导时间" | 126 | logOpt.OptField = "修改了上级辅导时间" |
126 | - logOpt.OptValue = strconv.Itoa(newTask.AssistFlagMax) | 127 | + logOpt.OptValue = strconv.Itoa(newTask.AssistFlagMax) + "天" |
127 | logArray = append(logArray, logOpt) | 128 | logArray = append(logArray, logOpt) |
128 | } | 129 | } |
129 | 130 | ||
@@ -209,7 +210,8 @@ func compareStage(u *domain.UserAuth, id int, srcStage []*domain.TaskStage, newS | @@ -209,7 +210,8 @@ func compareStage(u *domain.UserAuth, id int, srcStage []*domain.TaskStage, newS | ||
209 | if it.PlanCompletedAt == 0 { | 210 | if it.PlanCompletedAt == 0 { |
210 | logOpt.OptValue = "未设置时间" | 211 | logOpt.OptValue = "未设置时间" |
211 | } else { | 212 | } else { |
212 | - logOpt.OptValue = time.Unix(it.PlanCompletedAt, 0).Local().Format("2006-01-02 15:04:05") | 213 | + logOpt.OptValue = time.Unix(it.PlanCompletedAt, 0).Local().Format("2006-01-02") |
214 | + //logOpt.OptValue = time.Unix(it.PlanCompletedAt, 0).Local().Format("2006-01-02 15:04:05") | ||
213 | } | 215 | } |
214 | logArray = append(logArray, logOpt) | 216 | logArray = append(logArray, logOpt) |
215 | } | 217 | } |
-
请 注册 或 登录 后发表评论