Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
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
fangxinjiang
yifu-mvp
Commits
abab582f
Commit
abab582f
authored
Sep 16, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
户拆分任务:批量导入、批量更新、导出、新增、编辑-fxj
parent
7f83f4d4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
5 deletions
+11
-5
HouseConfigConstants.java
...d/plus/v1/yifu/social/constants/HouseConfigConstants.java
+1
-1
SysHouseHoldInfoServiceImpl.java
...yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
+10
-4
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/constants/HouseConfigConstants.java
View file @
abab582f
...
...
@@ -70,5 +70,5 @@ public class HouseConfigConstants {
public
static
final
String
ERROR_TEMPLATE_TWENTY_ONE
=
"医保自动化不可为空"
;
public
static
final
String
ERROR_CAN_NOT_UPDATE
=
"社保自动化或医保自动化为'是'时不可更新"
;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
View file @
abab582f
...
...
@@ -1014,6 +1014,15 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
.
eq
(
SysHouseHoldInfo:
:
getType
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
SysHouseHoldInfo:
:
getName
,
excel
.
getName
())
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isEmpty
(
info
)){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_NOT_EXIT
,
excel
));
continue
;
}
if
(
CommonConstants
.
IS_TRUE
.
equals
(
excel
.
getAutoStatus
())
||
CommonConstants
.
IS_TRUE
.
equals
(
excel
.
getAutoStatusYsd
())){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_CAN_NOT_UPDATE
,
excel
));
continue
;
}
if
(
Common
.
isNotNull
(
excel
.
getProvince
())
&&
Common
.
isNotNull
(
excel
.
getCity
()))
{
info
.
setProvince
(
excel
.
getProvince
());
info
.
setCity
(
excel
.
getCity
());
...
...
@@ -1033,10 +1042,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if
(
Common
.
isNotNull
(
excel
.
getTown
()))
{
excel
.
setTown
(
areaMap
.
get
(
excel
.
getTown
()).
getAreaName
());
}
if
(
Common
.
isEmpty
(
info
)){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_NOT_EXIT
,
excel
));
continue
;
}
if
(
Common
.
isNotNull
(
excel
.
getOrganName
()))
{
excel
.
setOrganName
(
excel
.
getOrganName
().
replace
(
" "
,
""
));
if
(
Common
.
isNotNull
(
dicMap
)
&&
Common
.
isEmpty
(
dicMap
.
get
(
excel
.
getOrganName
())))
{
...
...
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