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 diff --git a/src/main/resources/mybatis/datasource/bus/CorpPromisePeopleMapper.xml b/src/main/resources/mybatis/datasource/bus/CorpPromisePeopleMapper.xml index 7f80accf..96d63dc6 100644 --- a/src/main/resources/mybatis/datasource/bus/CorpPromisePeopleMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/CorpPromisePeopleMapper.xml @@ -219,6 +219,9 @@ and f.USER_ID = #{pd.USER_ID} + + and DATE(f.SIGNTIME) between DATE(#{pd.STARTTIME}) and DATE(#{pd.ENDTIME}) + AND f.ISPROMISE_PEOPLE = '0' ORDER BY f.SIGNTIME desc @@ -242,6 +245,9 @@ and f.PROMISE_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') AND f.ISPROMISE_PEOPLE = '0' + + and DATE(f.SIGNTIME) between DATE(#{pd.STARTTIME}) and DATE(#{pd.ENDTIME}) + ORDER BY f.SIGNTIME desc