|
@@ -184,16 +184,16 @@
|
|
|
itp.NAME AS resourceName,
|
|
|
itp.ID AS resourceId,
|
|
|
<if test="params.startDate !=null and params.startDate !='' and params.endDate !=null and params.endDate !=''">
|
|
|
- DATE_FORMAT(c.end_time, '%Y-%m-%d') AS time
|
|
|
+ DATE_FORMAT(c.start_time, '%Y-%m-%d') AS time
|
|
|
</if>
|
|
|
<if test="params.month !=null and params.month !=''">
|
|
|
- DATE_FORMAT(c.end_time, '%Y-%m') AS time
|
|
|
+ DATE_FORMAT(c.start_time, '%Y-%m') AS time
|
|
|
</if>
|
|
|
<if test="params.years !=null and params.years !=''">
|
|
|
- DATE_FORMAT(c.end_time, '%Y') AS time
|
|
|
+ DATE_FORMAT(c.start_time, '%Y') AS time
|
|
|
</if>
|
|
|
<if test="params.today !=null and params.today !=''">
|
|
|
- DATE_FORMAT(c.end_time, '%Y-%m-%d') AS time
|
|
|
+ DATE_FORMAT(c.start_time, '%Y-%m-%d') AS time
|
|
|
</if>
|
|
|
FROM
|
|
|
zuihou_base_yj_0000.imcs_z_zone a,
|
|
@@ -209,13 +209,13 @@
|
|
|
AND c.`status` = 3
|
|
|
AND c.procedure_no LIKE 'OP%0'
|
|
|
<if test="params.startDate !=null and params.startDate !='' and params.endDate !=null and params.endDate !=''">
|
|
|
- AND c.end_time BETWEEN #{params.startDate} and #{params.endDate}
|
|
|
+ AND c.start_time BETWEEN #{params.startDate} and #{params.endDate}
|
|
|
</if>
|
|
|
<if test="params.month !=null and params.month !=''">
|
|
|
- AND DATE_FORMAT(c.end_time, '%Y-%m') = #{params.month}
|
|
|
+ AND DATE_FORMAT(c.start_time, '%Y-%m') = #{params.month}
|
|
|
</if>
|
|
|
<if test="params.years !=null and params.years !=''">
|
|
|
- AND DATE_FORMAT(c.end_time, '%Y') = #{params.years}
|
|
|
+ AND DATE_FORMAT(c.start_time, '%Y') = #{params.years}
|
|
|
</if>
|
|
|
<if test="params.zoneId !=null and params.zoneId !=''">
|
|
|
AND a.id = #{params.zoneId}
|
|
@@ -224,7 +224,7 @@
|
|
|
AND itp.NAME like concat('%',#{params.resourceName},'%')
|
|
|
</if>
|
|
|
<if test="params.today !=null and params.today !=''">
|
|
|
- AND DATE_FORMAT(c.end_time, '%Y-%m-%d') = #{params.today}
|
|
|
+ AND DATE_FORMAT(c.start_time, '%Y-%m-%d') = #{params.today}
|
|
|
</if>
|
|
|
) t
|
|
|
GROUP BY
|
|
@@ -261,16 +261,16 @@
|
|
|
AND c.procedure_no LIKE 'OP%0'
|
|
|
AND a.id = #{params.zoneId} AND itp.id = #{params.resourceId}
|
|
|
<if test="params.startDate !=null and params.startDate !='' and params.endDate !=null and params.endDate !=''">
|
|
|
- AND c.end_time BETWEEN #{params.startDate} and #{params.endDate}
|
|
|
+ AND c.start_time BETWEEN #{params.startDate} and #{params.endDate}
|
|
|
</if>
|
|
|
<if test="params.month !=null and params.month !=''">
|
|
|
- AND DATE_FORMAT(c.end_time, '%Y-%m') = #{params.month}
|
|
|
+ AND DATE_FORMAT(c.start_time, '%Y-%m') = #{params.month}
|
|
|
</if>
|
|
|
<if test="params.years !=null and params.years !=''">
|
|
|
- AND DATE_FORMAT(c.end_time, '%Y') = #{params.years}
|
|
|
+ AND DATE_FORMAT(c.start_time, '%Y') = #{params.years}
|
|
|
</if>
|
|
|
<if test="params.today !=null and params.today !=''">
|
|
|
- AND DATE_FORMAT(c.end_time, '%Y-%m-%d') = #{params.today}
|
|
|
+ AND DATE_FORMAT(c.start_time, '%Y-%m-%d') = #{params.today}
|
|
|
</if>
|
|
|
</select>
|
|
|
</mapper>
|