Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
cfld-liyeyun-admin
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
cfld-backend
cfld-liyeyun-admin
Commits
11399d0a
Commit
11399d0a
authored
Nov 15, 2023
by
yaobaizheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
//立业云后台提交
parent
5ffcd59e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
51 additions
and
26 deletions
+51
-26
DevelopmentInfoServiceImpl.java
...ruoyi/system/service/impl/DevelopmentInfoServiceImpl.java
+27
-17
ParkInfoServiceImpl.java
...va/com/ruoyi/system/service/impl/ParkInfoServiceImpl.java
+24
-9
No files found.
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DevelopmentInfoServiceImpl.java
View file @
11399d0a
package
com
.
ruoyi
.
system
.
service
.
impl
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
com.ruoyi.common.utils.DateUtils
;
import
com.ruoyi.system.domain.ParkInfo
;
...
...
@@ -71,27 +72,36 @@ public class DevelopmentInfoServiceImpl implements IDevelopmentInfoService {
if
(
status
.
equals
(
3
))
{
Long
mirrorId
=
developmentInfo
.
getMirrorId
();
if
(
mirrorId
!=
null
)
{
DevelopmentInfo
parkInfo1
=
new
DevelopmentInfo
();
parkInfo1
.
setMirrorId
(
mirrorId
);
List
<
DevelopmentInfo
>
parkInfos
=
developmentInfoMapper
.
selectDevelopmentInfoList
(
parkInfo1
);
DevelopmentInfo
developmentInfo1
=
developmentInfoMapper
.
selectDevelopmentInfoById
(
mirrorId
);
if
(
developmentInfo1
!=
null
){
BeanUtils
.
copyProperties
(
developmentInfo
,
developmentInfo1
);
developmentInfoMapper
.
updateDevelopmentInfo
(
developmentInfo1
);
//获取所有子数据
DevelopmentInfo
developmentInfo1
=
new
DevelopmentInfo
();
developmentInfo1
.
setMirrorId
(
mirrorId
);
List
<
DevelopmentInfo
>
developmentInfos
=
developmentInfoMapper
.
selectDevelopmentInfoList
(
developmentInfo1
);
//获取原始数据
DevelopmentInfo
developmentInfo2
=
developmentInfoMapper
.
selectDevelopmentInfoById
(
mirrorId
);
//获取自己的数据
List
<
DevelopmentInfo
>
myDevelopmentInfoList
=
developmentInfos
.
stream
().
filter
(
e
->
e
.
getId
().
equals
(
id
)).
collect
(
Collectors
.
toList
());
DevelopmentInfo
myDevelopmentInfo
=
myDevelopmentInfoList
.
get
(
0
);
myDevelopmentInfo
.
setStatus
(
status
);
//将自己的数据全部复制给原始数据
if
(
developmentInfo2
!=
null
)
{
BeanUtils
.
copyProperties
(
myDevelopmentInfo
,
developmentInfo2
,
"id"
);
developmentInfoMapper
.
updateDevelopmentInfo
(
myDevelopmentInfo
);
}
for
(
DevelopmentInfo
info
:
parkInfos
)
{
Long
id1
=
info
.
getId
();
if
(!
id
.
equals
(
id1
))
{
info
.
setStatus
(
9
);
developmentInfoMapper
.
updateDevelopmentInfo
(
info
);
}
//将其他不为草稿的数据置为作废(排除草稿)
developmentInfos
=
developmentInfos
.
stream
().
filter
(
e
->
!
e
.
getStatus
().
equals
(
1
)).
collect
(
Collectors
.
toList
());
for
(
DevelopmentInfo
info
:
developmentInfos
)
{
info
.
setStatus
(
9
);
developmentInfoMapper
.
updateDevelopmentInfo
(
info
);
}
//把该条子记录删除
developmentInfoMapper
.
deleteDevelopmentInfoById
(
id
);
}
//把该条子记录删除
developmentInfoMapper
.
deleteDevelopmentInfoById
(
id
);
}
else
{
developmentInfoMapper
.
updateDevelopmentInfo
(
developmentInfo
);
}
return
developmentInfoMapper
.
updateDevelopmentInfo
(
developmentInfo
);
return
1
;
}
/**
...
...
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ParkInfoServiceImpl.java
View file @
11399d0a
...
...
@@ -2,6 +2,8 @@ package com.ruoyi.system.service.impl;
import
java.util.List
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
import
java.util.stream.Stream
;
import
com.ruoyi.common.utils.DateUtils
;
import
com.ruoyi.system.domain.DevelopmentInfo
;
...
...
@@ -79,26 +81,39 @@ public class ParkInfoServiceImpl implements IParkInfoService {
if
(
status
.
equals
(
3
))
{
Long
mirrorId
=
parkInfo
.
getMirrorId
();
if
(
mirrorId
!=
null
)
{
//获取所有子数据
ParkInfo
parkInfo1
=
new
ParkInfo
();
parkInfo1
.
setMirrorId
(
mirrorId
);
List
<
ParkInfo
>
parkInfos
=
parkInfoMapper
.
selectParkInfoList
(
parkInfo1
);
//获取原始数据
ParkInfo
parkInfo2
=
parkInfoMapper
.
selectParkInfoById
(
mirrorId
);
//获取自己的数据
List
<
ParkInfo
>
myParkInfoList
=
parkInfos
.
stream
().
filter
(
e
->
e
.
getId
().
equals
(
id
)).
collect
(
Collectors
.
toList
());
ParkInfo
myParkInfo
=
myParkInfoList
.
get
(
0
);
myParkInfo
.
setStatus
(
status
);
//将自己的数据全部复制给原始数据
if
(
parkInfo2
!=
null
)
{
BeanUtils
.
copyProperties
(
parkInfo
,
parkInfo2
);
BeanUtils
.
copyProperties
(
myParkInfo
,
parkInfo2
,
"id"
);
parkInfoMapper
.
updateParkInfo
(
parkInfo2
);
}
//将其他不为草稿的数据置为作废(排除草稿)
parkInfos
=
parkInfos
.
stream
().
filter
(
e
->
!
e
.
getStatus
().
equals
(
1
)).
collect
(
Collectors
.
toList
());
for
(
ParkInfo
info
:
parkInfos
)
{
Long
id1
=
info
.
getId
();
if
(!
id
.
equals
(
id1
))
{
info
.
setStatus
(
9
);
parkInfoMapper
.
updateParkInfo
(
info
);
}
info
.
setStatus
(
9
);
parkInfoMapper
.
updateParkInfo
(
info
);
}
//把该条子记录删除
parkInfoMapper
.
deleteParkInfoById
(
id
);
}
else
{
parkInfoMapper
.
updateParkInfo
(
parkInfo
);
}
//把该条子记录删除
parkInfoMapper
.
deleteParkInfoById
(
id
);
}
else
{
parkInfoMapper
.
updateParkInfo
(
parkInfo
);
}
return
parkInfoMapper
.
updateParkInfo
(
parkInfo
)
;
return
1
;
}
public
int
updateOtherUserParkInfo
(
Map
<
String
,
Long
>
map
)
{
...
...
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