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
29000779
Commit
29000779
authored
Jul 12, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into develop
parents
0922cbad
481ed42e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
42 additions
and
6 deletions
+42
-6
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+32
-0
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+10
-6
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
29000779
...
...
@@ -162,6 +162,38 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
return
R
.
failed
(
"根据id未找到档案!"
+
employeeInfo
.
getId
());
}
// 校验手机号:
if
(
Common
.
isEmpty
(
employeeInfo
.
getEmpPhone
()))
{
return
R
.
failed
(
"手机号必填!"
);
}
else
{
TEmployeeInfo
check
=
new
TEmployeeInfo
();
check
.
setDeleteFlag
(
CommonConstants
.
STATUS_NORMAL
);
check
.
setEmpPhone
(
employeeInfo
.
getEmpPhone
());
List
<
TEmployeeInfo
>
list
=
baseMapper
.
getList
(
check
);
if
(
list
!=
null
&&
!
list
.
isEmpty
())
{
for
(
TEmployeeInfo
e
:
list
)
{
if
(!
e
.
getEmpIdcard
().
equals
(
employeeInfo
.
getEmpIdcard
()))
{
return
R
.
failed
(
MsgUtils
.
getMessage
(
ErrorCodes
.
ARCHIVES_IMPORT_EMP_PHONE_EXIST_ERROR
,
employeeInfo
.
getEmpIdcard
()));
}
}
}
// 调用校验服务-校验手机号
TCheckMobile
checkMobile
=
new
TCheckMobile
();
checkMobile
.
setMobile
(
employeeInfo
.
getEmpPhone
());
R
<
TCheckMobile
>
a
=
HttpDaprUtil
.
invokeMethodPost
(
daprCheckProperties
.
getAppUrl
(),
daprCheckProperties
.
getAppId
()
,
"/tcheckmobile/inner/checkOneMobile"
,
checkMobile
,
TCheckMobile
.
class
,
SecurityConstants
.
FROM_IN
);
if
(
a
!=
null
&&
a
.
getData
()
!=
null
)
{
checkMobile
=
a
.
getData
();
if
(
checkMobile
!=
null
&&
Common
.
isNotNull
(
checkMobile
.
getStatus
()))
{
if
(!
CommonConstants
.
ONE_STRING
.
equals
(
checkMobile
.
getStatus
()))
{
return
R
.
failed
(
checkMobile
.
getMessage
());
}
}
else
{
return
R
.
failed
(
"校验服务错误,请联系管理员!"
);
}
}
}
employeeInfo
.
setUpdateBy
(
user
.
getId
());
employeeInfo
.
setUpdateTime
(
LocalDateTime
.
now
());
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
29000779
...
...
@@ -397,6 +397,14 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
return
R
.
failed
(
"该人员存在其他进行中的项目,禁止同步减档!"
);
}
tEmployeeInfo
.
setFileStatus
(
CommonConstants
.
dingleDigitIntArray
[
1
]);
tEmployeeInfo
.
setLeaveReason
(
tEmployeeProject
.
getLeaveReason
());
if
(
Common
.
isNotNull
(
tEmployeeProject
.
getLeaveRemark
()))
{
tEmployeeInfo
.
setLeaveRemark
(
tEmployeeProject
.
getLeaveRemark
());
}
tEmployeeInfo
.
setLeaveTime
(
DateUtil
.
getCurrentDateTime
());
YifuUser
user
=
SecurityUtils
.
getUser
();
tEmployeeInfo
.
setLeaveUser
(
user
.
getId
());
tEmployeeInfo
.
setLeaveUserName
(
user
.
getNickname
());
code
=
CommonConstants
.
ONE_STRING
;
}
else
{
//从剩下的项目档案中查找员工类型并更新
...
...
@@ -414,11 +422,6 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
if
(
tEmployeeInfo
.
getProjectNum
()
!=
CommonConstants
.
ZERO_INT
)
{
tEmployeeInfo
.
setProjectNum
(
tEmployeeInfo
.
getProjectNum
()
-
CommonConstants
.
ONE_INT
);
}
tEmployeeInfo
.
setLeaveReason
(
tEmployeeProject
.
getLeaveReason
());
if
(
Common
.
isNotNull
(
tEmployeeProject
.
getLeaveRemark
()))
{
tEmployeeInfo
.
setLeaveRemark
(
tEmployeeProject
.
getLeaveRemark
());
}
tEmployeeInfo
.
setLeaveTime
(
DateUtil
.
getCurrentDateTime
());
tEmployeeInfoMapper
.
updateById
(
tEmployeeInfo
);
tEmployeeLogService
.
saveModificationRecord
(
CommonConstants
.
dingleDigitIntArray
[
0
],
tEmployeeInfo
.
getId
(),
""
,
tEmployeeInfoOld
,
tEmployeeInfo
);
...
...
@@ -1006,7 +1009,8 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
}
List
<
TEmployeeProject
>
list
=
new
ArrayList
<>();
if
(
Common
.
isNotEmpty
(
idsList
))
{
list
=
baseMapper
.
selectList
(
Wrappers
.<
TEmployeeProject
>
query
().
lambda
().
in
(
TEmployeeProject:
:
getId
,
idsList
));
list
=
baseMapper
.
selectList
(
Wrappers
.<
TEmployeeProject
>
query
().
lambda
().
in
(
TEmployeeProject:
:
getId
,
idsList
)
.
eq
(
TEmployeeProject:
:
getProjectStatus
,
CommonConstants
.
ZERO_INT
));
}
if
(
Common
.
isNotEmpty
(
list
))
{
int
i
=
0
;
...
...
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