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
6eb15037
Commit
6eb15037
authored
Jun 19, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.6.6' into MVP1.6.6
parents
11468c34
276af6ba
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
2 deletions
+15
-2
EmployeeConstants.java
...ud/plus/v1/yifu/archives/constants/EmployeeConstants.java
+2
-0
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+10
-2
TAutoPaymentDetailServiceImpl.java
...fu/social/service/impl/TAutoPaymentDetailServiceImpl.java
+3
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/constants/EmployeeConstants.java
View file @
6eb15037
...
...
@@ -33,6 +33,8 @@ public class EmployeeConstants {
public
static
final
String
DEPT_NO_EXIST
=
"未找到对应的项目,请核实"
;
public
static
final
String
CHECK_ERROR
=
"校验服务错误,请联系管理员!"
;
public
static
final
String
CHECK_NO_RESPONSE
=
"校验服务器未返回,请联系管理员!"
;
public
static
final
String
MARRY_STATUS_NOT_NULL
=
"婚姻状况不可为空"
;
public
static
final
String
POLITICAL_STATUS_NOT_NULL
=
"婚姻状况不可为空"
;
// 拦截合同使用
public
static
final
String
SITUATION_ONE
=
"正常签订"
;
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
6eb15037
...
...
@@ -818,10 +818,10 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
errorMsg
.
add
(
EmployeeConstants
.
EMP_NATIONAL
);
errorMsgMap
.
put
(
lineNum
,
new
ErrorMessage
(
EmployeeConstants
.
EMP_NATIONAL
));
}
if
(
Common
.
isEmpty
(
employeeInfo
.
getIdProvince
()))
{
/*
if (Common.isEmpty(employeeInfo.getIdProvince())) {
errorMsg.add(EmployeeConstants.ID_PROVINCE);
errorMsgMap.put(lineNum, new ErrorMessage(EmployeeConstants.ID_PROVINCE));
}
}
*/
if
(
Common
.
isEmpty
(
employeeInfo
.
getFileProvince
()))
{
errorMsg
.
add
(
EmployeeConstants
.
FILE_PROVINCE
);
errorMsgMap
.
put
(
lineNum
,
new
ErrorMessage
(
EmployeeConstants
.
FILE_PROVINCE
));
...
...
@@ -1078,6 +1078,14 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
errorMsg
=
new
HashSet
<>();
excel
=
excelVOList
.
get
(
i
);
//政治面貌不可为空
if
(
Common
.
isEmpty
(
excel
.
getEmpMarriStatus
())){
errorMsg
.
add
(
EmployeeConstants
.
MARRY_STATUS_NOT_NULL
);
}
//婚姻状态不可为空
if
(
Common
.
isEmpty
(
excel
.
getPoliticalStatus
())){
errorMsg
.
add
(
EmployeeConstants
.
POLITICAL_STATUS_NOT_NULL
);
}
if
(
deptMap
.
get
(
excel
.
getDeptNo
())
==
null
)
{
errorMsg
.
add
(
EmployeeConstants
.
DEPT_NO_ERROR
);
}
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TAutoPaymentDetailServiceImpl.java
View file @
6eb15037
...
...
@@ -312,6 +312,9 @@ public class TAutoPaymentDetailServiceImpl extends ServiceImpl<TAutoPaymentDetai
if
(
Common
.
isNotNull
(
details
)){
updateList
=
new
ArrayList
<>();
for
(
TAutoPaymentDetail
detail:
details
){
if
(
detail
.
getRepeatHandleFlag
().
equals
(
excel
.
getRepeatHandleFlag
())){
continue
;
}
detail
.
setRepeatHandleFlag
(
excel
.
getRepeatHandleFlag
());
updateList
.
add
(
detail
);
}
...
...
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