Browse Source

Merge branch 'feature/tmr-group' of baishaojie/tmrgo into develop

xuyiping 1 year ago
parent
commit
92e3a87fd1
1 changed files with 1 additions and 1 deletions
  1. 1 1
      module/group.go

+ 1 - 1
module/group.go

@@ -115,7 +115,7 @@ func SprinkleProcessTimeList(pastureId int32, id int64) ([]*models.ProcessTimeLi
 	res := make([]*models.ProcessTimeList, 0)
 	sql := fmt.Sprintf(`SELECT IFNULL(TIMEDIFF (d1.intime,(SELECT MAX(intime) FROM downloadplandtl2 d2 
     WHERE  d1.pid=d2.pid AND d1.pastureid = d2.pastureid AND d2.intime<d1.intime)), IMEDIFF(intime,(SELECT MAX(intime) FROM downloadplandtl1_exec d2 
-	WHERE  d1.date=d2.date AND d1.pastureid = d2.pastureid AND d2.pid=d1.pid))) AS proess_time FROM downloadplandtl2 d1
+	WHERE  d1.date=d2.date AND d1.pastureid = d2.pastureid AND d2.pid=d1.pid))) AS process_time FROM downloadplandtl2 d1
 	WHERE d1.pastureid = %d AND pid =%d ORDER BY sort`, pastureId, id)
 	if err := restful.Engine.SQL(sql).Find(&res); err != nil {
 		return nil, err