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
4ff97fe5
Commit
4ff97fe5
authored
Sep 05, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
社保户新增字段相关调整50%-fxj
parent
5eee04ac
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
530 additions
and
24 deletions
+530
-24
SysHouseHoldInfo.java
...fu/cloud/plus/v1/yifu/social/entity/SysHouseHoldInfo.java
+93
-6
TSocialHouseholdExportVo.java
...loud/plus/v1/yifu/social/vo/TSocialHouseholdExportVo.java
+97
-0
TSocialHouseholdInsertVo.java
...loud/plus/v1/yifu/social/vo/TSocialHouseholdInsertVo.java
+65
-2
TSocialHouseholdUpdateVo.java
...loud/plus/v1/yifu/social/vo/TSocialHouseholdUpdateVo.java
+67
-3
HouseConfigConstants.java
...d/plus/v1/yifu/social/constants/HouseConfigConstants.java
+9
-1
SysHouseHoldInfoController.java
...v1/yifu/social/controller/SysHouseHoldInfoController.java
+10
-2
SysHouseHoldInfoServiceImpl.java
...yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
+189
-10
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/SysHouseHoldInfo.java
View file @
4ff97fe5
...
...
@@ -264,11 +264,17 @@ public class SysHouseHoldInfo extends BaseEntity {
private
String
areaCode
;
/**
*
自动化配置状态 0 启用 1 禁用
*
社保自动化(自动化配置状态) 0 启用 1 禁用 -MVP1.7.15调整为是否社保自动化
*/
@Schema
(
description
=
"
自动化配置状态
"
)
@Schema
(
description
=
"
社保自动化
"
)
private
String
autoStatus
;
/**
* 医保自动化(自动化配置状态) 0 启用 1 禁用 -MVP1.7.15新增医保自动化
*/
@Schema
(
description
=
"医保自动化"
)
private
String
autoStatusYsd
;
/**
* 医保单位编号
*/
...
...
@@ -279,14 +285,23 @@ public class SysHouseHoldInfo extends BaseEntity {
private
String
customerNoYsd
;
/**
*
是否单个接口 0否1是(税友接口走单个还是批量,审核是否立即推送税友)
*
社保推送类型(是否单个接口) 0否1是(税友接口走单个还是批量,审核是否立即推送税友) MVP1.7.15 调整为社保推送类型 0批量 1单个
*/
@ExcelAttribute
(
name
=
"
是否单个接口
"
)
@Schema
(
description
=
"
是否单个接口
"
)
@ExcelAttribute
(
name
=
"
社保推送类型
"
)
@Schema
(
description
=
"
社保推送类型
"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"
是否单个接口
"
)
@ExcelProperty
(
"
社保推送类型
"
)
private
String
isSingle
;
/**
* 医保推送类型 0否1是 MVP1.7.15 新增医保推送类型 0批量 1单个
*/
@ExcelAttribute
(
name
=
"医保推送类型"
)
@Schema
(
description
=
"医保推送类型"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医保推送类型"
)
private
String
isSingleYsd
;
/**
* 是否自动生成解除劳动合同书 0否1是(是的话,走单个推送,因为税友的减员接口没有批量附件的字段)
*/
...
...
@@ -320,4 +335,76 @@ public class SysHouseHoldInfo extends BaseEntity {
@TableField
(
exist
=
false
)
private
TAttaInfo
atta
;
/**
* 社保是否自动生成花名册 0否1是
*/
@ExcelAttribute
(
name
=
"社保是否自动生成花名册"
)
@Schema
(
description
=
"社保是否自动生成花名册 0否1是"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保是否自动生成花名册"
)
private
String
rosterAutoFlagYgs
;
/**
* 医保是否自动生成花名册 0否1是
*/
@ExcelAttribute
(
name
=
"医保是否自动生成花名册"
)
@Schema
(
description
=
"医保是否自动生成花名册 0否1是"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医保是否自动生成花名册"
)
private
String
rosterAutoFlagYsd
;
/**
* 社保仅补缴生成材料 0否1是
*/
@ExcelAttribute
(
name
=
"社保仅补缴生成材料"
)
@Schema
(
description
=
"社保仅补缴生成材料 0否1是"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保仅补缴生成材料"
)
private
String
dataFlagYgs
;
/**
* 医保仅补缴生成材料 0否1是
*/
@ExcelAttribute
(
name
=
"医保仅补缴生成材料"
)
@Schema
(
description
=
"医保仅补缴生成材料 0否1是"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医保仅补缴生成材料"
)
private
String
dataFlagYsd
;
/**
* 社保增员花名册模板
*/
@ExcelAttribute
(
name
=
"社保增员花名册模板"
)
@Schema
(
description
=
"社保增员花名册模板"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保增员花名册模板"
)
private
String
addRosterTempYgs
;
/**
* 社保减员花名册模板
*/
@ExcelAttribute
(
name
=
"社保减员花名册模板"
)
@Schema
(
description
=
"社保减员花名册模板"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保减员花名册模板"
)
private
String
reduceRosterTempYgs
;
/**
* 医保增员花名册模板
*/
@ExcelAttribute
(
name
=
"医保增员花名册模板"
)
@Schema
(
description
=
"医保增员花名册模板"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医保增员花名册模板"
)
private
String
addRosterTempYsd
;
/**
* 医保减员花名册模板
*/
@ExcelAttribute
(
name
=
"医保减员花名册模板"
)
@Schema
(
description
=
"医保减员花名册模板"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医保减员花名册模板"
)
private
String
reduceRosterTempYsd
;
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialHouseholdExportVo.java
View file @
4ff97fe5
...
...
@@ -203,4 +203,101 @@ public class TSocialHouseholdExportVo implements Serializable {
@ExcelProperty
(
"是否自动办理"
)
private
String
autoStatus
;
/**
* 医保自动化(自动化配置状态) 0 启用 1 禁用 -MVP1.7.15新增医保自动化
*/
@Schema
(
description
=
"医保自动化"
)
private
String
autoStatusYsd
;
/**
* 社保推送类型(是否单个接口) 0否1是(税友接口走单个还是批量,审核是否立即推送税友) MVP1.7.15 调整为社保推送类型 0批量 1单个
*/
@ExcelAttribute
(
name
=
"社保推送类型"
)
@Schema
(
description
=
"社保推送类型"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保推送类型"
)
private
String
isSingle
;
/**
* 医保推送类型 0否1是 MVP1.7.15 新增医保推送类型 0批量 1单个
*/
@ExcelAttribute
(
name
=
"医保推送类型"
)
@Schema
(
description
=
"医保推送类型"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医保推送类型"
)
private
String
isSingleYsd
;
/**
* 社保是否自动生成花名册 0否1是
*/
@ExcelAttribute
(
name
=
"社保是否自动生成花名册"
)
@Schema
(
description
=
"社保是否自动生成花名册 0否1是"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保是否自动生成花名册"
)
private
String
rosterAutoFlagYgs
;
/**
* 医保是否自动生成花名册 0否1是
*/
@ExcelAttribute
(
name
=
"医保是否自动生成花名册"
)
@Schema
(
description
=
"医保是否自动生成花名册 0否1是"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医保是否自动生成花名册"
)
private
String
rosterAutoFlagYsd
;
/**
* 社保仅补缴生成材料 0否1是
*/
@ExcelAttribute
(
name
=
"社保仅补缴生成材料"
)
@Schema
(
description
=
"社保仅补缴生成材料 0否1是"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保仅补缴生成材料"
)
private
String
dataFlagYgs
;
/**
* 医保仅补缴生成材料 0否1是
*/
@ExcelAttribute
(
name
=
"医保仅补缴生成材料"
)
@Schema
(
description
=
"医保仅补缴生成材料 0否1是"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医保仅补缴生成材料"
)
private
String
dataFlagYsd
;
/**
* 社保增员花名册模板
*/
@ExcelAttribute
(
name
=
"社保增员花名册模板"
)
@Schema
(
description
=
"社保增员花名册模板"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保增员花名册模板"
)
private
String
addRosterTempYgs
;
/**
* 社保减员花名册模板
*/
@ExcelAttribute
(
name
=
"社保减员花名册模板"
)
@Schema
(
description
=
"社保减员花名册模板"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保减员花名册模板"
)
private
String
reduceRosterTempYgs
;
/**
* 医保增员花名册模板
*/
@ExcelAttribute
(
name
=
"医保增员花名册模板"
)
@Schema
(
description
=
"医保增员花名册模板"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医保增员花名册模板"
)
private
String
addRosterTempYsd
;
/**
* 医保减员花名册模板
*/
@ExcelAttribute
(
name
=
"医保减员花名册模板"
)
@Schema
(
description
=
"医保减员花名册模板"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医保减员花名册模板"
)
private
String
reduceRosterTempYsd
;
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialHouseholdInsertVo.java
View file @
4ff97fe5
...
...
@@ -19,6 +19,7 @@ package com.yifu.cloud.plus.v1.yifu.social.vo;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.write.style.HeadFontStyle
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
...
...
@@ -191,12 +192,74 @@ public class TSocialHouseholdInsertVo extends RowIndex implements Serializable {
private
String
mediclPassword
;
/**
* 自动化配置状态 0
是 1 否
* 自动化配置状态 0
启用 1 禁用
*/
@ExcelAttribute
(
name
=
"是否自动办理"
,
maxLength
=
1
,
isNotEmpty
=
true
)
@ExcelAttribute
(
name
=
"是否自动办理"
,
maxLength
=
1
,
isNotEmpty
=
true
,
errorInfo
=
"医保自动化不能为空"
)
@Schema
(
description
=
"是否自动办理"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"是否自动办理"
)
private
String
autoStatus
;
/**
* 医保自动化(自动化配置状态) 0 启用 1 禁用 -MVP1.7.15新增医保自动化
*/
@ExcelAttribute
(
name
=
"医保自动化"
,
maxLength
=
1
,
isNotEmpty
=
true
,
errorInfo
=
"医保自动化不能为空"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医保自动化"
)
@Schema
(
description
=
"医保自动化"
)
private
String
autoStatusYsd
;
/**
* 社保推送类型(是否单个接口) 0否1是(税友接口走单个还是批量,审核是否立即推送税友) MVP1.7.15 调整为社保推送类型 0批量 1单个
*/
@ExcelAttribute
(
name
=
"社保推送类型"
,
isNotEmpty
=
true
,
readConverterExp
=
"0=批量,1=单个"
,
errorInfo
=
"社保推送类型不能为空"
)
@Schema
(
description
=
"社保推送类型"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保推送类型"
)
private
String
isSingle
;
/**
* 医保推送类型 0否1是 MVP1.7.15 新增医保推送类型 0批量 1单个
*/
@ExcelAttribute
(
name
=
"医保推送类型"
,
isNotEmpty
=
true
,
readConverterExp
=
"0=批量,1=单个"
,
errorInfo
=
"医保推送类型不能为空"
)
@Schema
(
description
=
"医保推送类型"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医保推送类型"
)
private
String
isSingleYsd
;
/**
* 社保是否自动生成花名册 0否1是
*/
@ExcelAttribute
(
name
=
"社保是否自动生成花名册"
,
isNotEmpty
=
true
,
errorInfo
=
"社保是否自动生成花名册不能为空"
)
@Schema
(
description
=
"社保是否自动生成花名册 0否1是"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保是否自动生成花名册"
)
private
String
rosterAutoFlagYgs
;
/**
* 医保是否自动生成花名册 0否1是
*/
@ExcelAttribute
(
name
=
"医保是否自动生成花名册"
,
isNotEmpty
=
true
,
errorInfo
=
"医保是否自动生成花名册不能为空"
)
@Schema
(
description
=
"医保是否自动生成花名册 0否1是"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医保是否自动生成花名册"
)
private
String
rosterAutoFlagYsd
;
/**
* 社保仅补缴生成材料 0否1是
*/
@ExcelAttribute
(
name
=
"社保仅补缴生成材料"
,
isNotEmpty
=
true
,
errorInfo
=
"社保仅补缴生成材料不能为空"
)
@Schema
(
description
=
"社保仅补缴生成材料 0否1是"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保仅补缴生成材料"
)
private
String
dataFlagYgs
;
/**
* 医保仅补缴生成材料 0否1是
*/
@ExcelAttribute
(
name
=
"医保仅补缴生成材料"
,
isNotEmpty
=
true
,
errorInfo
=
"医保仅补缴生成材料不能为空"
)
@Schema
(
description
=
"医保仅补缴生成材料 0否1是"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医保仅补缴生成材料"
)
private
String
dataFlagYsd
;
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialHouseholdUpdateVo.java
View file @
4ff97fe5
...
...
@@ -192,10 +192,74 @@ public class TSocialHouseholdUpdateVo extends RowIndex implements Serializable {
/**
* 自动化配置状态 0 是 1 否
*/
@ExcelAttribute
(
name
=
"
是否自动办理"
,
maxLength
=
1
,
isNotEmpty
=
true
)
@Schema
(
description
=
"
是否自动办理
"
)
@ExcelAttribute
(
name
=
"
社保自动化"
,
maxLength
=
1
,
isNotEmpty
=
true
,
errorInfo
=
"社保自动化不能为空"
)
@Schema
(
description
=
"
社保自动化
"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"
是否自动办理
"
)
@ExcelProperty
(
"
社保自动化
"
)
private
String
autoStatus
;
/**
* 医保自动化(自动化配置状态) 0 启用 1 禁用 -MVP1.7.15新增医保自动化
*/
@ExcelAttribute
(
name
=
"医保自动化"
,
isNotEmpty
=
true
,
maxLength
=
1
,
errorInfo
=
"医保自动化不能为空"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医保自动化"
)
@Schema
(
description
=
"医保自动化"
)
private
String
autoStatusYsd
;
/**
* 社保推送类型(是否单个接口) 0否1是(税友接口走单个还是批量,审核是否立即推送税友) MVP1.7.15 调整为社保推送类型 0批量 1单个
*/
@ExcelAttribute
(
name
=
"社保推送类型"
,
readConverterExp
=
"0=批量,1=单个"
,
errorInfo
=
"社保推送类型不能为空"
)
@Schema
(
description
=
"社保推送类型"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保推送类型"
)
private
String
isSingle
;
/**
* 医保推送类型 0否1是 MVP1.7.15 新增医保推送类型 0批量 1单个
*/
@ExcelAttribute
(
name
=
"医保推送类型"
,
readConverterExp
=
"0=批量,1=单个"
,
errorInfo
=
"医保推送类型不能为空"
)
@Schema
(
description
=
"医保推送类型"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医保推送类型"
)
private
String
isSingleYsd
;
/**
* 社保是否自动生成花名册 0否1是
*/
@ExcelAttribute
(
name
=
"社保是否自动生成花名册"
,
errorInfo
=
"社保是否自动生成花名册不能为空"
)
@Schema
(
description
=
"社保是否自动生成花名册 0否1是"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保是否自动生成花名册"
)
private
String
rosterAutoFlagYgs
;
/**
* 医保是否自动生成花名册 0否1是
*/
@ExcelAttribute
(
name
=
"医保是否自动生成花名册"
,
errorInfo
=
"医保是否自动生成花名册不能为空"
)
@Schema
(
description
=
"医保是否自动生成花名册 0否1是"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医保是否自动生成花名册"
)
private
String
rosterAutoFlagYsd
;
/**
* 社保仅补缴生成材料 0否1是
*/
@ExcelAttribute
(
name
=
"社保仅补缴生成材料"
,
errorInfo
=
"社保仅补缴生成材料不能为空"
)
@Schema
(
description
=
"社保仅补缴生成材料 0否1是"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保仅补缴生成材料"
)
private
String
dataFlagYgs
;
/**
* 医保仅补缴生成材料 0否1是
*/
@ExcelAttribute
(
name
=
"医保仅补缴生成材料"
,
errorInfo
=
"医保仅补缴生成材料不能为空"
)
@Schema
(
description
=
"医保仅补缴生成材料 0否1是"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医保仅补缴生成材料"
)
private
String
dataFlagYsd
;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/constants/HouseConfigConstants.java
View file @
4ff97fe5
...
...
@@ -19,7 +19,9 @@ public class HouseConfigConstants {
public
static
final
String
ERROR_TEMPLATE_ONE
=
"户类型只能是【自有户】或者【独立户】"
;
public
static
final
String
ERROR_TEMPLATE_TWO
=
"是否自动办理,选择是时,社保和医保信息必须填写其中一个"
;
public
static
final
String
ERROR_TEMPLATE_TWO
=
"是否自动办理,选择是时,社保信息必须填写"
;
public
static
final
String
ERROR_TEMPLATE_TWO_TWO
=
"是否自动办理,选择是时,医保信息必须填写"
;
public
static
final
String
ERROR_TEMPLATE_THREE
=
"是否自动办理只能为【是】或者【否】"
;
...
...
@@ -36,5 +38,11 @@ public class HouseConfigConstants {
public
static
final
String
ERROR_TEMPLATE_EIGHT
=
"手机号格式校验失败"
;
public
static
final
String
ERROR_TEMPLATE_NINE
=
"社保推送类型只能是【批量】或【单个】"
;
public
static
final
String
ERROR_TEMPLATE_TEN
=
"是否自动生成花名册只能选择【是】或【否】"
;
public
static
final
String
ERROR_TEMPLATE_ELVEN
=
"仅补缴生成材料只能选择【是】或【否】"
;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/SysHouseHoldInfoController.java
View file @
4ff97fe5
...
...
@@ -135,10 +135,18 @@ public class SysHouseHoldInfoController {
@SysLog
(
"修改社保户公积金户自动化配置"
)
@PostMapping
(
"/updateAutoType"
)
@PreAuthorize
(
"@pms.hasPermission('demo_syshouseholdinfo_edit')"
)
public
R
updateAutoType
(
@RequestParam
String
id
,
@RequestParam
String
autoStatus
)
{
public
R
updateAutoType
(
@RequestParam
String
id
,
@RequestParam
String
autoStatus
,
String
autoStatusYsd
)
{
if
(
Common
.
isEmpty
(
autoStatus
)
&&
Common
.
isEmpty
(
autoStatusYsd
)){
return
R
.
failed
(
"请选择启用禁用状态"
);
}
SysHouseHoldInfo
sysHouseHoldInfo
=
sysHouseHoldInfoService
.
getById
(
id
);
if
(
Common
.
isNotNull
(
sysHouseHoldInfo
))
{
if
(
Common
.
isNotNull
(
autoStatusYsd
)){
sysHouseHoldInfo
.
setAutoStatusYsd
(
autoStatusYsd
);
}
if
(
Common
.
isNotNull
(
autoStatus
)){
sysHouseHoldInfo
.
setAutoStatus
(
autoStatus
);
}
sysHouseHoldInfoService
.
updateById
(
sysHouseHoldInfo
);
return
R
.
ok
();
}
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
View file @
4ff97fe5
...
...
@@ -157,11 +157,47 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
}
baseMapper
.
insert
(
sysHouseHoldInfo
);
//维护附件信息
TAttaInfo
attaInfo
=
null
;
if
(
Common
.
isNotNull
(
sysHouseHoldInfo
.
getAttaId
()))
{
TAttaInfo
attaInfo
=
attaInfoService
.
getById
(
sysHouseHoldInfo
.
getAttaId
());
attaInfo
=
attaInfoService
.
getById
(
sysHouseHoldInfo
.
getAttaId
());
if
(
null
!=
attaInfo
){
attaInfo
.
setDomainId
(
sysHouseHoldInfo
.
getId
());
attaInfoService
.
updateById
(
attaInfo
);
}
}
// 11社保增花名册模板;12社保减花名册模板;13医保增花名册模板;14医保减花名册模板
if
(
Common
.
isNotNull
(
sysHouseHoldInfo
.
getAddRosterTempYgs
()))
{
attaInfo
=
attaInfoService
.
getById
(
sysHouseHoldInfo
.
getAddRosterTempYgs
());
if
(
null
!=
attaInfo
){
attaInfo
.
setDomainId
(
sysHouseHoldInfo
.
getId
());
attaInfo
.
setRelationType
(
"11"
);
attaInfoService
.
updateById
(
attaInfo
);
}
}
if
(
Common
.
isNotNull
(
sysHouseHoldInfo
.
getReduceRosterTempYgs
()))
{
attaInfo
=
attaInfoService
.
getById
(
sysHouseHoldInfo
.
getReduceRosterTempYgs
());
if
(
null
!=
attaInfo
){
attaInfo
.
setDomainId
(
sysHouseHoldInfo
.
getId
());
attaInfo
.
setRelationType
(
"12"
);
attaInfoService
.
updateById
(
attaInfo
);
}
}
if
(
Common
.
isNotNull
(
sysHouseHoldInfo
.
getAddRosterTempYsd
()))
{
attaInfo
=
attaInfoService
.
getById
(
sysHouseHoldInfo
.
getAddRosterTempYsd
());
if
(
null
!=
attaInfo
){
attaInfo
.
setDomainId
(
sysHouseHoldInfo
.
getId
());
attaInfo
.
setRelationType
(
"13"
);
attaInfoService
.
updateById
(
attaInfo
);
}
}
if
(
Common
.
isNotNull
(
sysHouseHoldInfo
.
getReduceRosterTempYsd
()))
{
attaInfo
=
attaInfoService
.
getById
(
sysHouseHoldInfo
.
getReduceRosterTempYsd
());
if
(
null
!=
attaInfo
){
attaInfo
.
setDomainId
(
sysHouseHoldInfo
.
getId
());
attaInfo
.
setRelationType
(
"14"
);
attaInfoService
.
updateById
(
attaInfo
);
}
}
// 同步审核权限、办理权限
this
.
saveAuditUserOrHandleUser
(
sysHouseHoldInfo
,
CommonConstants
.
ZERO_STRING
);
this
.
saveAuditUserOrHandleUser
(
sysHouseHoldInfo
,
CommonConstants
.
ONE_STRING
);
...
...
@@ -678,13 +714,49 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_THREE
,
excel
));
continue
;
}
//是否自动办理,选择是时,社保和医保信息必须填写其中一个,否则导入不成功
if
(!
excel
.
getAutoStatusYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
&&
!
excel
.
getAutoStatusYsd
().
equals
(
CommonConstants
.
IS_FALSE
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_THREE
,
excel
));
continue
;
}
//判断推送类型是否准确
if
(!
excel
.
getIsSingle
().
equals
(
CommonConstants
.
ZERO_STRING
)
&&
!
excel
.
getIsSingle
().
equals
(
CommonConstants
.
ONE_STRING
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_NINE
,
excel
));
continue
;
}
if
(!
excel
.
getIsSingleYsd
().
equals
(
CommonConstants
.
ZERO_STRING
)
&&
!
excel
.
getIsSingleYsd
().
equals
(
CommonConstants
.
ONE_STRING
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_NINE
,
excel
));
continue
;
}
//判断是否自动生成花名册 是否准确
if
(!
excel
.
getRosterAutoFlagYgs
().
equals
(
CommonConstants
.
IS_TRUE
)
&&
!
excel
.
getRosterAutoFlagYgs
().
equals
(
CommonConstants
.
IS_FALSE
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_TEN
,
excel
));
continue
;
}
if
(!
excel
.
getRosterAutoFlagYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
&&
!
excel
.
getRosterAutoFlagYsd
().
equals
(
CommonConstants
.
IS_FALSE
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_TEN
,
excel
));
continue
;
}
//判断是否仅补缴生成材料
if
(!
excel
.
getDataFlagYgs
().
equals
(
CommonConstants
.
IS_TRUE
)
&&
!
excel
.
getDataFlagYgs
().
equals
(
CommonConstants
.
IS_FALSE
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_ELVEN
,
excel
));
continue
;
}
if
(!
excel
.
getDataFlagYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
&&
!
excel
.
getDataFlagYsd
().
equals
(
CommonConstants
.
IS_FALSE
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_ELVEN
,
excel
));
continue
;
}
//是否自动办理,选择是时,社保和医保信息必须填写其中一个,否则导入不成功--》MVP1.7.15 选择是 社保信息必填
//选择否时,不做限制要求,可填可不填,导入时正常导入填写的字段
if
(
excel
.
getAutoStatus
().
equals
(
CommonConstants
.
IS_TRUE
)
&&
Common
.
isEmpty
(
excel
.
getSocialAccount
())
&&
Common
.
isEmpty
(
excel
.
getMediclAccount
())){
if
(
excel
.
getAutoStatus
().
equals
(
CommonConstants
.
IS_TRUE
)
&&
Common
.
isEmpty
(
excel
.
getSocialAccount
())){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_TWO
,
excel
));
continue
;
}
//MVP1.7.15 医保是否自动办理,选择是时,医保信息必须填写,否则导入不成功
if
(
excel
.
getAutoStatusYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
&&
Common
.
isEmpty
(
excel
.
getMediclAccount
())){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_TWO_TWO
,
excel
));
continue
;
}
//判断社保、医保账户和密码的对应关系
if
(((
Common
.
isEmpty
(
excel
.
getSocialAccount
()))
!=
(
Common
.
isEmpty
(
excel
.
getSocialPassword
())))
||
((
Common
.
isEmpty
(
excel
.
getMediclAccount
()))
!=
(
Common
.
isEmpty
(
excel
.
getMediclPassword
()))))
{
...
...
@@ -730,10 +802,15 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
//封装和插入数据
household
.
setAreaCode
(
areaMap
.
get
(
household
.
getCity
()).
getAreaCode
());
household
.
setAutoStatus
(
excel
.
getAutoStatus
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"0"
:
"1"
);
household
.
setAutoStatusYsd
(
excel
.
getAutoStatusYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"0"
:
"1"
);
household
.
setType
(
"0"
);
household
.
setHouseType
(
excel
.
getHouseType
().
equals
(
HouseConfigConstants
.
HOUSE_TYPE_ONE
)
?
"1"
:
"0"
);
household
.
setAuditUser
(
null
==
auditUser
.
getUserId
()
?
""
:
auditUser
.
getUserId
());
household
.
setHandleUser
(
null
==
handlerUser
.
getUserId
()
?
""
:
handlerUser
.
getUserId
());
household
.
setRosterAutoFlagYgs
(
excel
.
getRosterAutoFlagYgs
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
household
.
setRosterAutoFlagYsd
(
excel
.
getRosterAutoFlagYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
household
.
setDataFlagYgs
(
excel
.
getDataFlagYgs
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
household
.
setDataFlagYsd
(
excel
.
getDataFlagYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
household
.
setOrganId
(
dicMap
.
get
(
household
.
getOrganName
()));
baseMapper
.
insert
(
household
);
// 同步审核权限、办理权限
...
...
@@ -842,17 +919,102 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
continue
;
}
//判断是否自动办理是否准确
if
(!
excel
.
getAutoStatus
().
equals
(
CommonConstants
.
IS_TRUE
)
&&
!
excel
.
getAutoStatus
().
equals
(
CommonConstants
.
IS_FALSE
))
{
if
(
Common
.
isNotNull
(
excel
.
getAutoStatus
())
&&
!
excel
.
getAutoStatus
().
equals
(
CommonConstants
.
IS_TRUE
)
&&
!
excel
.
getAutoStatus
().
equals
(
CommonConstants
.
IS_FALSE
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_THREE
,
excel
));
continue
;
}
//是否自动办理,选择是时,社保和医保信息必须填写其中一个,否则导入不成功
if
(
Common
.
isNotNull
(
excel
.
getAutoStatusYsd
())
&&
!
excel
.
getAutoStatusYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
&&
!
excel
.
getAutoStatusYsd
().
equals
(
CommonConstants
.
IS_FALSE
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_THREE
,
excel
));
continue
;
}
//判断推送类型是否准确
if
(
Common
.
isNotNull
(
excel
.
getIsSingle
())
&&
!
excel
.
getIsSingle
().
equals
(
CommonConstants
.
ZERO_STRING
)
&&
!
excel
.
getIsSingle
().
equals
(
CommonConstants
.
ONE_STRING
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_NINE
,
excel
));
continue
;
}
if
(
Common
.
isNotNull
(
excel
.
getIsSingleYsd
())
&&
!
excel
.
getIsSingleYsd
().
equals
(
CommonConstants
.
ZERO_STRING
)
&&
!
excel
.
getIsSingleYsd
().
equals
(
CommonConstants
.
ONE_STRING
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_NINE
,
excel
));
continue
;
}
//判断是否自动生成花名册 是否准确
if
(
Common
.
isNotNull
(
excel
.
getRosterAutoFlagYgs
())
&&
!
excel
.
getRosterAutoFlagYgs
().
equals
(
CommonConstants
.
IS_TRUE
)
&&
!
excel
.
getRosterAutoFlagYgs
().
equals
(
CommonConstants
.
IS_FALSE
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_TEN
,
excel
));
continue
;
}
if
(
Common
.
isNotNull
(
excel
.
getRosterAutoFlagYsd
())
&&
!
excel
.
getRosterAutoFlagYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
&&
!
excel
.
getRosterAutoFlagYsd
().
equals
(
CommonConstants
.
IS_FALSE
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_TEN
,
excel
));
continue
;
}
//判断是否仅补缴生成材料
if
(
Common
.
isNotNull
(
excel
.
getDataFlagYgs
())
&&
!
excel
.
getDataFlagYgs
().
equals
(
CommonConstants
.
IS_TRUE
)
&&
!
excel
.
getDataFlagYgs
().
equals
(
CommonConstants
.
IS_FALSE
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_ELVEN
,
excel
));
continue
;
}
if
(
Common
.
isNotNull
(
excel
.
getDataFlagYsd
())
&&
!
excel
.
getDataFlagYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
&&
!
excel
.
getDataFlagYsd
().
equals
(
CommonConstants
.
IS_FALSE
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_ELVEN
,
excel
));
continue
;
}
//是否自动办理,选择是时,社保和医保信息必须填写其中一个,否则导入不成功 --》MVP1.7.15 社保自动化,选择否时,医保信息必须填写,否则导入不成功
//选择否时,不做限制要求,可填可不填,导入时正常导入填写的字段
if
(
excel
.
getAutoStatus
().
equals
(
CommonConstants
.
IS_TRUE
)
&&
Common
.
isEmpty
(
excel
.
getSocialAccount
())
&&
Common
.
isEmpty
(
excel
.
getMediclAccount
())){
if
(
excel
.
getAutoStatus
().
equals
(
CommonConstants
.
IS_TRUE
)
&&
Common
.
isEmpty
(
excel
.
getSocialAccount
())){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_TWO
,
excel
));
continue
;
}
// MVP1.7.15 医保自动化,选择是时,医保信息必须填写,否则导入不成功
if
(
excel
.
getAutoStatusYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
&&
Common
.
isEmpty
(
excel
.
getMediclAccount
())){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_TWO
,
excel
));
continue
;
}
if
(!
excel
.
getAutoStatusYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
&&
!
excel
.
getAutoStatusYsd
().
equals
(
CommonConstants
.
IS_FALSE
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_THREE
,
excel
));
continue
;
}
//判断推送类型是否准确
if
(!
excel
.
getIsSingle
().
equals
(
CommonConstants
.
ZERO_STRING
)
&&
!
excel
.
getIsSingle
().
equals
(
CommonConstants
.
ONE_STRING
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_NINE
,
excel
));
continue
;
}
if
(!
excel
.
getIsSingleYsd
().
equals
(
CommonConstants
.
ZERO_STRING
)
&&
!
excel
.
getIsSingleYsd
().
equals
(
CommonConstants
.
ONE_STRING
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_NINE
,
excel
));
continue
;
}
//判断是否自动生成花名册 是否准确
if
(!
excel
.
getRosterAutoFlagYgs
().
equals
(
CommonConstants
.
IS_TRUE
)
&&
!
excel
.
getRosterAutoFlagYgs
().
equals
(
CommonConstants
.
IS_FALSE
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_TEN
,
excel
));
continue
;
}
if
(!
excel
.
getRosterAutoFlagYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
&&
!
excel
.
getRosterAutoFlagYsd
().
equals
(
CommonConstants
.
IS_FALSE
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_TEN
,
excel
));
continue
;
}
//判断是否仅补缴生成材料
if
(!
excel
.
getDataFlagYgs
().
equals
(
CommonConstants
.
IS_TRUE
)
&&
!
excel
.
getDataFlagYgs
().
equals
(
CommonConstants
.
IS_FALSE
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_ELVEN
,
excel
));
continue
;
}
if
(!
excel
.
getDataFlagYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
&&
!
excel
.
getDataFlagYsd
().
equals
(
CommonConstants
.
IS_FALSE
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_ELVEN
,
excel
));
continue
;
}
//判断社保、医保账户和密码的对应关系
if
(((
Common
.
isEmpty
(
excel
.
getSocialAccount
()))
!=
(
Common
.
isEmpty
(
excel
.
getSocialPassword
())))
||
((
Common
.
isEmpty
(
excel
.
getMediclAccount
()))
!=
(
Common
.
isEmpty
(
excel
.
getMediclPassword
()))))
{
...
...
@@ -917,6 +1079,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
this
.
saveAuditUserOrHandleUser
(
info
,
CommonConstants
.
ZERO_STRING
);
}
//更新数据
updateHouseInfo
(
excel
,
info
,
userMap
);
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
CommonConstants
.
UPDATE_SUCCESS
,
excel
));
}
...
...
@@ -954,6 +1117,22 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if
(
Common
.
isNotNull
(
excel
.
getAutoStatus
()))
{
info
.
setAutoStatus
(
excel
.
getAutoStatus
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"0"
:
"1"
);
}
if
(
Common
.
isNotNull
(
excel
.
getAutoStatusYsd
()))
{
info
.
setAutoStatusYsd
(
excel
.
getAutoStatusYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"0"
:
"1"
);
}
if
(
Common
.
isNotNull
(
excel
.
getRosterAutoFlagYgs
()))
{
info
.
setRosterAutoFlagYgs
(
excel
.
getRosterAutoFlagYgs
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
}
if
(
Common
.
isNotNull
(
excel
.
getRosterAutoFlagYsd
()))
{
info
.
setRosterAutoFlagYsd
(
excel
.
getRosterAutoFlagYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
}
if
(
Common
.
isNotNull
(
excel
.
getDataFlagYgs
()))
{
info
.
setDataFlagYgs
(
excel
.
getDataFlagYgs
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
}
if
(
Common
.
isNotNull
(
excel
.
getDataFlagYsd
()))
{
info
.
setDataFlagYsd
(
excel
.
getDataFlagYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
}
if
(
Common
.
isNotNull
(
excel
.
getOrganName
()))
{
info
.
setOrganName
(
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