diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenGridManagerDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenGridManagerDao.xml index 4076016..94554b9 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenGridManagerDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenGridManagerDao.xml @@ -169,7 +169,7 @@ 'W', WEEK(STR_TO_DATE(DATE_FORMAT(#{yearMonthDay}, '%Y-%m-%d'), '%Y-%m-%d'))) weekId, DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(#{yearMonthDay}, '%Y-%m-%d'), '%Y'), '%Y') AS yearId, - CONCAT(DATE_FORMAScreenBaseReportDataFormDTOT(STR_TO_DATE(DATE_FORMAT(#{yearMonthDay}, '%Y-%m-%d'), '%Y'), '%Y'), + CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(#{yearMonthDay}, '%Y-%m-%d'), '%Y'), '%Y'), 'Q', QUARTER(STR_TO_DATE(DATE_FORMAT(#{yearMonthDay}, '%Y-%m-%d'), '%Y-%m-%d'))) quarterId,