Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
smart-office-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
smart-office-platform
Commits
1f14e124
Commit
1f14e124
authored
Jan 03, 2024
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改通知去重复
parent
2936dac6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
7 deletions
+14
-7
smart-office-manager/src/main/java/com/mortals/xhx/module/metting/service/impl/MettingRecordServiceImpl.java
...module/metting/service/impl/MettingRecordServiceImpl.java
+14
-7
No files found.
smart-office-manager/src/main/java/com/mortals/xhx/module/metting/service/impl/MettingRecordServiceImpl.java
View file @
1f14e124
package
com.mortals.xhx.module.metting.service.impl
;
package
com.mortals.xhx.module.metting.service.impl
;
import
cn.hutool.core.date.DateField
;
import
cn.hutool.core.date.*
;
import
cn.hutool.core.date.DateRange
;
import
cn.hutool.core.date.DateUnit
;
import
cn.hutool.core.date.DateUtil
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
com.mortals.framework.model.PageInfo
;
import
com.mortals.framework.model.PageInfo
;
import
com.mortals.xhx.common.code.MeetStatusEnum
;
import
com.mortals.xhx.common.code.MeetStatusEnum
;
...
@@ -80,11 +77,10 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
...
@@ -80,11 +77,10 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
//校验时间段是否有重合
//校验时间段是否有重合
boolean
bool
=
false
;
boolean
bool
=
false
;
for
(
MettingRecordEntity
mettingRecord
:
list
)
{
for
(
MettingRecordEntity
mettingRecord
:
list
)
{
Date
meetTimeStart1
=
mettingRecord
.
getMeetTimeStart
();
Date
meetTimeEnd1
=
mettingRecord
.
getMeetTimeEnd
();
//格式化分钟
//格式化分钟
Date
meetTimeStart1
=
DateUtil
.
parseDateTime
(
DateUtil
.
format
(
mettingRecord
.
getMeetTimeStart
(),
"yyyy-MM-dd HH:mm"
));
Date
meetTimeEnd1
=
DateUtil
.
parseDateTime
(
DateUtil
.
format
(
mettingRecord
.
getMeetTimeEnd
(),
"yyyy-MM-dd HH:mm"
));
// DateRange range1 = DateUtil.range(meetTimeStart, meetTimeEnd, DateField.MINUTE);
// DateRange range1 = DateUtil.range(meetTimeStart, meetTimeEnd, DateField.MINUTE);
Boolean
aBoolean
=
checkTimesHasOverlap
(
meetTimeStart
,
meetTimeEnd
,
meetTimeStart1
,
meetTimeEnd1
);
Boolean
aBoolean
=
checkTimesHasOverlap
(
meetTimeStart
,
meetTimeEnd
,
meetTimeStart1
,
meetTimeEnd1
);
if
(
aBoolean
)
{
if
(
aBoolean
)
{
...
@@ -215,6 +211,17 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
...
@@ -215,6 +211,17 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
}
}
public
static
void
main
(
String
[]
args
)
{
public
static
void
main
(
String
[]
args
)
{
DateTime
meetTimeStart
=
DateUtil
.
parseTime
(
"18:00:00"
);
DateTime
meetTimeEnd
=
DateUtil
.
parseTime
(
"18:00:00"
);
DateTime
meetTimeStart1
=
DateUtil
.
parseTime
(
"18:00:00"
);
DateTime
meetTimeEnd1
=
DateUtil
.
parseTime
(
"18:00:00"
);
/*
!(dynaEndTime.getTime() <= fixedStartTime.getTime() || dynaStartTime.getTime() >= fixedEndTime.getTime());
*/
Date
date
=
new
Date
();
Date
date
=
new
Date
();
String
format
=
DateUtil
.
format
(
new
Date
(),
"yyyy-MM-dd HH:mm"
);
String
format
=
DateUtil
.
format
(
new
Date
(),
"yyyy-MM-dd HH:mm"
);
/* DateUtil.parse(format).
/* DateUtil.parse(format).
...
...
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