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
f4bc1b97
Commit
f4bc1b97
authored
Dec 10, 2024
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.3' into MVP1.7.3
parents
be903f2a
c98e4f23
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
99 additions
and
45 deletions
+99
-45
TSocialHouseholdExportVo.java
...loud/plus/v1/yifu/social/vo/TSocialHouseholdExportVo.java
+6
-0
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
+35
-0
SysHouseHoldInfoServiceImpl.java
...yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
+54
-41
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialHouseholdExportVo.java
View file @
f4bc1b97
...
...
@@ -34,7 +34,10 @@ import java.io.Serializable;
@Data
public
class
TSocialHouseholdExportVo
implements
Serializable
{
@ExcelAttribute
(
name
=
"账户性质"
)
@Schema
(
description
=
"账户性质"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"账户性质"
)
private
String
type
;
/**
...
...
@@ -176,7 +179,10 @@ public class TSocialHouseholdExportVo implements Serializable {
@ExcelProperty
(
"医保-登录密码"
)
private
String
mediclPassword
;
@ExcelAttribute
(
name
=
"是否配置公章"
)
@Schema
(
description
=
"是否配置公章"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"是否配置公章"
)
private
String
isSign
;
/**
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialHouseholdInsertVo.java
View file @
f4bc1b97
...
...
@@ -109,11 +109,11 @@ public class TSocialHouseholdInsertVo extends RowIndex implements Serializable {
/**
* 手机号
*/
@ExcelAttribute
(
name
=
"手机号"
,
maxLength
=
50
,
isNotEmpty
=
true
)
@ExcelAttribute
(
name
=
"手机号"
,
maxLength
=
50
,
isNotEmpty
=
true
,
isInteger
=
true
)
@Schema
(
description
=
"手机号"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"手机号"
)
private
String
phone
;
private
Integer
phone
;
/**
* 类型 0 独立户 1 自由户
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialHouseholdUpdateVo.java
View file @
f4bc1b97
...
...
@@ -104,11 +104,11 @@ public class TSocialHouseholdUpdateVo extends RowIndex implements Serializable {
/**
* 手机号
*/
@ExcelAttribute
(
name
=
"手机号"
,
maxLength
=
50
)
@ExcelAttribute
(
name
=
"手机号"
,
maxLength
=
50
,
isInteger
=
true
)
@Schema
(
description
=
"手机号"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"手机号"
)
private
String
phone
;
private
Integer
phone
;
/**
* 类型 0 独立户 1 自由户
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/constants/HouseConfigConstants.java
0 → 100644
View file @
f4bc1b97
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
social
.
constants
;
/**
* @author huych
* @description 户配置相关
* @date 2024/12/9
*/
public
class
HouseConfigConstants
{
public
static
final
String
HOUSE_TYPE_ONE
=
"自有户"
;
public
static
final
String
HOUSE_TYPE_TWO
=
"独立户"
;
public
static
final
String
ERROR_SAME_HOUSE
=
"模板中已存在相同户名的数据"
;
public
static
final
String
ERROR_NOT_EXIT
=
"未找到对应账户性质、户名的配置"
;
public
static
final
String
ERROR_IS_EXIT
=
"对应账户性质、户名的配置已存在"
;
public
static
final
String
ERROR_TEMPLATE_ONE
=
"户类型只能是【自有户】或者【独立户】"
;
public
static
final
String
ERROR_TEMPLATE_TWO
=
"是否自动办理,选择是时,社保和医保信息必须填写其中一个"
;
public
static
final
String
ERROR_TEMPLATE_THREE
=
"是否自动办理只能为【是】或者【否】"
;
public
static
final
String
ERROR_TEMPLATE_FOUR
=
"未找到对应的审核人或办理人的人员信息"
;
public
static
final
String
ERROR_TEMPLATE_FIVE
=
"社保账户,社保密码和医保账户,医保密码的账号和密码必须都填写或者都不填写"
;
public
static
final
String
ERROR_TEMPLATE_SIX
=
"省市的信息需要填写完善!"
;
public
static
final
String
SUCESS
=
"成功"
;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
View file @
f4bc1b97
This diff is collapsed.
Click to expand it.
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