|
@@ -616,10 +616,10 @@
|
|
|
and t.community_id= #{communityId}
|
|
and t.community_id= #{communityId}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="startTime !=null and startTime != ''">
|
|
<if test="startTime !=null and startTime != ''">
|
|
|
- and t.create_time >= #{startTime}
|
|
|
|
|
|
|
+ and pfc.start_time >= #{startTime}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="endTime !=null and endTime != ''">
|
|
<if test="endTime !=null and endTime != ''">
|
|
|
- and t.create_time <= #{endTime}
|
|
|
|
|
|
|
+ and pfc.start_time <= #{endTime}
|
|
|
</if>
|
|
</if>
|
|
|
group by t.config_id,t.fee_name,pfc.start_time
|
|
group by t.config_id,t.fee_name,pfc.start_time
|
|
|
) t
|
|
) t
|
|
@@ -676,10 +676,10 @@
|
|
|
and t.community_id= #{communityId}
|
|
and t.community_id= #{communityId}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="startTime !=null and startTime != ''">
|
|
<if test="startTime !=null and startTime != ''">
|
|
|
- and t.create_time >= #{startTime}
|
|
|
|
|
|
|
+ and pfc.start_time >= #{startTime}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="endTime !=null and endTime != ''">
|
|
<if test="endTime !=null and endTime != ''">
|
|
|
- and t.create_time <= #{endTime}
|
|
|
|
|
|
|
+ and pfc.start_time <= #{endTime}
|
|
|
</if>
|
|
</if>
|
|
|
group by t.config_id,t.fee_name,pfc.start_time
|
|
group by t.config_id,t.fee_name,pfc.start_time
|
|
|
order by t.create_time desc
|
|
order by t.create_time desc
|
|
@@ -738,10 +738,10 @@
|
|
|
and t.community_id= #{communityId}
|
|
and t.community_id= #{communityId}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="startTime !=null and startTime != ''">
|
|
<if test="startTime !=null and startTime != ''">
|
|
|
- and t.create_time >= #{startTime}
|
|
|
|
|
|
|
+ and pfc.start_time >= #{startTime}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="endTime !=null and endTime != ''">
|
|
<if test="endTime !=null and endTime != ''">
|
|
|
- and t.create_time <= #{endTime}
|
|
|
|
|
|
|
+ and pfc.start_time <= #{endTime}
|
|
|
</if>
|
|
</if>
|
|
|
order by t.create_time desc
|
|
order by t.create_time desc
|
|
|
</select>
|
|
</select>
|
|
@@ -1385,10 +1385,10 @@
|
|
|
and t.community_id= #{communityId}
|
|
and t.community_id= #{communityId}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="startTime !=null and startTime != ''">
|
|
<if test="startTime !=null and startTime != ''">
|
|
|
- and t.create_time >= #{startTime}
|
|
|
|
|
|
|
+ and t.deadline_time >= #{startTime}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="endTime !=null and endTime != ''">
|
|
<if test="endTime !=null and endTime != ''">
|
|
|
- and t.create_time <= #{endTime}
|
|
|
|
|
|
|
+ and t.deadline_time <= #{endTime}
|
|
|
</if>
|
|
</if>
|
|
|
) t
|
|
) t
|
|
|
</select>
|
|
</select>
|
|
@@ -1471,10 +1471,10 @@
|
|
|
and t.community_id= #{communityId}
|
|
and t.community_id= #{communityId}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="startTime !=null and startTime != ''">
|
|
<if test="startTime !=null and startTime != ''">
|
|
|
- and t.create_time >= #{startTime}
|
|
|
|
|
|
|
+ and t.end_time >= #{startTime}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="endTime !=null and endTime != ''">
|
|
<if test="endTime !=null and endTime != ''">
|
|
|
- and t.create_time <= #{endTime}
|
|
|
|
|
|
|
+ and t.end_time <= #{endTime}
|
|
|
</if>
|
|
</if>
|
|
|
) t
|
|
) t
|
|
|
</select>
|
|
</select>
|
|
@@ -2198,7 +2198,7 @@
|
|
|
select t.floor_num
|
|
select t.floor_num
|
|
|
from f_floor t
|
|
from f_floor t
|
|
|
where 1=1
|
|
where 1=1
|
|
|
- and t.community_id= #{communityId}
|
|
|
|
|
|
|
+ and t.community_id= #{communityId}
|
|
|
GROUP BY t.floor_num
|
|
GROUP BY t.floor_num
|
|
|
) tt
|
|
) tt
|
|
|
</select>
|
|
</select>
|