Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
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
项目统一框架
amos-boot-biz
Commits
7830f7ce
Commit
7830f7ce
authored
Apr 15, 2025
by
韩桐桐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BUGFIX
parent
f98d59ac
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
5 deletions
+2
-5
ESPlanTaskListDto.java
...com/yeejoin/amos/patrol/dao/entity/ESPlanTaskListDto.java
+1
-4
PlanTaskServiceImpl.java
...mos/patrol/business/service/impl/PlanTaskServiceImpl.java
+1
-1
No files found.
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-api/src/main/java/com/yeejoin/amos/patrol/dao/entity/ESPlanTaskListDto.java
View file @
7830f7ce
package
com
.
yeejoin
.
amos
.
patrol
.
dao
.
entity
;
package
com
.
yeejoin
.
amos
.
patrol
.
dao
.
entity
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.experimental.Accessors
;
import
lombok.experimental.Accessors
;
import
org.springframework.data.annotation.Id
;
import
org.springframework.data.annotation.Id
;
import
org.springframework.data.elasticsearch.annotations.DateFormat
;
import
org.springframework.data.elasticsearch.annotations.Document
;
import
org.springframework.data.elasticsearch.annotations.Document
;
import
org.springframework.data.elasticsearch.annotations.Field
;
import
org.springframework.data.elasticsearch.annotations.Field
;
import
org.springframework.data.elasticsearch.annotations.FieldType
;
import
org.springframework.data.elasticsearch.annotations.FieldType
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
/**
/**
...
@@ -94,7 +91,7 @@ public class ESPlanTaskListDto {
...
@@ -94,7 +91,7 @@ public class ESPlanTaskListDto {
private
String
omission
;
private
String
omission
;
@Field
(
type
=
FieldType
.
Object
)
@Field
(
type
=
FieldType
.
Object
)
private
List
points
;
private
List
<
PlanTaskDetail
>
points
;
}
}
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java
View file @
7830f7ce
...
@@ -599,7 +599,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
...
@@ -599,7 +599,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
*/
*/
private
void
handleEsPlanTaskListPointsByIds
(
List
<
String
>
taskDetailIds
,
List
<
String
>
taskIds
)
{
private
void
handleEsPlanTaskListPointsByIds
(
List
<
String
>
taskDetailIds
,
List
<
String
>
taskIds
)
{
taskIds
.
forEach
(
taskId
->
esPlanTaskList
.
findById
(
taskId
).
ifPresent
(
esPlanTaskListDto
->
{
taskIds
.
forEach
(
taskId
->
esPlanTaskList
.
findById
(
taskId
).
ifPresent
(
esPlanTaskListDto
->
{
List
<
PlanTaskDetail
>
points
=
(
List
<
PlanTaskDetail
>)
esPlanTaskListDto
.
getPoints
();
List
<
PlanTaskDetail
>
points
=
esPlanTaskListDto
.
getPoints
();
List
<
PlanTaskDetail
>
filterPoints
=
points
.
stream
().
filter
(
point
->
!
taskDetailIds
.
contains
(
Objects
.
toString
(
point
.
getId
()))).
collect
(
Collectors
.
toList
());
List
<
PlanTaskDetail
>
filterPoints
=
points
.
stream
().
filter
(
point
->
!
taskDetailIds
.
contains
(
Objects
.
toString
(
point
.
getId
()))).
collect
(
Collectors
.
toList
());
esPlanTaskList
.
deleteById
(
taskId
);
esPlanTaskList
.
deleteById
(
taskId
);
if
(!
filterPoints
.
isEmpty
())
{
if
(!
filterPoints
.
isEmpty
())
{
...
...
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