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
d0c12e76
Commit
d0c12e76
authored
Oct 11, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
社保自动化配置-fxj
parent
12d9832a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
9 deletions
+8
-9
TAutoSocialRuleInfo.java
...oud/plus/v1/yifu/archives/entity/TAutoSocialRuleInfo.java
+1
-2
TAutoMainRelAddVo.java
...ifu/cloud/plus/v1/yifu/archives/vo/TAutoMainRelAddVo.java
+1
-1
TAutoSocialRuleInfoVo.java
...cloud/plus/v1/yifu/archives/vo/TAutoSocialRuleInfoVo.java
+1
-2
TAutoMainRelServiceImpl.java
...1/yifu/archives/service/impl/TAutoMainRelServiceImpl.java
+5
-4
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TAutoSocialRuleInfo.java
View file @
d0c12e76
...
@@ -52,8 +52,7 @@ public class TAutoSocialRuleInfo extends BaseEntity {
...
@@ -52,8 +52,7 @@ public class TAutoSocialRuleInfo extends BaseEntity {
/**
/**
* 项目配置ID
* 项目配置ID
*/
*/
@ExcelAttribute
(
name
=
"项目配置ID"
,
isNotEmpty
=
true
,
errorInfo
=
"项目配置ID不能为空"
,
maxLength
=
32
)
@ExcelAttribute
(
name
=
"项目配置ID"
,
isNotEmpty
=
false
,
errorInfo
=
"项目配置ID不能为空"
,
maxLength
=
32
)
@NotBlank
(
message
=
"项目配置ID不能为空"
)
@Length
(
max
=
32
,
message
=
"项目配置ID不能超过32个字符"
)
@Length
(
max
=
32
,
message
=
"项目配置ID不能超过32个字符"
)
@ExcelProperty
(
"项目配置ID"
)
@ExcelProperty
(
"项目配置ID"
)
@Schema
(
description
=
"项目配置ID"
)
@Schema
(
description
=
"项目配置ID"
)
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TAutoMainRelAddVo.java
View file @
d0c12e76
...
@@ -48,7 +48,7 @@ public class TAutoMainRelAddVo implements Serializable {
...
@@ -48,7 +48,7 @@ public class TAutoMainRelAddVo implements Serializable {
private
List
<
TAutoContractScheme
>
contractSchemes
;
private
List
<
TAutoContractScheme
>
contractSchemes
;
//社保规则主表
//社保规则主表
private
TAutoSocialRuleInfo
autoS
ocialRuleInfo
;
private
TAutoSocialRuleInfo
s
ocialRuleInfo
;
//社保规则明细表
//社保规则明细表
private
List
<
TAutoSocialRuleRel
>
socialRuleRels
;
private
List
<
TAutoSocialRuleRel
>
socialRuleRels
;
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TAutoSocialRuleInfoVo.java
View file @
d0c12e76
...
@@ -50,9 +50,8 @@ public class TAutoSocialRuleInfoVo extends RowIndex implements Serializable {
...
@@ -50,9 +50,8 @@ public class TAutoSocialRuleInfoVo extends RowIndex implements Serializable {
/**
/**
* 项目配置ID
* 项目配置ID
*/
*/
@NotBlank
(
message
=
"项目配置ID 不能为空"
)
@Length
(
max
=
32
,
message
=
"项目配置ID 不能超过32 个字符"
)
@Length
(
max
=
32
,
message
=
"项目配置ID 不能超过32 个字符"
)
@ExcelAttribute
(
name
=
"项目配置ID"
,
isNotEmpty
=
tru
e
,
errorInfo
=
"项目配置ID 不能为空"
,
maxLength
=
32
)
@ExcelAttribute
(
name
=
"项目配置ID"
,
isNotEmpty
=
fals
e
,
errorInfo
=
"项目配置ID 不能为空"
,
maxLength
=
32
)
@Schema
(
description
=
"项目配置ID"
)
@Schema
(
description
=
"项目配置ID"
)
@ExcelProperty
(
"项目配置ID"
)
@ExcelProperty
(
"项目配置ID"
)
private
String
mainId
;
private
String
mainId
;
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TAutoMainRelServiceImpl.java
View file @
d0c12e76
...
@@ -374,7 +374,7 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
...
@@ -374,7 +374,7 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
return
PARAM_IS_NOT_ERROR
;
return
PARAM_IS_NOT_ERROR
;
}
}
//校验社保规则主表信息
//校验社保规则主表信息
TAutoSocialRuleInfo
autoSocialRuleInfo
=
entity
.
get
Auto
SocialRuleInfo
();
TAutoSocialRuleInfo
autoSocialRuleInfo
=
entity
.
getSocialRuleInfo
();
if
(
Common
.
isNotNull
(
autoSocialRuleInfo
)){
if
(
Common
.
isNotNull
(
autoSocialRuleInfo
)){
ExcelUtil
<
TAutoSocialRuleInfo
>
excelUtil
=
new
ExcelUtil
<>(
TAutoSocialRuleInfo
.
class
);
ExcelUtil
<
TAutoSocialRuleInfo
>
excelUtil
=
new
ExcelUtil
<>(
TAutoSocialRuleInfo
.
class
);
ErrorMessage
errorMessage
=
excelUtil
.
checkEntity
(
autoSocialRuleInfo
,
0
);
ErrorMessage
errorMessage
=
excelUtil
.
checkEntity
(
autoSocialRuleInfo
,
0
);
...
@@ -712,7 +712,7 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
...
@@ -712,7 +712,7 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
}
}
//校验社保规则主表信息
//校验社保规则主表信息
TAutoSocialRuleInfo
autoSocialRuleNew
=
entity
.
get
Auto
SocialRuleInfo
();
TAutoSocialRuleInfo
autoSocialRuleNew
=
entity
.
getSocialRuleInfo
();
TAutoSocialRuleInfo
autoSocialRuleOld
=
null
;
TAutoSocialRuleInfo
autoSocialRuleOld
=
null
;
if
(
Common
.
isNotNull
(
autoSocialRuleNew
)){
if
(
Common
.
isNotNull
(
autoSocialRuleNew
)){
// 检查社保规则信息的有效性
// 检查社保规则信息的有效性
...
@@ -805,6 +805,7 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
...
@@ -805,6 +805,7 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
if
(
Common
.
isNotNull
(
autoSocialRuleNew
.
getId
())){
if
(
Common
.
isNotNull
(
autoSocialRuleNew
.
getId
())){
autoSocialRuleNew
.
setUpdateBy
(
user
.
getId
());
autoSocialRuleNew
.
setUpdateBy
(
user
.
getId
());
autoSocialRuleNew
.
setUpdateTime
(
LocalDateTime
.
now
());
autoSocialRuleNew
.
setUpdateTime
(
LocalDateTime
.
now
());
autoContractRuleNew
.
setMainId
(
autoMainRel
.
getId
());
autoSocialRuleInfoMapper
.
updateById
(
autoSocialRuleNew
);
autoSocialRuleInfoMapper
.
updateById
(
autoSocialRuleNew
);
}
else
{
}
else
{
autoSocialRuleNew
.
setDeptNo
(
autoMainRel
.
getDeptNo
());
autoSocialRuleNew
.
setDeptNo
(
autoMainRel
.
getDeptNo
());
...
@@ -1330,11 +1331,11 @@ private R<Boolean> checkItemRepeat(List<SysAutoDictItem> autoDictItems, Map<Stri
...
@@ -1330,11 +1331,11 @@ private R<Boolean> checkItemRepeat(List<SysAutoDictItem> autoDictItems, Map<Stri
// 添加了异常处理,避免 recordBase 不是合法数字格式时程序崩溃
// 添加了异常处理,避免 recordBase 不是合法数字格式时程序崩溃
if
(
CommonConstants
.
TWO_STRING
.
equals
(
rel
.
getPaymentType
()))
{
if
(
CommonConstants
.
TWO_STRING
.
equals
(
rel
.
getPaymentType
()))
{
if
(
BigDecimal
.
valueOf
(
Double
.
valueOf
(
rel
.
getRecordBase
())).
compareTo
(
setInfo
.
getUpperLimit
())
!=
0
)
{
if
(
BigDecimal
.
valueOf
(
Double
.
valueOf
(
rel
.
getRecordBase
())).
compareTo
(
setInfo
.
getUpperLimit
())
!=
0
)
{
return
R
.
failed
(
"备案基数不等于社保户最高基数
"
);
return
R
.
failed
(
"备案基数不等于社保户最高基数
:"
+
setInfo
.
getUpperLimit
()
);
}
}
}
else
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
rel
.
getPaymentType
())){
}
else
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
rel
.
getPaymentType
())){
if
(
BigDecimal
.
valueOf
(
Double
.
valueOf
(
rel
.
getRecordBase
())).
compareTo
(
setInfo
.
getLowerLimit
())
!=
0
)
{
if
(
BigDecimal
.
valueOf
(
Double
.
valueOf
(
rel
.
getRecordBase
())).
compareTo
(
setInfo
.
getLowerLimit
())
!=
0
)
{
return
R
.
failed
(
"备案基数不等于社保户最低基数
"
);
return
R
.
failed
(
"备案基数不等于社保户最低基数
:"
+
setInfo
.
getLowerLimit
()
);
}
}
}
}
}
catch
(
NumberFormatException
e
)
{
}
catch
(
NumberFormatException
e
)
{
...
...
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