|
|
@@ -164,7 +164,7 @@ LEFT JOIN (SELECT b.Month,a.CatalogComp from (select extract(month from CreateO
|
|
|
RIGHT JOIN OilCountMonth b ON b.Month = a.time) CatalogComp ON AnnualAudit.Month = CatalogComp.Month
|
|
|
LEFT JOIN (SELECT b.Month,a.CatalogSpe from (select extract(month from CreateOn) time ,COUNT(*) CatalogSpe
|
|
|
from OilCatalog
|
|
|
- WHERE CreateOn >= '` + where +`' AND CreateOn < '` + timedone +`' AND CatalogType=4
|
|
|
+ WHERE CreateOn >= '` + where +`' AND CreateOn < '` + timedone +`' AND CatalogType=5
|
|
|
group by extract(month from CreateOn)) a
|
|
|
RIGHT JOIN OilCountMonth b ON b.Month = a.time) CatalogSpe ON AnnualAudit.Month = CatalogSpe.Month ORDER BY AnnualAudit.Month) `
|
|
|
|