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
7d948adb
Commit
7d948adb
authored
Sep 16, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
户拆分任务:批量导入、批量更新、导出、新增、编辑-fxj
parent
2f565bf5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
27 additions
and
20 deletions
+27
-20
SysHouseHoldInfo.java
...fu/cloud/plus/v1/yifu/social/entity/SysHouseHoldInfo.java
+4
-4
TSocialHouseholdInsertVo.java
...loud/plus/v1/yifu/social/vo/TSocialHouseholdInsertVo.java
+2
-2
TSocialHouseholdUpdateVo.java
...loud/plus/v1/yifu/social/vo/TSocialHouseholdUpdateVo.java
+2
-2
HouseConfigConstants.java
...d/plus/v1/yifu/social/constants/HouseConfigConstants.java
+4
-0
SysHouseHoldInfoServiceImpl.java
...yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
+15
-12
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/SysHouseHoldInfo.java
View file @
7d948adb
...
@@ -181,7 +181,7 @@ public class SysHouseHoldInfo extends BaseEntity {
...
@@ -181,7 +181,7 @@ public class SysHouseHoldInfo extends BaseEntity {
/**
/**
* 单位编号
* 单位编号
*/
*/
@ExcelAttribute
(
name
=
"单位编号"
)
@ExcelAttribute
(
name
=
"单位编号"
,
maxLength
=
50
)
@Schema
(
description
=
"单位编号"
)
@Schema
(
description
=
"单位编号"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"单位编号"
)
@ExcelProperty
(
"单位编号"
)
...
@@ -217,7 +217,7 @@ public class SysHouseHoldInfo extends BaseEntity {
...
@@ -217,7 +217,7 @@ public class SysHouseHoldInfo extends BaseEntity {
/**
/**
* 社保-登录账户
* 社保-登录账户
*/
*/
@ExcelAttribute
(
name
=
"社保-登录账户"
)
@ExcelAttribute
(
name
=
"社保-登录账户"
,
maxLength
=
50
)
@Schema
(
description
=
"社保-登录账户"
)
@Schema
(
description
=
"社保-登录账户"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保-登录账户"
)
@ExcelProperty
(
"社保-登录账户"
)
...
@@ -235,7 +235,7 @@ public class SysHouseHoldInfo extends BaseEntity {
...
@@ -235,7 +235,7 @@ public class SysHouseHoldInfo extends BaseEntity {
/**
/**
* 医保-登录账户
* 医保-登录账户
*/
*/
@ExcelAttribute
(
name
=
"医保-登录账户"
)
@ExcelAttribute
(
name
=
"医保-登录账户"
,
maxLength
=
50
)
@Schema
(
description
=
"医保-登录账户"
)
@Schema
(
description
=
"医保-登录账户"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医保-登录账户"
)
@ExcelProperty
(
"医保-登录账户"
)
...
@@ -280,7 +280,7 @@ public class SysHouseHoldInfo extends BaseEntity {
...
@@ -280,7 +280,7 @@ public class SysHouseHoldInfo extends BaseEntity {
/**
/**
* 医保单位编号
* 医保单位编号
*/
*/
@ExcelAttribute
(
name
=
"医保-单位编号"
)
@ExcelAttribute
(
name
=
"医保-单位编号"
,
maxLength
=
50
)
@Schema
(
description
=
"医保-单位编号"
)
@Schema
(
description
=
"医保-单位编号"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医保-单位编号"
)
@ExcelProperty
(
"医保-单位编号"
)
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialHouseholdInsertVo.java
View file @
7d948adb
...
@@ -219,7 +219,7 @@ public class TSocialHouseholdInsertVo extends RowIndex implements Serializable {
...
@@ -219,7 +219,7 @@ public class TSocialHouseholdInsertVo extends RowIndex implements Serializable {
/**
/**
* 社保推送类型(是否单个接口) 0否1是(税友接口走单个还是批量,审核是否立即推送税友) MVP1.7.15 调整为社保推送类型 0批量 1单个
* 社保推送类型(是否单个接口) 0否1是(税友接口走单个还是批量,审核是否立即推送税友) MVP1.7.15 调整为社保推送类型 0批量 1单个
*/
*/
@ExcelAttribute
(
name
=
"社保推送类型"
,
readConverterExp
=
"0=批量,1=单个"
,
errorInfo
=
"社保推送类型不能为空"
)
@ExcelAttribute
(
name
=
"社保推送类型"
,
errorInfo
=
"社保推送类型不能为空"
)
@Schema
(
description
=
"社保推送类型"
)
@Schema
(
description
=
"社保推送类型"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保推送类型"
)
@ExcelProperty
(
"社保推送类型"
)
...
@@ -228,7 +228,7 @@ public class TSocialHouseholdInsertVo extends RowIndex implements Serializable {
...
@@ -228,7 +228,7 @@ public class TSocialHouseholdInsertVo extends RowIndex implements Serializable {
/**
/**
* 医保推送类型 0否1是 MVP1.7.15 新增医保推送类型 0批量 1单个
* 医保推送类型 0否1是 MVP1.7.15 新增医保推送类型 0批量 1单个
*/
*/
@ExcelAttribute
(
name
=
"医保推送类型"
,
readConverterExp
=
"0=批量,1=单个"
,
errorInfo
=
"医保推送类型不能为空"
)
@ExcelAttribute
(
name
=
"医保推送类型"
,
errorInfo
=
"医保推送类型不能为空"
)
@Schema
(
description
=
"医保推送类型"
)
@Schema
(
description
=
"医保推送类型"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医保推送类型"
)
@ExcelProperty
(
"医保推送类型"
)
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialHouseholdUpdateVo.java
View file @
7d948adb
...
@@ -219,7 +219,7 @@ public class TSocialHouseholdUpdateVo extends RowIndex implements Serializable {
...
@@ -219,7 +219,7 @@ public class TSocialHouseholdUpdateVo extends RowIndex implements Serializable {
/**
/**
* 社保推送类型(是否单个接口) 0否1是(税友接口走单个还是批量,审核是否立即推送税友) MVP1.7.15 调整为社保推送类型 0批量 1单个
* 社保推送类型(是否单个接口) 0否1是(税友接口走单个还是批量,审核是否立即推送税友) MVP1.7.15 调整为社保推送类型 0批量 1单个
*/
*/
@ExcelAttribute
(
name
=
"社保推送类型"
,
readConverterExp
=
"0=批量,1=单个"
,
errorInfo
=
"社保推送类型不能为空"
)
@ExcelAttribute
(
name
=
"社保推送类型"
,
errorInfo
=
"社保推送类型不能为空"
)
@Schema
(
description
=
"社保推送类型"
)
@Schema
(
description
=
"社保推送类型"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保推送类型"
)
@ExcelProperty
(
"社保推送类型"
)
...
@@ -228,7 +228,7 @@ public class TSocialHouseholdUpdateVo extends RowIndex implements Serializable {
...
@@ -228,7 +228,7 @@ public class TSocialHouseholdUpdateVo extends RowIndex implements Serializable {
/**
/**
* 医保推送类型 0否1是 MVP1.7.15 新增医保推送类型 0批量 1单个
* 医保推送类型 0否1是 MVP1.7.15 新增医保推送类型 0批量 1单个
*/
*/
@ExcelAttribute
(
name
=
"医保推送类型"
,
readConverterExp
=
"0=批量,1=单个"
,
errorInfo
=
"医保推送类型不能为空"
)
@ExcelAttribute
(
name
=
"医保推送类型"
,
errorInfo
=
"医保推送类型不能为空"
)
@Schema
(
description
=
"医保推送类型"
)
@Schema
(
description
=
"医保推送类型"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医保推送类型"
)
@ExcelProperty
(
"医保推送类型"
)
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/constants/HouseConfigConstants.java
View file @
7d948adb
...
@@ -70,4 +70,8 @@ public class HouseConfigConstants {
...
@@ -70,4 +70,8 @@ public class HouseConfigConstants {
public
static
final
String
ERROR_TEMPLATE_TWENTY_ONE
=
"医保自动化不可为空"
;
public
static
final
String
ERROR_TEMPLATE_TWENTY_ONE
=
"医保自动化不可为空"
;
public
static
final
String
IS_SINGLE_YES
=
"单个"
;
public
static
final
String
IS_SINGLE_NO
=
"批量"
;
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
View file @
7d948adb
...
@@ -807,7 +807,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -807,7 +807,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
continue
;
continue
;
}
}
//判断推送类型是否准确
//判断推送类型是否准确
if
(!
CommonConstants
.
ZERO_STRING
.
equals
(
excel
.
getIsSingle
())
&&
!
CommonConstants
.
ONE_STRING
.
equals
(
excel
.
getIsSingle
()))
{
if
(!
HouseConfigConstants
.
IS_SINGLE_NO
.
equals
(
excel
.
getIsSingle
())
&&
!
HouseConfigConstants
.
IS_SINGLE_YES
.
equals
(
excel
.
getIsSingle
()))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_NINE
,
excel
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_NINE
,
excel
));
continue
;
continue
;
}
}
...
@@ -845,7 +845,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -845,7 +845,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
continue
;
continue
;
}
}
//判断推送类型是否准确
//判断推送类型是否准确
if
(!
CommonConstants
.
ZERO_STRING
.
equals
(
excel
.
getIsSingleYsd
())
&&
!
CommonConstants
.
ONE_STRING
.
equals
(
excel
.
getIsSingleYsd
()))
{
if
(!
HouseConfigConstants
.
IS_SINGLE_NO
.
equals
(
excel
.
getIsSingleYsd
())
&&
!
HouseConfigConstants
.
IS_SINGLE_YES
.
equals
(
excel
.
getIsSingleYsd
()))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_NINE_TWO
,
excel
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_NINE_TWO
,
excel
));
continue
;
continue
;
}
}
...
@@ -871,12 +871,15 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -871,12 +871,15 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
//是否自动办理,选择是时,社保和医保信息必须填写其中一个,否则导入不成功--》MVP1.7.15 选择是 社保信息必填
//是否自动办理,选择是时,社保和医保信息必须填写其中一个,否则导入不成功--》MVP1.7.15 选择是 社保信息必填
//选择否时,不做限制要求,可填可不填,导入时正常导入填写的字段
//选择否时,不做限制要求,可填可不填,导入时正常导入填写的字段
if
(
CommonConstants
.
IS_TRUE
.
equals
(
excel
.
getAutoStatus
())
&&
Common
.
isEmpty
(
excel
.
getSocialAccount
())){
if
(
CommonConstants
.
IS_TRUE
.
equals
(
excel
.
getAutoStatus
())
&&(
Common
.
isEmpty
(
excel
.
getSocialAccount
())
||
Common
.
isEmpty
(
excel
.
getSocialPassword
()))
){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_TWO
,
excel
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_TWO
,
excel
));
continue
;
continue
;
}
}
//MVP1.7.15 医保是否自动办理,选择是时,医保信息必须填写,否则导入不成功
//MVP1.7.15 医保是否自动办理,选择是时,医保信息必须填写,否则导入不成功
if
(
CommonConstants
.
IS_TRUE
.
equals
(
excel
.
getAutoStatusYsd
())
&&
Common
.
isEmpty
(
excel
.
getMediclAccount
())){
if
(
CommonConstants
.
IS_TRUE
.
equals
(
excel
.
getAutoStatusYsd
())
&&
(
Common
.
isEmpty
(
excel
.
getMediclAccount
())
||
Common
.
isEmpty
(
excel
.
getMediclPassword
()))
){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_TWO_TWO
,
excel
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_TWO_TWO
,
excel
));
continue
;
continue
;
}
}
...
@@ -940,7 +943,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -940,7 +943,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
household
.
setDataFlagYgs
(
excel
.
getDataFlagYgs
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
household
.
setDataFlagYgs
(
excel
.
getDataFlagYgs
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
}
}
if
(
Common
.
isNotNull
(
excel
.
getIsSingle
())){
if
(
Common
.
isNotNull
(
excel
.
getIsSingle
())){
household
.
setIsSingle
(
excel
.
getIsSingle
());
household
.
setIsSingle
(
excel
.
getIsSingle
()
.
equals
(
HouseConfigConstants
.
IS_SINGLE_NO
)
?
"0"
:
"1"
);
}
}
if
(
Common
.
isNotNull
(
excel
.
getRosterAutoFlagYsd
())){
if
(
Common
.
isNotNull
(
excel
.
getRosterAutoFlagYsd
())){
household
.
setRosterAutoFlagYsd
(
excel
.
getRosterAutoFlagYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
household
.
setRosterAutoFlagYsd
(
excel
.
getRosterAutoFlagYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
...
@@ -949,7 +952,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -949,7 +952,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
household
.
setDataFlagYsd
(
excel
.
getDataFlagYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
household
.
setDataFlagYsd
(
excel
.
getDataFlagYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
}
}
if
(
Common
.
isNotNull
(
excel
.
getIsSingleYsd
())){
if
(
Common
.
isNotNull
(
excel
.
getIsSingleYsd
())){
household
.
setIsSingleYsd
(
excel
.
getIsSingleYsd
());
household
.
setIsSingleYsd
(
excel
.
getIsSingleYsd
()
.
equals
(
HouseConfigConstants
.
IS_SINGLE_NO
)
?
"0"
:
"1"
);
}
}
household
.
setOrganId
(
dicMap
.
get
(
household
.
getOrganName
()));
household
.
setOrganId
(
dicMap
.
get
(
household
.
getOrganName
()));
...
@@ -1087,14 +1090,14 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -1087,14 +1090,14 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
//判断推送类型是否准确
//判断推送类型是否准确
if
(
Common
.
isNotNull
(
excel
.
getIsSingle
())
if
(
Common
.
isNotNull
(
excel
.
getIsSingle
())
&&
!
CommonConstants
.
ZERO_STRING
.
equals
(
excel
.
getIsSingle
())
&&
!
HouseConfigConstants
.
IS_SINGLE_NO
.
equals
(
excel
.
getIsSingle
())
&&
!
CommonConstants
.
ONE_STRING
.
equals
(
excel
.
getIsSingle
()))
{
&&
!
HouseConfigConstants
.
IS_SINGLE_YES
.
equals
(
excel
.
getIsSingle
()))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_NINE
,
excel
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_NINE
,
excel
));
continue
;
continue
;
}
}
if
(
Common
.
isNotNull
(
excel
.
getIsSingleYsd
())
if
(
Common
.
isNotNull
(
excel
.
getIsSingleYsd
())
&&
!
CommonConstants
.
ZERO_STRING
.
equals
(
excel
.
getIsSingleYsd
())
&&
!
HouseConfigConstants
.
IS_SINGLE_NO
.
equals
(
excel
.
getIsSingleYsd
())
&&
!
CommonConstants
.
ONE_STRING
.
equals
(
excel
.
getIsSingleYsd
()))
{
&&
!
HouseConfigConstants
.
IS_SINGLE_YES
.
equals
(
excel
.
getIsSingleYsd
()))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_NINE_TWO
,
excel
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_NINE_TWO
,
excel
));
continue
;
continue
;
}
}
...
@@ -1270,10 +1273,10 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -1270,10 +1273,10 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
info
.
setAutoStatusYsd
(
excel
.
getAutoStatusYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"0"
:
"1"
);
info
.
setAutoStatusYsd
(
excel
.
getAutoStatusYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"0"
:
"1"
);
}
}
if
(
Common
.
isNotNull
(
excel
.
getIsSingle
()))
{
if
(
Common
.
isNotNull
(
excel
.
getIsSingle
()))
{
info
.
setIsSingle
(
excel
.
getIsSingle
());
info
.
setIsSingle
(
excel
.
getIsSingle
()
.
equals
(
HouseConfigConstants
.
IS_SINGLE_NO
)
?
"0"
:
"1"
);
}
}
if
(
Common
.
isNotNull
(
excel
.
getIsSingleYsd
()))
{
if
(
Common
.
isNotNull
(
excel
.
getIsSingleYsd
()))
{
info
.
setIsSingleYsd
(
excel
.
getIsSingleYsd
());
info
.
setIsSingleYsd
(
excel
.
getIsSingleYsd
()
.
equals
(
HouseConfigConstants
.
IS_SINGLE_NO
)
?
"0"
:
"1"
);
}
}
if
(
Common
.
isNotNull
(
excel
.
getRosterAutoFlagYgs
()))
{
if
(
Common
.
isNotNull
(
excel
.
getRosterAutoFlagYgs
()))
{
info
.
setRosterAutoFlagYgs
(
excel
.
getRosterAutoFlagYgs
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
info
.
setRosterAutoFlagYgs
(
excel
.
getRosterAutoFlagYgs
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
...
...
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