diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 8df26410..dd259ac5 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -2,11 +2,11 @@ spring.application.name=qa-prevention-gwj server.port=8091 #?? -spring.profiles.active=me +#spring.profiles.active=local #����31ʱʹ�� #spring.profiles.active=dev #?? -#spring.profiles.active=master +spring.profiles.active=master diff --git a/src/main/resources/mybatis/datasource/bus/CorpPromiseMapper.xml b/src/main/resources/mybatis/datasource/bus/CorpPromiseMapper.xml index be998e9e..369afaba 100644 --- a/src/main/resources/mybatis/datasource/bus/CorpPromiseMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/CorpPromiseMapper.xml @@ -133,6 +133,9 @@ and dept.DEPARTMENT_ID = #{pd.DEPARTMENT_ID} + + and DATE(f.CREATTIME) between DATE(#{pd.ADDSTART}) and DATE(#{pd.ADDEND}) + and dept.`NAME` is not null GROUP BY f.PROMISE_ID