|
@@ -407,11 +407,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
]]>
|
|
|
</if>
|
|
|
<if test="serviceCompleteStartTime != null ">
|
|
|
- AND a.service_start_time >= #{serviceStartTime}
|
|
|
+ AND a.service_end_time >= #{serviceCompleteStartTime}
|
|
|
</if>
|
|
|
<if test="serviceCompleteEndTime != null">
|
|
|
<![CDATA[
|
|
|
- AND a.work_end_time <= #{serviceEndTime}
|
|
|
+ AND a.service_end_time <= #{serviceCompleteEndTime}
|
|
|
]]>
|
|
|
</if>
|
|
|
<if test="areaSettlementStatus != null and areaSettlementStatus != ''">
|