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
097f316a
Commit
097f316a
authored
May 22, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
派单优化及限制项导入优化-fxj
parent
ab597f07
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
29 deletions
+28
-29
TAutoMainRelServiceImpl.java
...1/yifu/archives/service/impl/TAutoMainRelServiceImpl.java
+8
-8
ErrorCodes.java
.../cloud/plus/v1/yifu/common/core/exception/ErrorCodes.java
+5
-0
messages_zh_CN.properties
...on-core/src/main/resources/i18n/messages_zh_CN.properties
+2
-0
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+13
-21
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TAutoMainRelServiceImpl.java
View file @
097f316a
...
...
@@ -2222,7 +2222,7 @@ private R<Boolean> checkItemRepeat(List<SysAutoDictItem> autoDictItems, Map<Stri
if
(
Common
.
isEmpty
(
entity
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"项目编码
配置
不存在: "
+
excel
.
getDeptNo
(),
excel
));
"项目编码不存在: "
+
excel
.
getDeptNo
(),
excel
));
return
;
}
//档案默认不限制
...
...
@@ -2240,7 +2240,7 @@ private R<Boolean> checkItemRepeat(List<SysAutoDictItem> autoDictItems, Map<Stri
// 校验autoFlag的值必须为0或1
if
(!
CommonConstants
.
ZERO_STRING
.
equals
(
newAutoFlag
)
&&
!
CommonConstants
.
ONE_STRING
.
equals
(
newAutoFlag
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"是否限制值不合法,必须为
限制或不限制
"
,
excel
));
"是否限制值不合法,必须为
0或1
"
,
excel
));
return
;
}
...
...
@@ -2249,7 +2249,7 @@ private R<Boolean> checkItemRepeat(List<SysAutoDictItem> autoDictItems, Map<Stri
!
CommonConstants
.
ZERO_STRING
.
equals
(
newRestrictInsurance
)
&&
!
CommonConstants
.
ONE_STRING
.
equals
(
newRestrictInsurance
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"商险限制值不合法,必须为
限制或不限制
"
,
excel
));
"商险限制值不合法,必须为
0或1
"
,
excel
));
return
;
}
...
...
@@ -2258,7 +2258,7 @@ private R<Boolean> checkItemRepeat(List<SysAutoDictItem> autoDictItems, Map<Stri
!
CommonConstants
.
ZERO_STRING
.
equals
(
newRestrictContract
)
&&
!
CommonConstants
.
ONE_STRING
.
equals
(
newRestrictContract
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"合同限制值不合法,必须为
限制或不限制
"
,
excel
));
"合同限制值不合法,必须为
0或1
"
,
excel
));
return
;
}
...
...
@@ -2267,7 +2267,7 @@ private R<Boolean> checkItemRepeat(List<SysAutoDictItem> autoDictItems, Map<Stri
!
CommonConstants
.
ZERO_STRING
.
equals
(
newRestrictSocialFund
)
&&
!
CommonConstants
.
ONE_STRING
.
equals
(
newRestrictSocialFund
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"社保公积金限制值不合法,必须为
限制或不限制
"
,
excel
));
"社保公积金限制值不合法,必须为
0或1
"
,
excel
));
return
;
}
...
...
@@ -2275,17 +2275,17 @@ private R<Boolean> checkItemRepeat(List<SysAutoDictItem> autoDictItems, Map<Stri
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
newAutoFlag
))
{
if
(
Common
.
isEmpty
(
newRestrictInsurance
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"是否限制为是时,商险不能为空"
,
excel
));
"是否限制为是时,
限制
商险不能为空"
,
excel
));
return
;
}
if
(
Common
.
isEmpty
(
newRestrictContract
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"是否限制为是时,合同不能为空"
,
excel
));
"是否限制为是时,
限制
合同不能为空"
,
excel
));
return
;
}
if
(
Common
.
isEmpty
(
newRestrictSocialFund
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"是否限制为是时,社保公积金不能为空"
,
excel
));
"是否限制为是时,
限制
社保公积金不能为空"
,
excel
));
return
;
}
// 限制项至少有一项为限制(1)
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/exception/ErrorCodes.java
View file @
097f316a
...
...
@@ -490,6 +490,11 @@ public interface ErrorCodes {
* 派增异常: 社保各项基数不一致,委托备注必填
*/
String
EMP_DISPATCH_SOCIAL_BASE_LIMIT_ERROR
=
"emp.dispatch.social.base.limit.error"
;
/**
* 派增异常: 社保各项基数与备案基数不一致,自定义类型 备案基数需要与各项基数一致(不含大病)
*/
String
EMP_DISPATCH_SOCIAL_BASE_RECORD_ERROR
=
"emp.dispatch.social.base.record.error"
;
/**
* 派增异常: 社保各项起缴日不一致,委托备注必填
*/
...
...
yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties
View file @
097f316a
...
...
@@ -178,6 +178,8 @@ emp.dispatch.fund.limit.error=\u6D3E\u589E\u5F02\u5E38\uFF1A \u516C\u79EF\u91D1\
emp.dispatch.social.base.limit.error
=
\u
6D3E
\u
589E
\u
5F02
\u
5E38
\u
FF1A
\u5907\u6848\u
57FA
\u6570\u
4E0E
\u
793E
\u
4FDD
\u
4EFB
\u
610F
\u
57FA
\u6570\u
4E0D
\u
4E00
\u
81F4
\u
FF0C
\u
59D4
\u6258\u5907\u
6CE8
\u
5FC5
\u
586B
emp.dispatch.social.base.record.error
=
\u
6D3E
\u
589E
\u
5F02
\u
5E38
\u
FF1A
\u
793E
\u
4FDD
\u5404\u9879\u
57FA
\u6570\u
4E0E
\u5907\u6848\u
57FA
\u6570\u
4E0D
\u
4E00
\u
81F4
\u
FF0C
\u
81EA
\u
5B9A
\u
4E49
\u
7C7B
\u
578B
\u5907\u6848\u
57FA
\u6570\u9700\u8981\u
4E0E
\u5404\u9879\u
57FA
\u6570\u
4E00
\u
81F4
\u
FF08
\u
4E0D
\u
542B
\u5927\u
75C5
\u
FF09
emp.dispatch.social.date.limit.error
=
\u
6D3E
\u
589E
\u
5F02
\u
5E38
\u
FF1A
\u
793E
\u
4FDD
\u9669\u
79CD
\u
8D77
\u
7F34
\u
65E5
\u
671F
\u
4E0D
\u
4E00
\u
81F4
\u
65F6
\u
FF0C
\u
201C
\u
59D4
\u6258\u5907\u
6CE8
\u
201D
\u5217\u
5FC5
\u
586B
\u
FF0C
\u
4E0D
\u
53EF
\u
4E3A
\u
7A7A
emp.dispatch.social.date.limit.error2
=
\u
6D3E
\u
589E
\u
5F02
\u
5E38
\u
FF1A
\u5408\u
540C
\u
8D77
\u
59CB
\u
65E5
\u
671F
\u
4E0E
\u
793E
\u
4FDD
\u
8D77
\u
7F34
\u
65E5
\u
671F
\u
4E0D
\u
4E00
\u
81F4
\u
65F6
\u
FF0C
\u
201C
\u
59D4
\u6258\u5907\u
6CE8
\u
201D
\u5217\u
5FC5
\u
586B
\u
FF0C
\u
4E0D
\u
53EF
\u
4E3A
\u
7A7A
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
097f316a
...
...
@@ -2855,10 +2855,23 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
}
if
(
Common
.
isNotNull
(
excel
.
getSocialHousehold
()))
{
// 校验备案基数范围(不含大病)
if
(
validateRecordBaseRange
(
errorMessageList
,
excel
,
socialSet
))
{
return
true
;
}
// 自定义 各项基数配置与备案基数不一致,就提示(不含大病)
if
(
CommonConstants
.
ONE_STRING
.
equals
(
excel
.
getPaymentType
()))
{
boolean
flag
=
Common
.
isBlankToBigDecimalZero
(
excel
.
getPensionCardinal
()).
compareTo
(
excel
.
getRecordBase
())
!=
CommonConstants
.
ZERO_INT
||
Common
.
isBlankToBigDecimalZero
(
excel
.
getMedicalCardinal
()).
compareTo
(
excel
.
getRecordBase
())
!=
CommonConstants
.
ZERO_INT
||
Common
.
isBlankToBigDecimalZero
(
excel
.
getUnemploymentCardinal
()).
compareTo
(
excel
.
getRecordBase
())
!=
CommonConstants
.
ZERO_INT
||
Common
.
isBlankToBigDecimalZero
(
excel
.
getWorkInjuryCardinal
()).
compareTo
(
excel
.
getRecordBase
())
!=
CommonConstants
.
ZERO_INT
||
Common
.
isBlankToBigDecimalZero
(
excel
.
getBirthCardinal
()).
compareTo
(
excel
.
getRecordBase
())
!=
CommonConstants
.
ZERO_INT
;
if
(
flag
)
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_SOCIAL_BASE_RECORD_ERROR
)));
return
true
;
}
}
// 根据缴纳类型赋值各险种基数(不含大病)
assignSocialCardinalByPaymentType
(
excel
,
socialSet
);
// 各个社保基数和日期空 默认养老日期和基数(兜底逻辑,包含大病)
...
...
@@ -3047,27 +3060,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
// 备案基数和养老基数 养老起缴日期 必填在前面已必填校验,这里不重复校验
if
(
Common
.
isNotNull
(
excel
.
getRecordBase
())
&&
Common
.
isNotNull
(
excel
.
getSocialHousehold
()))
{
// 自定义 只要有一个不相同的 日期或基数 就要提示
/*if (CommonConstants.ONE_STRING.equals(excel.getPaymentType()) && Common.isEmpty(excel.getTrustRemark())) {
boolean flag = (Common.isNotNull(excel.getPensionCardinal())
&& excel.getPensionCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT)
|| (Common.isNotNull(excel.getMedicalCardinal())
&& excel.getMedicalCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT)
|| (Common.isNotNull(excel.getUnemploymentCardinal())
&& excel.getUnemploymentCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT)
|| (Common.isNotNull(excel.getWorkInjuryCardinal())
&& excel.getWorkInjuryCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT)
|| (Common.isNotNull(excel.getBirthCardinal())
&& excel.getBirthCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT)
|| (Common.isNotNull(excel.getBigailmentCardinal())
&& CommonConstants.ONE_STRING.equals(socialSet.getCollectType())
&& CommonConstants.ONE_STRING.equals(socialSet.getValueType())
&& excel.getBigailmentCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT);
if (flag) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_BASE_LIMIT_ERROR)));
return true;
}
}*/
Date
temp
;
if
(
Common
.
isEmpty
(
empVo
))
{
temp
=
excel
.
getContractStart
();
...
...
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