diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml index dce166ad17..9cde166e58 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml @@ -299,8 +299,11 @@ - - AND sdd1.EVENT_STATUS_CODE = #{status} + + AND sdd1.EVENT_STATUS_CODE in('pending','0') + + + AND sdd1.EVENT_STATUS_CODE in('closed','10','5') union select sca.AREA_CODE,sdd2.* from screen_difficulty_data sdd2 @@ -322,8 +325,11 @@ - - AND sdd2.EVENT_STATUS_CODE = #{status} + + AND sdd2.EVENT_STATUS_CODE in('pending','0') + + + AND sdd2.EVENT_STATUS_CODE in('closed','10','5') ) diff ORDER BY