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
6c1c0402
Commit
6c1c0402
authored
Oct 27, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
派单自定义提示优化
parent
a87f1790
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
38 additions
and
9 deletions
+38
-9
EmployeeXProjectVO.java
...fu/cloud/plus/v1/yifu/archives/vo/EmployeeXProjectVO.java
+1
-1
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+1
-1
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
+29
-7
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeXProjectVO.java
View file @
6c1c0402
...
...
@@ -71,7 +71,7 @@ public class EmployeeXProjectVO extends RowIndex implements Serializable {
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"减项原因"
)
@NotNull
(
message
=
"减项原因不能为空"
)
@ExcelAttribute
(
name
=
"减项原因"
,
isNotEmpty
=
true
,
errorInfo
=
"减项原因不能为空"
,
maxLength
=
100
,
isDataId
=
true
,
dataType
=
"
reduce_project
_reason"
)
@ExcelAttribute
(
name
=
"减项原因"
,
isNotEmpty
=
true
,
errorInfo
=
"减项原因不能为空"
,
maxLength
=
100
,
isDataId
=
true
,
dataType
=
"
social_reduce
_reason"
)
private
String
leaveReason
;
/**
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
6c1c0402
...
...
@@ -600,7 +600,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
if
(
dictMap
==
null
)
{
return
R
.
failed
(
"获取字典失败!!"
);
}
empReduceMap
=
dictMap
.
get
(
"
reduce_project
_reason"
);
empReduceMap
=
dictMap
.
get
(
"
social_reduce
_reason"
);
}
String
leaveReason
=
""
;
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/exception/ErrorCodes.java
View file @
6c1c0402
...
...
@@ -424,6 +424,11 @@ public interface ErrorCodes {
* 派增异常: 自定义缴纳养老基数不可为空
*/
String
EMP_DISPATCH_SOCIAL_DIY_NOT_EMPTY
=
"emp.dispatch.social.diy.not.empty"
;
/**
* 派增异常: 自定义缴纳养老基数或养老起缴日期不可为空
*/
String
EMP_DISPATCH_SOCIAL_DIY_MEDICAL_NOT_EMPTY
=
"emp.dispatch.social.diy.medical_not.empty"
;
/**
* 派增异常: 对应项目编码的项目档案已减项,请去项目档案处复项
*/
...
...
yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties
View file @
6c1c0402
...
...
@@ -155,6 +155,8 @@ socialinfo.list.num.large=\u5F53\u524D\u793E\u4FDD\u5BFC\u5165\u961F\u5217\u4E0D
emp.dispatch.social.diy.not.empty
=
\u
6D3E
\u
589E
\u
5F02
\u
5E38
\u
FF1A
\u
81EA
\u
5B9A
\u
4E49
\u
7F34
\u
7EB3
\u
517B
\u8001\u
57FA
\u6570\u
4E0D
\u
53EF
\u
4E3A
\u
7A7A
emp.dispatch.social.diy.medical_not.empty
=
\u
6D3E
\u
589E
\u
5F02
\u
5E38
\u
FF1A
\u
81EA
\u
5B9A
\u
4E49
\u
7F34
\u
7EB3
\u
517B
\u8001\u
57FA
\u6570\u6216\u
517B
\u8001\u
8D77
\u
7F34
\u
65E5
\u
671F
\u
4E0D
\u
53EF
\u
4E3A
\u
7A7A
emp.dispatch.emp.project.not.used
=
\u
6D3E
\u
589E
\u
5F02
\u
5E38
\u
FF1A
\u
5BF9
\u
5E94
\u9879\u
76EE
\u
7F16
\u7801\u7684\u9879\u
76EE
\u6863\u6848\u
5DF2
\u
51CF
\u9879\u
FF0C
\u
8BF7
\u
53BB
\u9879\u
76EE
\u6863\u6848\u5904\u
590D
\u9879
emp.dispatch.emp.not.used
=
\u
6D3E
\u
589E
\u
5F02
\u
5E38
\u
FF1A
\u
5BF9
\u
5E94
\u
8EAB
\u
4EFD
\u
8BC1
\u7684\u
4EBA
\u5458\u6863\u6848\u
5DF2
\u
51CF
\u6863
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
6c1c0402
...
...
@@ -2131,14 +2131,36 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
return
true
;
}
// 非自定义的 基数 起缴日期不可空
if
(
Common
.
isNotNull
(
excel
.
getSocialHousehold
())
&&
!
CommonConstants
.
ONE_STRING
.
equals
(
excel
.
getPaymentType
())
if
(
Common
.
isNotNull
(
excel
.
getSocialHousehold
())
){
if
(
!
CommonConstants
.
ONE_STRING
.
equals
(
excel
.
getPaymentType
())
&&
(
Common
.
isEmpty
(
excel
.
getRecordBase
())
||
Common
.
isEmpty
(
excel
.
getPensionStart
(
))
)
)
{
||
Common
.
isEmpty
(
excel
.
getPensionStart
()
))
)
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_SOCIAL_NOT_EMPTY
)));
return
true
;
}
if
(
CommonConstants
.
ONE_STRING
.
equals
(
excel
.
getPaymentType
())
&&
(
Common
.
isNullOrZero
(
excel
.
getPensionCardinal
())
||
Common
.
isEmpty
(
excel
.
getPensionStart
()))
&&
!(
Common
.
isEmpty
(
excel
.
getPensionStart
())
&&
Common
.
isNotNull
(
excel
.
getWorkInjuryStart
())
&&
Common
.
isEmpty
(
excel
.
getMedicalStart
())
&&
Common
.
isEmpty
(
excel
.
getBirthStart
())
&&
Common
.
isEmpty
(
excel
.
getUnemployStart
())
&&
Common
.
isEmpty
(
excel
.
getBigailmentStart
())
&&
Common
.
isNullOrZero
(
excel
.
getPensionCardinal
())
&&
Common
.
isNullOrZero
(
excel
.
getMedicalCardinal
())
&&
Common
.
isNullOrZero
(
excel
.
getBirthCardinal
())
&&
Common
.
isNullOrZero
(
excel
.
getUnemploymentCardinal
())
&&
!
Common
.
isNullOrZero
(
excel
.
getWorkInjuryCardinal
())
&&
Common
.
isNullOrZero
(
excel
.
getBigailmentCardinal
())
)
){
//养老基数为空 兼职工伤除外
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_SOCIAL_DIY_MEDICAL_NOT_EMPTY
)));
return
true
;
}
}
// 兼职工伤 的起缴日期不可为空
if
(
CommonConstants
.
ONE_STRING
.
equals
(
excel
.
getPaymentType
())
&&
Common
.
isEmpty
(
excel
.
getPensionCardinal
())
...
...
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