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
3c1da978
Commit
3c1da978
authored
Mar 24, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-入职登记提交
parent
2a7b755a
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
47 additions
and
9 deletions
+47
-9
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+2
-2
EmployeeRegistrationUpdateVo.java
...fu/cloud/plus/v1/csp/vo/EmployeeRegistrationUpdateVo.java
+3
-0
TOperationLogService.java
.../yifu/cloud/plus/v1/csp/service/TOperationLogService.java
+2
-0
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+4
-7
TOperationLogServiceImpl.java
...ud/plus/v1/csp/service/impl/TOperationLogServiceImpl.java
+36
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
3c1da978
...
...
@@ -265,9 +265,9 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
//新增操作记录
EmployeeRegistrationUpdateVo
receiveVo
=
new
EmployeeRegistrationUpdateVo
();
receiveVo
.
setEmployeeName
(
user
.
getNickname
());
receiveVo
.
set
EmpIdcard
(
updatePre
.
getEmpIdcar
d
());
receiveVo
.
set
Id
(
updatePre
.
getI
d
());
receiveVo
.
setReason
(
employeeRegistrationPre
.
getReason
());
receiveVo
.
set
DeptNo
(
employeeRegistrationPre
.
getDeptNo
());
receiveVo
.
set
EmployeeId
(
user
.
getId
());
try
{
//调用csp服务更新状态和新增操作记录
cspDaprUtils
.
updateRegistByPreInfo
(
receiveVo
);
...
...
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/vo/EmployeeRegistrationUpdateVo.java
View file @
3c1da978
...
...
@@ -21,6 +21,9 @@ public class EmployeeRegistrationUpdateVo implements Serializable {
@Schema
(
description
=
"身份证号"
)
private
String
empIdcard
;
@Schema
(
description
=
"操作人人id"
)
private
String
employeeId
;
@Schema
(
description
=
"操作人人姓名"
)
private
String
employeeName
;
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/TOperationLogService.java
View file @
3c1da978
...
...
@@ -56,4 +56,6 @@ public interface TOperationLogService extends IService<TOperationLog> {
**/
TOperationLog
saveLog
(
String
mainId
,
String
type
,
String
title
,
LocalDateTime
operationTime
,
String
operationName
,
String
remark
);
TOperationLog
saveInnerLog
(
String
mainId
,
String
type
,
String
title
,
LocalDateTime
operationTime
,
String
operationName
,
String
remark
,
String
userId
);
}
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
3c1da978
...
...
@@ -713,17 +713,14 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
@Override
public
Boolean
updateRegistByPreInfo
(
EmployeeRegistrationUpdateVo
updateVo
)
{
EmployeeRegistration
registration
=
baseMapper
.
selectOne
(
Wrappers
.<
EmployeeRegistration
>
query
().
lambda
()
.
eq
(
EmployeeRegistration:
:
getEmpIdcard
,
updateVo
.
getEmpIdcard
())
.
eq
(
EmployeeRegistration:
:
getDeptNo
,
updateVo
.
getDeptNo
())
.
eq
(
EmployeeRegistration:
:
getFeedbackType
,
CommonConstants
.
ONE_STRING
)
.
in
(
EmployeeRegistration:
:
getProcessStatus
,
CommonConstants
.
processStatus
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
.
eq
(
EmployeeRegistration:
:
getId
,
updateVo
.
getId
())
.
in
(
EmployeeRegistration:
:
getProcessStatus
,
CommonConstants
.
processStatus
));
if
(
Common
.
isNotNull
(
registration
))
{
registration
.
setProcessStatus
(
CommonConstants
.
THREE_STRING
);
baseMapper
.
updateById
(
registration
);
//新增拒绝入职操作记录
logService
.
saveLog
(
registration
.
getId
(),
CommonConstants
.
ZERO_STRING
,
RegistConstants
.
BACK_RECEIVE
,
LocalDateTime
.
now
(),
updateVo
.
getEmployeeName
(),
"拒绝入职原因:"
+
updateVo
.
getReason
());
logService
.
save
Inner
Log
(
registration
.
getId
(),
CommonConstants
.
ZERO_STRING
,
RegistConstants
.
BACK_RECEIVE
,
LocalDateTime
.
now
(),
updateVo
.
getEmployeeName
(),
updateVo
.
getReason
(),
updateVo
.
getEmployeeId
());
}
return
true
;
}
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/TOperationLogServiceImpl.java
View file @
3c1da978
...
...
@@ -123,4 +123,40 @@ public class TOperationLogServiceImpl extends ServiceImpl<TOperationLogMapper, T
return
log
;
}
/**
* @param mainId 关联ID
* @param type 传0,就是入离职申请(可以为空)
* @param title 标题
* @param operationTime 操作时间
* @param operationName 操作人
* @param remark 备注(可以为空)
* @Description: 新增日志
* @Author: hgw
* @Date: 2025/2/28 16:13
* @return: com.yifu.cloud.plus.v1.csp.entity.TOperationLog
**/
@Override
public
TOperationLog
saveInnerLog
(
String
mainId
,
String
type
,
String
title
,
LocalDateTime
operationTime
,
String
operationName
,
String
remark
,
String
userId
)
{
if
(
Common
.
isEmpty
(
mainId
)
||
Common
.
isEmpty
(
title
)
||
Common
.
isEmpty
(
operationTime
)
||
Common
.
isEmpty
(
operationName
))
{
return
null
;
}
TOperationLog
log
=
new
TOperationLog
();
log
.
setMainId
(
mainId
);
if
(
Common
.
isEmpty
(
type
))
{
type
=
CommonConstants
.
ZERO_STRING
;
}
log
.
setType
(
type
);
log
.
setTitle
(
title
);
log
.
setOperationTime
(
operationTime
);
log
.
setOperationName
(
operationName
);
log
.
setRemark
(
remark
);
log
.
setCreateBy
(
userId
);
log
.
setCreateName
(
operationName
);
log
.
setCreateTime
(
LocalDateTime
.
now
());
this
.
save
(
log
);
return
log
;
}
}
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