Browse Source

tmr: dashboard

Yi 1 year ago
parent
commit
51714378a5
2 changed files with 4 additions and 4 deletions
  1. 1 1
      module/group.go
  2. 3 3
      service/group/group.go

+ 1 - 1
module/group.go

@@ -114,7 +114,7 @@ func MixedProcessTimeList(pastureId int32, id int64) ([]*models.ProcessTimeList,
 func SprinkleProcessTimeList(pastureId int32, id int64) ([]*models.ProcessTimeList, error) {
 	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.pid=d2.pid AND d1.pastureid = d2.pastureid AND d2.intime<d1.intime)), TIMEDIFF(intime,(SELECT MAX(intime) FROM downloadplandtl1_exec d2 
 	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 {

+ 3 - 3
service/group/group.go

@@ -183,11 +183,11 @@ func ProcessAnalysisService(req *models.AnalysisAccuracyRequest) (*models.Proces
 		if err != nil {
 			zaplog.Error("ProcessAnalysisService", zap.Any("SprinkleProcessTimeList", err))
 		} else {
-			tmrSpinkleAllTime := 0
+			tmrSprinkleAllTime := 0
 			for _, s := range sprinkleProcessTimeList {
-				tmrSpinkleAllTime += util.TimeParseToMinutes(s.ProcessTime)
+				tmrSprinkleAllTime += util.TimeParseToMinutes(s.ProcessTime)
 			}
-			sprinkleFeedList = append(sprinkleFeedList, tmrSpinkleAllTime)
+			sprinkleFeedList = append(sprinkleFeedList, tmrSprinkleAllTime)
 		}
 
 	}