diff --git a/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml index 45bdb342..14e92450 100644 --- a/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml @@ -204,13 +204,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - and t4.work_time between date_format(#{lastWorkUpdateTimeStart}, '%Y-%m-%d 00:00:00') and date_format(#{lastWorkUpdateTimeEnd}, '%Y-%m-%d 23:59:59') + and ifnull(t4.work_time,t1.update_time) between date_format(#{lastWorkUpdateTimeStart}, '%Y-%m-%d 00:00:00') and date_format(#{lastWorkUpdateTimeEnd}, '%Y-%m-%d 23:59:59') - and t4.work_time = ]]> date_format(#{lastWorkUpdateTimeStart}, '%Y-%m-%d 00:00:00') + and ifnull(t4.work_time,t1.update_time) = ]]> date_format(#{lastWorkUpdateTimeStart}, '%Y-%m-%d 00:00:00') - and t4.work_time date_format(#{lastWorkUpdateTimeEnd}, '%Y-%m-%d 23:59:59') + and ifnull(t4.work_time,t1.update_time) date_format(#{lastWorkUpdateTimeEnd}, '%Y-%m-%d 23:59:59')