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
8cdf2ef8
authored
Nov 06, 2023
by
huangjy
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix:子女端登陆绑定长者逻辑修改
parent
6a8033c9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderChildrenInfoServiceImpl.java
server-service/src/main/java/com/makeit/vo/wechat/elder/PlatElderChildrenInfoWechatVO.java
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderChildrenInfoServiceImpl.java
View file @
8cdf2ef8
...
@@ -196,10 +196,7 @@ public class PlatElderChildrenInfoServiceImpl extends ServiceImpl<PlatElderChild
...
@@ -196,10 +196,7 @@ public class PlatElderChildrenInfoServiceImpl extends ServiceImpl<PlatElderChild
List
<
PlatElderChildrenInfoWechatVO
>
voList
=
Lists
.
newArrayList
();
List
<
PlatElderChildrenInfoWechatVO
>
voList
=
Lists
.
newArrayList
();
for
(
PlatElderChildrenInfo
platElderChildrenInfo
:
platElderChildrenInfoList
)
{
for
(
PlatElderChildrenInfo
platElderChildrenInfo
:
platElderChildrenInfoList
)
{
PlatElderChildrenInfoWechatVO
vo
=
BeanDtoVoUtils
.
convert
(
platElderChildrenInfo
,
PlatElderChildrenInfoWechatVO
.
class
);
PlatElderChildrenInfoWechatVO
vo
=
BeanDtoVoUtils
.
convert
(
platElderChildrenInfo
,
PlatElderChildrenInfoWechatVO
.
class
);
PlatElder
platElder
=
elderMap
.
get
(
platElderChildrenInfo
.
getElderId
());
vo
.
setPlatElder
(
elderMap
.
getOrDefault
(
platElderChildrenInfo
.
getElderId
(),
new
PlatElder
()));
if
(
platElder
!=
null
)
{
vo
.
setElderName
(
platElder
.
getName
());
}
voList
.
add
(
vo
);
voList
.
add
(
vo
);
}
}
...
...
server-service/src/main/java/com/makeit/vo/wechat/elder/PlatElderChildrenInfoWechatVO.java
View file @
8cdf2ef8
package
com
.
makeit
.
vo
.
wechat
.
elder
;
package
com
.
makeit
.
vo
.
wechat
.
elder
;
import
com.makeit.common.dto.BaseTenantDTO
;
import
com.makeit.common.dto.BaseTenantDTO
;
import
com.makeit.entity.platform.elder.PlatElder
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
...
@@ -21,8 +22,8 @@ public class PlatElderChildrenInfoWechatVO extends BaseTenantDTO {
...
@@ -21,8 +22,8 @@ public class PlatElderChildrenInfoWechatVO extends BaseTenantDTO {
@ApiModelProperty
(
value
=
"长者id"
)
@ApiModelProperty
(
value
=
"长者id"
)
private
String
elderId
;
private
String
elderId
;
@ApiModelProperty
(
value
=
"长者
名称
"
)
@ApiModelProperty
(
value
=
"长者
信息
"
)
private
String
elderName
;
private
PlatElder
platElder
;
@ApiModelProperty
(
value
=
"姓名"
)
@ApiModelProperty
(
value
=
"姓名"
)
private
String
name
;
private
String
name
;
...
...
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