Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
邬吉朋
relation
Commits
076cf80f
Commit
076cf80f
authored
Aug 12, 2025
by
zhuxiang
Browse files
Merge remote-tracking branch 'origin/dev' into dev
parents
9ca4f4a2
b2c54c4e
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/main/java/com/platform/service/impl/UserServiceImpl.java
View file @
076cf80f
...
@@ -2,6 +2,7 @@ package com.platform.service.impl;
...
@@ -2,6 +2,7 @@ package com.platform.service.impl;
import
cn.hutool.core.collection.CollUtil
;
import
cn.hutool.core.collection.CollUtil
;
import
cn.hutool.core.map.MapUtil
;
import
cn.hutool.core.map.MapUtil
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.github.pagehelper.PageHelper
;
import
com.github.pagehelper.PageHelper
;
...
@@ -26,6 +27,7 @@ import com.platform.service.UserRelationService;
...
@@ -26,6 +27,7 @@ import com.platform.service.UserRelationService;
import
com.platform.service.UserService
;
import
com.platform.service.UserService
;
import
com.platform.utils.DozerUtils
;
import
com.platform.utils.DozerUtils
;
import
com.platform.utils.IdCardUtils
;
import
com.platform.utils.IdCardUtils
;
import
org.checkerframework.checker.nullness.qual.Nullable
;
import
org.jetbrains.annotations.NotNull
;
import
org.jetbrains.annotations.NotNull
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
...
@@ -197,23 +199,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme
...
@@ -197,23 +199,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme
public
Boolean
add
(
UserDTO
userDTO
)
{
public
Boolean
add
(
UserDTO
userDTO
)
{
//解析身份证号
//解析身份证号
Map
<
String
,
String
>
idCardInfo
=
IdCardUtils
.
parseIdCardInfo
(
userDTO
.
getIdCard
());
Map
<
String
,
String
>
idCardInfo
=
IdCardUtils
.
parseIdCardInfo
(
userDTO
.
getIdCard
());
ExcelDataEntity
excelDataEntity
=
new
ExcelDataEntity
();
if
(
MapUtil
.
isNotEmpty
(
idCardInfo
))
{
if
(
MapUtil
.
isNotEmpty
(
idCardInfo
))
{
userDTO
.
setAge
(
Integer
.
parseInt
(
idCardInfo
.
get
(
"age"
)));
userDTO
.
setAge
(
Integer
.
parseInt
(
idCardInfo
.
get
(
"age"
)));
userDTO
.
setSex
(
idCardInfo
.
get
(
"sex"
));
userDTO
.
setSex
(
idCardInfo
.
get
(
"sex"
));
userDTO
.
setIdCard
(
idCardInfo
.
get
(
"idCard"
));
userDTO
.
setIdCard
(
idCardInfo
.
get
(
"idCard"
));
userDTO
.
setUserName
(
userDTO
.
getUserName
()
+
idCardInfo
.
get
(
"idCard"
));
userDTO
.
setUserName
(
userDTO
.
getUserName
()
+
idCardInfo
.
get
(
"idCard"
));
userDTO
.
setIdType
(
"身份证"
);
userDTO
.
setIdType
(
"身份证"
);
excelDataEntity
.
setPayUserName
(
userDTO
.
getUserName
());
excelDataEntity
.
setPayeeName
(
userDTO
.
getUserName
());
}
else
{
excelDataEntity
.
setPayUserName
(
userDTO
.
getUserName
());
excelDataEntity
.
setPayeeName
(
userDTO
.
getUserName
());
}
}
excelDataEntity
.
setCaseId
(
userDTO
.
getCaseId
());
excelDataEntity
.
setUseFlag
(
true
);
//添加节点数据
excelDataService
.
save
(
excelDataEntity
);
userDTO
.
setType
(
"1"
);
userDTO
.
setType
(
"1"
);
return
save
(
userDTO
);
return
save
(
userDTO
);
}
}
...
@@ -297,7 +289,20 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme
...
@@ -297,7 +289,20 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme
}
}
@Override
@Override
@Transactional
public
Boolean
relationSaveOrUpdate
(
List
<
UserRelationEntity
>
userRelationList
)
{
public
Boolean
relationSaveOrUpdate
(
List
<
UserRelationEntity
>
userRelationList
)
{
//添加连线
List
<
ExcelDataEntity
>
excelDataList
=
Lists
.
newArrayList
();
for
(
UserRelationEntity
userRelation
:
userRelationList
)
{
ExcelDataEntity
excelDataEntity
=
new
ExcelDataEntity
();
excelDataEntity
.
setPayUserName
(
userRelation
.
getUserName
());
excelDataEntity
.
setPayeeName
(
userRelation
.
getOtherName
());
excelDataEntity
.
setCaseId
(
Integer
.
parseInt
(
userRelation
.
getCaseId
()));
excelDataEntity
.
setUseFlag
(
true
);
excelDataEntity
.
setUserFlag
(
true
);
excelDataList
.
add
(
excelDataEntity
);
}
excelDataService
.
saveBatch
(
excelDataList
);
return
userRelationService
.
saveOrUpdateBatch
(
userRelationList
);
return
userRelationService
.
saveOrUpdateBatch
(
userRelationList
);
}
}
...
...
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