Commit ce992d66 authored by zengxiaoli@yeah.net's avatar zengxiaoli@yeah.net

修改服务日期检索条件

parent ad25a77b
...@@ -67,6 +67,7 @@ ...@@ -67,6 +67,7 @@
decode( t.STATUS, '0', '未执行', '1', '执行中', '2', '已执行', '4', '已完成' ) AS status, decode( t.STATUS, '0', '未执行', '1', '执行中', '2', '已执行', '4', '已完成' ) AS status,
t.SRV_START_TIME sevStarTime, t.SRV_START_TIME sevStarTime,
t.SRV_END_TIME sevEndTime, t.SRV_END_TIME sevEndTime,
TO_char(t.SRV_DATE,'yyyy-MM-dd') sevrTime,
info.REAL_NAME realName info.REAL_NAME realName
FROM FROM
CH_SRV_TASK_DETAIL t CH_SRV_TASK_DETAIL t
...@@ -82,7 +83,7 @@ ...@@ -82,7 +83,7 @@
and t.STATUS = #{status} and t.STATUS = #{status}
</if> </if>
<if test="sevrTime != null and sevrTime != ''"> <if test="sevrTime != null and sevrTime != ''">
and (TO_char(t.SRV_START_TIME,'yyyy-MM-dd') = #{sevrTime} or TO_char(t.SRV_END_TIME,'yyyy-MM-dd') = #{sevrTime}) and TO_char(t.SRV_DATE,'yyyy-MM-dd') = #{sevrTime}
</if> </if>
order by t.TASK_DETAIL_ID desc order by t.TASK_DETAIL_ID desc
</select> </select>
...@@ -95,6 +96,7 @@ ...@@ -95,6 +96,7 @@
info.REAL_NAME realName, info.REAL_NAME realName,
t.SRV_START_TIME sevStarTime, t.SRV_START_TIME sevStarTime,
t.SRV_END_TIME sevEndTime, t.SRV_END_TIME sevEndTime,
TO_char(t.SRV_DATE,'yyyy-MM-dd') sevrTime,
decode( t.STATUS, '0', '未执行', '1', '执行中', '2', '已执行', '4', '已完成' ) AS status decode( t.STATUS, '0', '未执行', '1', '执行中', '2', '已执行', '4', '已完成' ) AS status
FROM FROM
CH_SRV_TASK_DETAIL t CH_SRV_TASK_DETAIL t
...@@ -110,7 +112,7 @@ ...@@ -110,7 +112,7 @@
and t.STATUS = #{status} and t.STATUS = #{status}
</if> </if>
<if test="sevrTime != null and sevrTime != ''"> <if test="sevrTime != null and sevrTime != ''">
and (TO_char(t.SRV_START_TIME,'yyyy-MM-dd') = #{sevrTime} or TO_char(t.SRV_END_TIME,'yyyy-MM-dd') = #{sevrTime}) and TO_char(t.SRV_DATE,'yyyy-MM-dd') = #{sevrTime}
</if> </if>
order by t.TASK_DETAIL_ID desc order by t.TASK_DETAIL_ID desc
</select> </select>
......
...@@ -29,7 +29,7 @@ public class ChSrvTaskDetail2Vo extends BaseReq { ...@@ -29,7 +29,7 @@ public class ChSrvTaskDetail2Vo extends BaseReq {
private String sevEndTime; private String sevEndTime;
@Excel(name = "失能人员姓名",width = 20) @Excel(name = "失能人员姓名",width = 20)
private String realName; private String realName;
@Excel(name = "服务日期",width = 40)
private String sevrTime; private String sevrTime;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment