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
4e62d3f8
Commit
4e62d3f8
authored
Sep 08, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
户拆分任务:批量导入、批量更新、导出、新增、编辑-fxj
parent
af9bcf6a
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
39 additions
and
17 deletions
+39
-17
SysHouseHoldInfoServiceImpl.java
...yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
+39
-17
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
View file @
4e62d3f8
...
...
@@ -760,6 +760,10 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_TEN
,
excel
));
continue
;
}
}
//社保是否自动生成花名册为是时 社保仅生成花名册为是时必填校验
if
(
CommonConstants
.
IS_TRUE
.
equals
(
excel
.
getRosterAutoFlagYgs
())){
if
(
Common
.
isEmpty
(
excel
.
getDataFlagYgs
()))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_SIXTEEN
,
excel
));
continue
;
...
...
@@ -780,10 +784,6 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_EIGHTEEN
,
excel
));
continue
;
}
if
(
Common
.
isEmpty
(
excel
.
getDataFlagYsd
()))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_NINETEEN
,
excel
));
continue
;
}
//判断推送类型是否准确
if
(!
CommonConstants
.
ZERO_STRING
.
equals
(
excel
.
getIsSingleYsd
())
&&
!
CommonConstants
.
ONE_STRING
.
equals
(
excel
.
getIsSingleYsd
()))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_NINE_TWO
,
excel
));
...
...
@@ -794,6 +794,14 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_THIRTEEN
,
excel
));
continue
;
}
}
//医保自动化为是时医保仅补缴生成材料必填校验
if
(
CommonConstants
.
IS_TRUE
.
equals
(
excel
.
getRosterAutoFlagYsd
())){
if
(
Common
.
isEmpty
(
excel
.
getDataFlagYsd
()))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_NINETEEN
,
excel
));
continue
;
}
//判断是否仅补缴生成材料
if
(!
CommonConstants
.
IS_TRUE
.
equals
(
excel
.
getDataFlagYsd
())
&&
!
CommonConstants
.
IS_FALSE
.
equals
(
excel
.
getDataFlagYsd
()))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_ELVEN_TWO
,
excel
));
...
...
@@ -1042,19 +1050,35 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_THIRTEEN
,
excel
));
continue
;
}
//判断是否仅补缴生成材料
//社保是否自动生成花名册为是时 社保仅补缴生成材料必填
if
(
CommonConstants
.
IS_TRUE
.
equals
(
excel
.
getRosterAutoFlagYgs
())){
if
(
Common
.
isEmpty
(
excel
.
getDataFlagYgs
()))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_SIXTEEN
,
excel
));
continue
;
}
//判断是否仅补缴生成材料是否准确
if
(
Common
.
isNotNull
(
excel
.
getDataFlagYgs
())
&&
!
CommonConstants
.
IS_TRUE
.
equals
(
excel
.
getDataFlagYgs
())
&&
!
CommonConstants
.
IS_FALSE
.
equals
(
excel
.
getDataFlagYgs
()))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_ELVEN
,
excel
));
continue
;
}
}
//医保是否自动生成花名册为是时 医保仅补缴生成材料必填
if
(
CommonConstants
.
IS_TRUE
.
equals
(
excel
.
getRosterAutoFlagYsd
())){
if
(
Common
.
isEmpty
(
excel
.
getDataFlagYsd
())){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_NINETEEN
,
excel
));
continue
;
}
//判断是否仅补缴生成材料是否准确
if
(
Common
.
isNotNull
(
excel
.
getDataFlagYsd
())
&&
!
CommonConstants
.
IS_TRUE
.
equals
(
excel
.
getDataFlagYsd
())
&&
!
CommonConstants
.
IS_FALSE
.
equals
(
excel
.
getDataFlagYsd
()))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_ELVEN_TWO
,
excel
));
continue
;
}
}
//是否自动办理,选择是时,社保和医保信息必须填写其中一个,否则导入不成功 --》MVP1.7.15 社保自动化,选择否时,医保信息必须填写,否则导入不成功
//选择否时,不做限制要求,可填可不填,导入时正常导入填写的字段
...
...
@@ -1063,7 +1087,6 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
CommonConstants
.
IS_TRUE
.
equals
(
excel
.
getAutoStatus
())
&&
(
Common
.
isEmpty
(
excel
.
getSocialAccount
())
||
Common
.
isEmpty
(
excel
.
getIsSingle
())
||
Common
.
isEmpty
(
excel
.
getDataFlagYgs
())
||
Common
.
isEmpty
(
excel
.
getRosterAutoFlagYgs
()))){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_TWO
,
excel
));
continue
;
...
...
@@ -1072,7 +1095,6 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
CommonConstants
.
IS_TRUE
.
equals
(
excel
.
getAutoStatusYsd
())
&&
(
Common
.
isEmpty
(
excel
.
getMediclAccount
())
||
Common
.
isEmpty
(
excel
.
getIsSingleYsd
())
||
Common
.
isEmpty
(
excel
.
getDataFlagYsd
())
||
Common
.
isEmpty
(
excel
.
getRosterAutoFlagYsd
())))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_TWO_TWO
,
excel
));
continue
;
...
...
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