allied-creation / performance · 提交

转到一个项目

作者 tangxvhui
提交 eef811918e50fb116172f844d5d4205b0541ea9d 1 个父辈 779880b2

更新

内嵌 并排对比
正在显示 3 个修改的文件 包含 34 行增加 和 10 行删除
@@ -191,7 +191,8 @@ func (srv *MessagePersonalService) TodayMessageTaskStageAnomaly(param *command.G @@ -191,7 +191,8 @@ func (srv *MessagePersonalService) TodayMessageTaskStageAnomaly(param *command.G
191 Content: s, 191 Content: s,
192 }) 192 })
193 payload := map[string]string{ 193 payload := map[string]string{
194 - "id": strconv.Itoa(val.Id), 194 + "id": strconv.Itoa(val.Id),
  195 + "taskName": val.Name,
195 } 196 }
196 payloadStr, _ := json.Marshal(payload) 197 payloadStr, _ := json.Marshal(payload)
197 newMessage := domain.MessagePersonal{ 198 newMessage := domain.MessagePersonal{
@@ -216,7 +217,8 @@ func (srv *MessagePersonalService) TodayMessageTaskStageAnomaly(param *command.G @@ -216,7 +217,8 @@ func (srv *MessagePersonalService) TodayMessageTaskStageAnomaly(param *command.G
216 Content: s, 217 Content: s,
217 }) 218 })
218 payload := map[string]string{ 219 payload := map[string]string{
219 - "id": strconv.Itoa(val.Id), 220 + "id": strconv.Itoa(val.Id),
  221 + "taskName": val.Name,
220 } 222 }
221 payloadStr, _ := json.Marshal(payload) 223 payloadStr, _ := json.Marshal(payload)
222 newMessage := domain.MessagePersonal{ 224 newMessage := domain.MessagePersonal{
@@ -241,7 +243,8 @@ func (srv *MessagePersonalService) TodayMessageTaskStageAnomaly(param *command.G @@ -241,7 +243,8 @@ func (srv *MessagePersonalService) TodayMessageTaskStageAnomaly(param *command.G
241 Content: s, 243 Content: s,
242 }) 244 })
243 payload := map[string]string{ 245 payload := map[string]string{
244 - "id": strconv.Itoa(val.Id), 246 + "id": strconv.Itoa(val.Id),
  247 + "taskName": val.Name,
245 } 248 }
246 payloadStr, _ := json.Marshal(payload) 249 payloadStr, _ := json.Marshal(payload)
247 newMessage := domain.MessagePersonal{ 250 newMessage := domain.MessagePersonal{
@@ -267,7 +270,8 @@ func (srv *MessagePersonalService) TodayMessageTaskStageAnomaly(param *command.G @@ -267,7 +270,8 @@ func (srv *MessagePersonalService) TodayMessageTaskStageAnomaly(param *command.G
267 Content: s, 270 Content: s,
268 }) 271 })
269 payload := map[string]string{ 272 payload := map[string]string{
270 - "id": strconv.Itoa(val.Id), 273 + "id": strconv.Itoa(val.Id),
  274 + "taskName": val.Name,
271 } 275 }
272 payloadStr, _ := json.Marshal(payload) 276 payloadStr, _ := json.Marshal(payload)
273 newMessage := domain.MessagePersonal{ 277 newMessage := domain.MessagePersonal{
@@ -382,7 +386,10 @@ func (srv *MessagePersonalService) TodayMessageTaskRecordAnomaly(param *command. @@ -382,7 +386,10 @@ func (srv *MessagePersonalService) TodayMessageTaskRecordAnomaly(param *command.
382 Content: s, 386 Content: s,
383 }) 387 })
384 payload := map[string]string{ 388 payload := map[string]string{
385 - "id": strconv.Itoa(val.Id), 389 + "id": strconv.Itoa(val.Id),
  390 + "taskName": val.Name,
  391 + "taskAlias": val.Alias,
  392 + "leaderName": val.LeaderName,
386 } 393 }
387 payloadStr, _ := json.Marshal(payload) 394 payloadStr, _ := json.Marshal(payload)
388 newMessage := domain.MessagePersonal{ 395 newMessage := domain.MessagePersonal{
@@ -407,7 +414,10 @@ func (srv *MessagePersonalService) TodayMessageTaskRecordAnomaly(param *command. @@ -407,7 +414,10 @@ func (srv *MessagePersonalService) TodayMessageTaskRecordAnomaly(param *command.
407 Content: s, 414 Content: s,
408 }) 415 })
409 payload := map[string]string{ 416 payload := map[string]string{
410 - "id": strconv.Itoa(val.Id), 417 + "id": strconv.Itoa(val.Id),
  418 + "taskName": val.Name,
  419 + "taskAlias": val.Alias,
  420 + "leaderName": val.LeaderName,
411 } 421 }
412 payloadStr, _ := json.Marshal(payload) 422 payloadStr, _ := json.Marshal(payload)
413 newMessage := domain.MessagePersonal{ 423 newMessage := domain.MessagePersonal{
@@ -432,7 +442,10 @@ func (srv *MessagePersonalService) TodayMessageTaskRecordAnomaly(param *command. @@ -432,7 +442,10 @@ func (srv *MessagePersonalService) TodayMessageTaskRecordAnomaly(param *command.
432 Content: s, 442 Content: s,
433 }) 443 })
434 payload := map[string]string{ 444 payload := map[string]string{
435 - "id": strconv.Itoa(val.Id), 445 + "id": strconv.Itoa(val.Id),
  446 + "taskName": val.Name,
  447 + "taskAlias": val.Alias,
  448 + "leaderName": val.LeaderName,
436 } 449 }
437 payloadStr, _ := json.Marshal(payload) 450 payloadStr, _ := json.Marshal(payload)
438 newMessage := domain.MessagePersonal{ 451 newMessage := domain.MessagePersonal{
@@ -386,9 +386,9 @@ func (d *TaskDao) IncreaseAnomaly(id []int, incr int) error { @@ -386,9 +386,9 @@ func (d *TaskDao) IncreaseAnomaly(id []int, incr int) error {
386 386
387 // TaskStageData 387 // TaskStageData
388 type TaskStageData struct { 388 type TaskStageData struct {
389 - Id int  
390 - Name string  
391 - LeaderName string 389 + Id int `pg:"id"`
  390 + Name string `pg:"name"`
  391 + LeaderName string `pg:"leader_name"`
392 } 392 }
393 393
394 // 根据负责人获取超期未完成的异常的里程碑任务 394 // 根据负责人获取超期未完成的异常的里程碑任务
@@ -3,6 +3,7 @@ package repository @@ -3,6 +3,7 @@ package repository
3 import ( 3 import (
4 "errors" 4 "errors"
5 "fmt" 5 "fmt"
  6 + "strconv"
6 "time" 7 "time"
7 8
8 "github.com/go-pg/pg/v10" 9 "github.com/go-pg/pg/v10"
@@ -135,6 +136,16 @@ func (repo *TaskRepository) Find(queryOptions map[string]interface{}) (int, []*d @@ -135,6 +136,16 @@ func (repo *TaskRepository) Find(queryOptions map[string]interface{}) (int, []*d
135 if val, ok := queryOptions["status"]; ok { 136 if val, ok := queryOptions["status"]; ok {
136 query.Where("task.status=?", val) 137 query.Where("task.status=?", val)
137 } 138 }
  139 + if val, ok := queryOptions["limit"]; ok {
  140 + if limit, err := strconv.Atoi(fmt.Sprintf("%v", val)); err == nil {
  141 + query.Limit(limit)
  142 + }
  143 + }
  144 + if val, ok := queryOptions["offset"]; ok {
  145 + if offset, err := strconv.Atoi(fmt.Sprintf("%v", val)); err == nil {
  146 + query.Offset(offset)
  147 + }
  148 + }
138 query.Order("id desc") 149 query.Order("id desc")
139 count, err := query.SelectAndCount() 150 count, err := query.SelectAndCount()
140 if err != nil { 151 if err != nil {