diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml index a441145bb4..810a972262 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml @@ -17,7 +17,10 @@ - AND PARTICIPATION = '1' + AND ( + ( FIRST_REGISTER = '1' AND REGISTER = '1' AND PARTICIPATION = '1' ) + OR ( FIRST_REGISTER = '0' AND REGISTER = '0' AND PARTICIPATION = '1' ) + ) @@ -52,7 +55,10 @@ - AND PARTICIPATION = '1' + AND ( + ( FIRST_REGISTER = '1' AND REGISTER = '1' AND PARTICIPATION = '1' ) + OR ( FIRST_REGISTER = '0' AND REGISTER = '0' AND PARTICIPATION = '1' ) + ) @@ -91,7 +97,10 @@ - AND PARTICIPATION = '1' + AND ( + ( FIRST_REGISTER = '1' AND REGISTER = '1' AND PARTICIPATION = '1' ) + OR ( FIRST_REGISTER = '0' AND REGISTER = '0' AND PARTICIPATION = '1' ) + ) @@ -131,7 +140,10 @@ - AND PARTICIPATION = '1' + AND ( + ( FIRST_REGISTER = '1' AND REGISTER = '1' AND PARTICIPATION = '1' ) + OR ( FIRST_REGISTER = '0' AND REGISTER = '0' AND PARTICIPATION = '1' ) + ) @@ -299,7 +311,10 @@ - AND PARTICIPATION = '1' + AND ( + ( FIRST_REGISTER = '1' AND REGISTER = '1' AND PARTICIPATION = '1' ) + OR ( FIRST_REGISTER = '0' AND REGISTER = '0' AND PARTICIPATION = '1' ) + ) @@ -332,7 +347,10 @@ - AND PARTICIPATION = '1' + AND ( + ( FIRST_REGISTER = '1' AND REGISTER = '1' AND PARTICIPATION = '1' ) + OR ( FIRST_REGISTER = '0' AND REGISTER = '0' AND PARTICIPATION = '1' ) + )