diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenIndexDataDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenIndexDataDao.xml index 8460c89..2c43ab7 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenIndexDataDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenIndexDataDao.xml @@ -507,9 +507,9 @@ d.id as agencyId, CASE WHEN d.TYPE_KEY = 'street_party' THEN 0 ELSE PID END AS parentId, - DATE_FORMAT(STR_TO_DATE('2021-11', '%Y'),'%Y') AS yearId, - CONCAT(DATE_FORMAT(STR_TO_DATE('2021-11', '%Y'), '%Y'), 'Q', QUARTER(STR_TO_DATE('2021-11', '%Y-%m-%d'))) quarterId, - DATE_FORMAT(STR_TO_DATE('2021-11', '%Y-%m'),'%Y%m') AS monthId, + DATE_FORMAT(STR_TO_DATE(#{yearMonth, jdbcType=VARCHAR}, '%Y'),'%Y') AS yearId, + CONCAT(DATE_FORMAT(STR_TO_DATE(#{yearMonth, jdbcType=VARCHAR}, '%Y'), '%Y'), 'Q', QUARTER(STR_TO_DATE(#{yearMonth, jdbcType=VARCHAR}, '%Y-%m-%d'))) quarterId, + DATE_FORMAT(STR_TO_DATE(#{yearMonth, jdbcType=VARCHAR}, '%Y-%m'),'%Y%m') AS monthId, CASE d.TYPE_KEY WHEN 'community_party' THEN 'community' WHEN 'street_party' THEN 'street' WHEN 'district_party' THEN 'district' END as dataType, 0.0000 AS overdueProjectRatio, 0 AS overdueProjectRatioFz, @@ -552,7 +552,7 @@ LEFT JOIN `esua_epdc_events`.`epdc_item` ei on ei.`ID` = eihp.`ITEM_ID` WHERE eihp.`DEL_FLAG`= '0' AND eihp.`STATE`= 10 - AND date_format(eihp.CREATED_TIME, '%Y-%m') = '2021-11' GROUP BY eihp.`ITEM_ID`) t1 GROUP BY t1.HANDLER_DEPT_ID) tmp1) tm1 on tm1.HANDLER_DEPT_ID = d.`id` + AND date_format(eihp.CREATED_TIME, '%Y-%m') = #{yearMonth, jdbcType=VARCHAR} GROUP BY eihp.`ITEM_ID`) t1 GROUP BY t1.HANDLER_DEPT_ID) tmp1) tm1 on tm1.HANDLER_DEPT_ID = d.`id` LEFT JOIN (SELECT tmp2.DEPT_ID, @@ -568,7 +568,7 @@ WHERE eid.`DEL_FLAG`= '0' AND ei.`DEL_FLAG`= '0' AND eid.`CREATED_TIME` ]]> ei.`CREATED_TIME` - AND date_format(eid.CREATED_TIME, '%Y-%m') = '2021-11' GROUP BY eid.`DEPT_ID`, eid.`ITEM_ID`) t2 GROUP BY t2.DEPT_ID) tmp2) tm2 on tm2.DEPT_ID = d.`id` + AND date_format(eid.CREATED_TIME, '%Y-%m') = #{yearMonth, jdbcType=VARCHAR} GROUP BY eid.`DEPT_ID`, eid.`ITEM_ID`) t2 GROUP BY t2.DEPT_ID) tmp2) tm2 on tm2.DEPT_ID = d.`id` LEFT JOIN (SELECT ttt.DEPT_ID, SUM(TIMESTAMPDIFF(MINUTE,ttt.timeToBeWhistled, ttt.earliestResponseTime)) AS respProject FROM (SELECT @@ -583,7 +583,7 @@ WHERE eid.`DEL_FLAG`= '0' AND ei.`DEL_FLAG`= '0' AND eid.`CREATED_TIME` ]]> ei.`CREATED_TIME` - AND date_format(eid.CREATED_TIME, '%Y-%m') = '2021-11' GROUP BY eid.`DEPT_ID`, eid.`ITEM_ID`) tt + AND date_format(eid.CREATED_TIME, '%Y-%m') = #{yearMonth, jdbcType=VARCHAR} GROUP BY eid.`DEPT_ID`, eid.`ITEM_ID`) tt LEFT JOIN `esua_epdc_events`.epdc_item_handle_process tmphp ON tmphp.ITEM_ID = tt.ITEM_ID AND tmphp.HANDLER_DEPT_ID = tt.DEPT_ID AND tmphp.CREATED_TIME > tt.CREATED_TIME