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
2e336a5d
Commit
2e336a5d
authored
Mar 25, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.8' into MVP1.7.8
parents
898bbee4
0a07e095
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
6 deletions
+7
-6
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+2
-1
ScheduleServiceImpl.java
...us/v1/yifu/archives/service/impl/ScheduleServiceImpl.java
+0
-2
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+4
-2
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+1
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
2e336a5d
...
@@ -267,7 +267,8 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
...
@@ -267,7 +267,8 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
//新增操作记录
//新增操作记录
EmployeeRegistrationUpdateVo
receiveVo
=
new
EmployeeRegistrationUpdateVo
();
EmployeeRegistrationUpdateVo
receiveVo
=
new
EmployeeRegistrationUpdateVo
();
receiveVo
.
setEmployeeName
(
user
.
getNickname
());
receiveVo
.
setEmployeeName
(
user
.
getNickname
());
receiveVo
.
setId
(
updatePre
.
getId
());
receiveVo
.
setDeptNo
(
updatePre
.
getDeptNo
());
receiveVo
.
setEmpIdcard
(
updatePre
.
getEmpIdcard
());
receiveVo
.
setReason
(
employeeRegistrationPre
.
getReason
());
receiveVo
.
setReason
(
employeeRegistrationPre
.
getReason
());
receiveVo
.
setEmployeeId
(
user
.
getId
());
receiveVo
.
setEmployeeId
(
user
.
getId
());
try
{
try
{
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/ScheduleServiceImpl.java
View file @
2e336a5d
...
@@ -6,7 +6,6 @@ import com.yifu.cloud.plus.v1.yifu.archives.service.ScheduleService;
...
@@ -6,7 +6,6 @@ import com.yifu.cloud.plus.v1.yifu.archives.service.ScheduleService;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.SendMessageUpdateVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.SendMessageUpdateVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.context.annotation.Lazy
;
import
org.springframework.scheduling.TaskScheduler
;
import
org.springframework.scheduling.TaskScheduler
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.support.TransactionTemplate
;
import
org.springframework.transaction.support.TransactionTemplate
;
...
@@ -20,7 +19,6 @@ import java.util.List;
...
@@ -20,7 +19,6 @@ import java.util.List;
public
class
ScheduleServiceImpl
implements
ScheduleService
{
public
class
ScheduleServiceImpl
implements
ScheduleService
{
@Autowired
@Autowired
@Lazy
private
EmployeeRegistrationPreService
registrationPreService
;
private
EmployeeRegistrationPreService
registrationPreService
;
@Autowired
@Autowired
private
TaskScheduler
taskScheduler
;
private
TaskScheduler
taskScheduler
;
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
2e336a5d
...
@@ -725,8 +725,10 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -725,8 +725,10 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
@Override
@Override
public
Boolean
updateRegistByPreInfo
(
EmployeeRegistrationUpdateVo
updateVo
)
{
public
Boolean
updateRegistByPreInfo
(
EmployeeRegistrationUpdateVo
updateVo
)
{
EmployeeRegistration
registration
=
baseMapper
.
selectOne
(
Wrappers
.<
EmployeeRegistration
>
query
().
lambda
()
EmployeeRegistration
registration
=
baseMapper
.
selectOne
(
Wrappers
.<
EmployeeRegistration
>
query
().
lambda
()
.
eq
(
EmployeeRegistration:
:
getId
,
updateVo
.
getId
())
.
eq
(
EmployeeRegistration:
:
getDeptNo
,
updateVo
.
getDeptNo
())
.
in
(
EmployeeRegistration:
:
getProcessStatus
,
CommonConstants
.
processStatus
));
.
eq
(
EmployeeRegistration:
:
getEmpIdcard
,
updateVo
.
getEmpIdcard
())
.
in
(
EmployeeRegistration:
:
getProcessStatus
,
CommonConstants
.
processStatus
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
registration
))
{
if
(
Common
.
isNotNull
(
registration
))
{
registration
.
setProcessStatus
(
CommonConstants
.
THREE_STRING
);
registration
.
setProcessStatus
(
CommonConstants
.
THREE_STRING
);
baseMapper
.
updateById
(
registration
);
baseMapper
.
updateById
(
registration
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
2e336a5d
...
@@ -4810,7 +4810,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -4810,7 +4810,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if
((
Common
.
isEmpty
(
sf
.
getPensionHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
sf
.
getPensionHandle
())
||
CommonConstants
.
THREE_STRING
.
equals
(
sf
.
getPensionHandle
()))
if
((
Common
.
isEmpty
(
sf
.
getPensionHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
sf
.
getPensionHandle
())
||
CommonConstants
.
THREE_STRING
.
equals
(
sf
.
getPensionHandle
()))
&&
(
Common
.
isEmpty
(
sf
.
getMedicalHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
sf
.
getMedicalHandle
())
||
CommonConstants
.
THREE_STRING
.
equals
(
sf
.
getMedicalHandle
()))
&&
(
Common
.
isEmpty
(
sf
.
getMedicalHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
sf
.
getMedicalHandle
())
||
CommonConstants
.
THREE_STRING
.
equals
(
sf
.
getMedicalHandle
()))
&&
(
Common
.
isEmpty
(
sf
.
getUnemployHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
sf
.
getUnemployHandle
())
||
CommonConstants
.
THREE_STRING
.
equals
(
sf
.
getUnemployHandle
()))
&&
(
Common
.
isEmpty
(
sf
.
getUnemployHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
sf
.
getUnemployHandle
())
||
CommonConstants
.
THREE_STRING
.
equals
(
sf
.
getUnemployHandle
()))
&&
(
Common
.
isEmpty
(
sf
.
getWorkInjuryHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
sf
.
getWorkInjuryHandle
())
||
CommonConstants
.
THREE_STRING
.
equals
(
sf
.
get
Birth
Handle
()))
&&
(
Common
.
isEmpty
(
sf
.
getWorkInjuryHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
sf
.
getWorkInjuryHandle
())
||
CommonConstants
.
THREE_STRING
.
equals
(
sf
.
get
WorkInjury
Handle
()))
&&
(
Common
.
isEmpty
(
sf
.
getBirthHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
sf
.
getBirthHandle
())
||
CommonConstants
.
THREE_STRING
.
equals
(
sf
.
getBirthHandle
()))
&&
(
Common
.
isEmpty
(
sf
.
getBirthHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
sf
.
getBirthHandle
())
||
CommonConstants
.
THREE_STRING
.
equals
(
sf
.
getBirthHandle
()))
&&
(
Common
.
isEmpty
(
sf
.
getBigailmentHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
sf
.
getBigailmentHandle
())
||
CommonConstants
.
THREE_STRING
.
equals
(
sf
.
getBigailmentHandle
())))
{
&&
(
Common
.
isEmpty
(
sf
.
getBigailmentHandle
())
||
CommonConstants
.
TWO_STRING
.
equals
(
sf
.
getBigailmentHandle
())
||
CommonConstants
.
THREE_STRING
.
equals
(
sf
.
getBigailmentHandle
())))
{
sf
.
setSocialStatus
(
CommonConstants
.
EIGHT_STRING
);
sf
.
setSocialStatus
(
CommonConstants
.
EIGHT_STRING
);
...
...
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