|
@@ -435,7 +435,9 @@
|
|
select count(*) label_1 from centerevent_t_eventcatalogue
|
|
select count(*) label_1 from centerevent_t_eventcatalogue
|
|
where event_status_value in
|
|
where event_status_value in
|
|
('forest_event_status_7','forest_event_status_2','forest_event_status_5','forest_event_status_6' )
|
|
('forest_event_status_7','forest_event_status_2','forest_event_status_5','forest_event_status_6' )
|
|
- and YEARWEEK( create_time ) = YEARWEEK( CURDATE() )
|
|
|
|
|
|
+ <if test="day != null and day != ''">
|
|
|
|
+ and DATE_FORMAT(create_time,'%Y-%m-%d') = #{day}
|
|
|
|
+ </if>
|
|
<if test="createBy != null and createBy != ''">
|
|
<if test="createBy != null and createBy != ''">
|
|
and create_by in ( ${createBy} )
|
|
and create_by in ( ${createBy} )
|
|
</if>
|
|
</if>
|
|
@@ -444,7 +446,10 @@
|
|
'1206','1207' )) label_4
|
|
'1206','1207' )) label_4
|
|
from (
|
|
from (
|
|
select event_type_xl from centerevent_t_eventcatalogue
|
|
select event_type_xl from centerevent_t_eventcatalogue
|
|
- where YEARWEEK( create_time ) = YEARWEEK( CURDATE() )
|
|
|
|
|
|
+ where 1=1
|
|
|
|
+ <if test="day != null and day != ''">
|
|
|
|
+ and DATE_FORMAT(create_time,'%Y-%m-%d') = #{day}
|
|
|
|
+ </if>
|
|
<if test="deptId != null and deptId != ''">
|
|
<if test="deptId != null and deptId != ''">
|
|
and create_by = #{deptId}
|
|
and create_by = #{deptId}
|
|
</if>
|
|
</if>
|