Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
long-tern-care-service
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hubin
long-tern-care-service
Commits
ce992d66
Commit
ce992d66
authored
Apr 13, 2023
by
zengxiaoli@yeah.net
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改服务日期检索条件
parent
ad25a77b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
ChSrvTaskDetailMapper.xml
...rvice/src/main/resources/mapper/ChSrvTaskDetailMapper.xml
+4
-2
ChSrvTaskDetail2Vo.java
.../com/hungraim/ltc/pojo/vo/disable/ChSrvTaskDetail2Vo.java
+1
-1
No files found.
apply/apply-service/src/main/resources/mapper/ChSrvTaskDetailMapper.xml
View file @
ce992d66
...
...
@@ -67,6 +67,7 @@
decode( t.STATUS, '0', '未执行', '1', '执行中', '2', '已执行', '4', '已完成' ) AS status,
t.SRV_START_TIME sevStarTime,
t.SRV_END_TIME sevEndTime,
TO_char(t.SRV_DATE,'yyyy-MM-dd') sevrTime,
info.REAL_NAME realName
FROM
CH_SRV_TASK_DETAIL t
...
...
@@ -82,7 +83,7 @@
and t.STATUS = #{status}
</if>
<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>
order by t.TASK_DETAIL_ID desc
</select>
...
...
@@ -95,6 +96,7 @@
info.REAL_NAME realName,
t.SRV_START_TIME sevStarTime,
t.SRV_END_TIME sevEndTime,
TO_char(t.SRV_DATE,'yyyy-MM-dd') sevrTime,
decode( t.STATUS, '0', '未执行', '1', '执行中', '2', '已执行', '4', '已完成' ) AS status
FROM
CH_SRV_TASK_DETAIL t
...
...
@@ -110,7 +112,7 @@
and t.STATUS = #{status}
</if>
<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>
order by t.TASK_DETAIL_ID desc
</select>
...
...
common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/ChSrvTaskDetail2Vo.java
View file @
ce992d66
...
...
@@ -29,7 +29,7 @@ public class ChSrvTaskDetail2Vo extends BaseReq {
private
String
sevEndTime
;
@Excel
(
name
=
"失能人员姓名"
,
width
=
20
)
private
String
realName
;
@Excel
(
name
=
"服务日期"
,
width
=
40
)
private
String
sevrTime
;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment