Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
黄嘉阳
/
iot-platform-server
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
ec5efaa4
authored
Oct 20, 2023
by
huangjy
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix: 修复bug
parent
d343d99c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderServiceImpl.java
server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java
View file @
ec5efaa4
...
...
@@ -148,7 +148,7 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
.
like
(
StringUtils
.
isNotBlank
(
param
.
getDealUser
()),
PlatAlarmRecord:
:
getDealUser
,
param
.
getDealUser
())
.
ge
(
Objects
.
nonNull
(
param
.
getDealDateFrom
()),
PlatAlarmRecord:
:
getDealDate
,
param
.
getDealDateFrom
())
.
le
(
Objects
.
nonNull
(
param
.
getDealDateTo
()),
PlatAlarmRecord:
:
getDealDate
,
param
.
getDealDateTo
())
.
eq
(
CollectionUtils
.
isNotEmpty
(
orgIdList
),
PlatAlarmRecord:
:
getOrgId
,
orgIdList
)
.
in
(
CollectionUtils
.
isNotEmpty
(
orgIdList
),
PlatAlarmRecord:
:
getOrgId
,
orgIdList
)
.
apply
(
StringUtils
.
isNotBlank
(
param
.
getNotifyUser
()),
"find_in_set('"
+
param
.
getNotifyUser
()
+
"',notify_user)"
)
.
and
(
CollectionUtils
.
isNotEmpty
(
param
.
getElderIdList
()),
qw
->
{
List
<
String
>
elderIdList
=
param
.
getElderIdList
();
...
...
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderServiceImpl.java
View file @
ec5efaa4
...
...
@@ -120,7 +120,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
.
le
(
Objects
.
nonNull
(
dto
.
getCheckInEndTime
()),
PlatElder:
:
getCheckInTime
,
dto
.
getCheckInEndTime
())
.
ge
(
Objects
.
nonNull
(
dto
.
getCheckOutStartTime
()),
PlatElder:
:
getCheckOutTime
,
dto
.
getCheckOutStartTime
())
.
le
(
Objects
.
nonNull
(
dto
.
getCheckOutEndTime
()),
PlatElder:
:
getCheckOutTime
,
dto
.
getCheckOutEndTime
())
.
eq
(
CollectionUtils
.
isNotEmpty
(
orgIdList
),
PlatElder:
:
getOrgId
,
orgIdList
)
.
in
(
CollectionUtils
.
isNotEmpty
(
orgIdList
),
PlatElder:
:
getOrgId
,
orgIdList
)
.
like
(
StringUtils
.
isNotBlank
(
dto
.
getCertificateNumber
()),
PlatElder:
:
getCertificateNumber
,
dto
.
getCertificateNumber
())
.
apply
(
StringUtils
.
isNotBlank
(
dto
.
getSpaceId
()),
"find_in_set('"
+
dto
.
getSpaceId
()
+
"',space_path)"
)
.
apply
(
StringUtils
.
isNotBlank
(
dto
.
getOrgId
()),
"find_in_set('"
+
dto
.
getOrgId
()
+
"',org_path)"
)
...
...
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