|
@@ -663,7 +663,7 @@
|
|
|
and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0
|
|
|
and apoom.PLANPRODROLLNUM>0
|
|
|
and apope.PLANENDDATE between DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 11 MONTH), '%Y-%m-01') and CURRENT_DATE -- 近12个月计划
|
|
|
- and apro.TENANTID=#TENANTID
|
|
|
+ and apro.TENANTID=#{tenantId}
|
|
|
group by
|
|
|
month_year
|
|
|
),
|
|
@@ -690,7 +690,7 @@
|
|
|
and aro.QUALIFIED='是'
|
|
|
and apoom.PLANPRODROLLNUM>0
|
|
|
and apope.ACTUALFINISHDATE between DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 11 MONTH), '%Y-%m-01') and CURRENT_DATE -- 近12个月计划
|
|
|
- and apro.TENANTID=#TENANTID
|
|
|
+ and apro.TENANTID=#{tenantId}
|
|
|
group by
|
|
|
month_year
|
|
|
)
|