|
@@ -100,7 +100,7 @@ func SprinkleFodderData(req *models.AnalysisAccuracyRequest) ([]*models.Sprinkle
|
|
|
FROM downloadplandtl2 de
|
|
|
JOIN downloadedplan d ON d.id=de.pid AND d.pastureid = de.pastureid
|
|
|
LEFT JOIN feedtemplet f ON f.id = d.tempid
|
|
|
- WHERE de.pastureid = %d AND DATE(de.date) BETWEEN '%s' AND '%s' %s GROUP BY de.date`, req.PastureId, req.StartDate, req.EndDate, whereFeedFormulaIdStr)
|
|
|
+ WHERE de.pastureid = %d AND DATE(de.date) BETWEEN '%s' AND '%s' %s and type = 0 and d.lpplantype IN (0,2) GROUP BY de.date`, req.PastureId, req.StartDate, req.EndDate, whereFeedFormulaIdStr)
|
|
|
if err := restful.Engine.SQL(sql).Find(&res); err != nil {
|
|
|
return nil, err
|
|
|
}
|