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
584294f8
Commit
584294f8
authored
Feb 28, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.7' into MVP1.7.7
parents
6fcb0d3d
eaf7652d
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
6 deletions
+8
-6
EmployeeRegistration.java
...m/yifu/cloud/plus/v1/csp/entity/EmployeeRegistration.java
+1
-1
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+7
-5
No files found.
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/entity/EmployeeRegistration.java
View file @
584294f8
...
@@ -78,7 +78,7 @@ public class EmployeeRegistration extends BaseEntity {
...
@@ -78,7 +78,7 @@ public class EmployeeRegistration extends BaseEntity {
@Schema
(
description
=
"客服手机号"
)
@Schema
(
description
=
"客服手机号"
)
private
String
customerPhone
;
private
String
customerPhone
;
@Schema
(
description
=
"客服姓名
号
"
)
@Schema
(
description
=
"客服姓名"
)
private
String
customerUsername
;
private
String
customerUsername
;
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
584294f8
...
@@ -298,16 +298,17 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -298,16 +298,17 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
}
//点击“接收确认”的时候,监测到该人员该项目下已有在项的档案时,再次提醒:该人员已在项,
//点击“接收确认”的时候,监测到该人员该项目下已有在项的档案时,再次提醒:该人员已在项,
//状态将更新成“已处理”;处理记录中,针对此情况,记录真实的进项时间,备注:先于登记入项
//状态将更新成“已处理”;处理记录中,针对此情况,记录真实的进项时间,备注:先于登记入项
if
(
CommonConstants
.
ONE_STRING
.
equals
(
registration
.
getFeedbackType
()))
{
if
(
CommonConstants
.
ONE_STRING
.
equals
(
registration
Now
.
getFeedbackType
()))
{
EmpProjectStatusVo
vo
=
new
EmpProjectStatusVo
();
EmpProjectStatusVo
vo
=
new
EmpProjectStatusVo
();
vo
.
setEmpIdcard
(
registration
.
getEmpIdcard
());
vo
.
setEmpIdcard
(
registration
Now
.
getEmpIdcard
());
vo
.
setDeptNo
(
registration
.
getDeptNo
());
vo
.
setDeptNo
(
registration
Now
.
getDeptNo
());
EmpProjectStatusVo
exit
=
getEmpProjectStatus
(
vo
);
EmpProjectStatusVo
exit
=
getEmpProjectStatus
(
vo
);
if
(
Common
.
isNotNull
(
exit
))
{
if
(
Common
.
isNotNull
(
exit
))
{
return
R
.
ok
(
CommonConstants
.
ONE_STRING
);
return
R
.
ok
(
CommonConstants
.
ONE_STRING
);
}
}
}
}
baseMapper
.
updateById
(
registration
);
registrationNow
.
setProcessStatus
(
CommonConstants
.
ZERO_STRING
);
baseMapper
.
updateById
(
registrationNow
);
return
R
.
ok
();
return
R
.
ok
();
}
}
...
@@ -316,7 +317,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -316,7 +317,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if
(
Common
.
isEmpty
(
registrationNow
)
||
!
CommonConstants
.
ONE_STRING
.
equals
(
registrationNow
.
getProcessStatus
()))
{
if
(
Common
.
isEmpty
(
registrationNow
)
||
!
CommonConstants
.
ONE_STRING
.
equals
(
registrationNow
.
getProcessStatus
()))
{
return
R
.
failed
(
RegistConstants
.
NO_DATA_TO_HANDLE
);
return
R
.
failed
(
RegistConstants
.
NO_DATA_TO_HANDLE
);
}
}
baseMapper
.
updateById
(
registration
);
registrationNow
.
setProcessStatus
(
CommonConstants
.
ZERO_STRING
);
baseMapper
.
updateById
(
registrationNow
);
return
R
.
ok
();
return
R
.
ok
();
}
}
...
...
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