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
b5394d63
Commit
b5394d63
authored
Mar 24, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.8' into MVP1.7.8
parents
edeb5783
61769b5c
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
112 additions
and
6 deletions
+112
-6
EmployeeInfoMsgVo.java
...ifu/cloud/plus/v1/yifu/archives/vo/EmployeeInfoMsgVo.java
+1
-0
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+9
-0
TSettleDomainServiceImpl.java
.../yifu/archives/service/impl/TSettleDomainServiceImpl.java
+22
-0
EmployeeRegistrationPreMapper.xml
...c/main/resources/mapper/EmployeeRegistrationPreMapper.xml
+1
-0
CommonConstants.java
...ud/plus/v1/yifu/common/core/constant/CommonConstants.java
+2
-0
CspDaprUtils.java
...ifu/cloud/plus/v1/yifu/common/dapr/util/CspDaprUtils.java
+12
-1
EmployeeRegistrationCustomerUserUpdateVo.java
...s/v1/csp/vo/EmployeeRegistrationCustomerUserUpdateVo.java
+23
-0
EmployeeRegistrationController.java
...lus/v1/csp/controller/EmployeeRegistrationController.java
+18
-1
EmployeeRegistrationService.java
...loud/plus/v1/csp/service/EmployeeRegistrationService.java
+10
-2
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+14
-2
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeInfoMsgVo.java
View file @
b5394d63
...
...
@@ -16,4 +16,5 @@ public class EmployeeInfoMsgVo implements Serializable {
private
String
name
;
private
String
card
;
private
String
phone
;
private
String
message
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
b5394d63
...
...
@@ -490,6 +490,15 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
public
R
<
EmployeeInfoMsgVo
>
getEmployeeInfo
(
String
id
)
{
//获取人员档案id
EmployeeInfoMsgVo
msgInfoVo
=
baseMapper
.
getEmployeeArchivesInfo
(
id
);
//获取预入职信息,如果有的话提示
TPreEmpMain
empMain
=
empMainMapper
.
selectOne
(
Wrappers
.<
TPreEmpMain
>
query
().
lambda
()
.
eq
(
TPreEmpMain:
:
getEmpIdcard
,
msgInfoVo
.
getCard
())
.
eq
(
TPreEmpMain:
:
getDeptId
,
msgInfoVo
.
getDeptId
())
.
in
(
TPreEmpMain:
:
getStatus
,
CommonConstants
.
preMainStatus
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
empMain
))
{
msgInfoVo
.
setMessage
(
"信息审核中,请耐心等待!"
);
}
return
R
.
ok
(
msgInfoVo
);
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TSettleDomainServiceImpl.java
View file @
b5394d63
...
...
@@ -17,19 +17,23 @@
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
service
.
impl
;
import
cn.hutool.core.bean.BeanUtil
;
import
com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationCustomerUserUpdateVo
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysUser
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.vo.AreaMap
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.vo.SysUserListVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.constants.ArchivesConstants
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.EmployeeRegistrationPre
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TCustomerInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TCutsomerDataPermisson
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TCutsomerDataPermissonMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TSettleDomainMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.EmployeeRegistrationPreService
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TSettleDomainService
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants
;
...
...
@@ -38,11 +42,13 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.RedisUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.CspDaprUtils
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
lombok.RequiredArgsConstructor
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.cache.CacheManager
;
import
org.springframework.context.annotation.Lazy
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
...
...
@@ -67,6 +73,13 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
private
final
TCutsomerDataPermissonMapper
permissonMapper
;
@Autowired
private
CspDaprUtils
cspDaprUtils
;
@Autowired
@Lazy
private
EmployeeRegistrationPreService
registrationPreService
;
@Override
public
IPage
<
TSettleDomain
>
getPage
(
Page
<
TSettleDomain
>
page
,
TSettleDomain
tSettleDomain
)
{
return
baseMapper
.
getPage
(
page
,
tSettleDomain
);
...
...
@@ -533,6 +546,15 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
domain
.
setCsLoginName
(
vo
.
getLoginName
());
domain
.
setId
(
tSettleDomainInfo
.
getId
());
baseMapper
.
updateById
(
domain
);
//更新入职待确认和入职待建档的前端客服信息
EmployeeRegistrationCustomerUserUpdateVo
updateVo
=
new
EmployeeRegistrationCustomerUserUpdateVo
();
updateVo
.
setDeptNo
(
vo
.
getDepartNo
());
updateVo
.
setCustomerUserName
(
vo
.
getName
());
cspDaprUtils
.
updateRegistCustomerUserInfo
(
updateVo
);
LambdaUpdateWrapper
<
EmployeeRegistrationPre
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
updateWrapper
.
eq
(
EmployeeRegistrationPre:
:
getDeptNo
,
vo
.
getDepartNo
())
.
set
(
EmployeeRegistrationPre:
:
getCustomerUsernameNew
,
vo
.
getName
());
registrationPreService
.
update
(
updateWrapper
);
}
}
}
catch
(
Exception
e
){
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/EmployeeRegistrationPreMapper.xml
View file @
b5394d63
...
...
@@ -203,6 +203,7 @@
1=1
<include
refid=
"employeeRegistrationPre_where"
/>
</where>
order by a.create_time desc
</select>
<select
id=
"selectExportCount"
resultType=
"java.lang.Long"
>
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/CommonConstants.java
View file @
b5394d63
...
...
@@ -642,6 +642,8 @@ public interface CommonConstants {
List
<
String
>
processPreStatus
=
Stream
.
of
(
"1"
).
collect
(
Collectors
.
toList
());
List
<
String
>
preMainStatus
=
Stream
.
of
(
"1"
,
"2"
).
collect
(
Collectors
.
toList
());
List
<
String
>
processPreArchivesStatus
=
Stream
.
of
(
"0"
,
"1"
,
"2"
).
collect
(
Collectors
.
toList
());
List
<
String
>
socialInfoStatus
=
Stream
.
of
(
"1"
,
"3"
,
"5"
,
"7"
).
collect
(
Collectors
.
toList
());
...
...
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/CspDaprUtils.java
View file @
b5394d63
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
common
.
dapr
.
util
;
import
com.alibaba.fastjson.JSON
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistration
DaprCount
Vo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistration
CustomerUserUpdate
Vo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationUpdateVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
...
...
@@ -34,4 +34,15 @@ public class CspDaprUtils {
public
R
<
Boolean
>
updateRegistByPreInfo
(
EmployeeRegistrationUpdateVo
updateVo
)
{
return
HttpDaprUtil
.
invokeMethodPost
(
daprCspProperties
.
getAppUrl
(),
daprCspProperties
.
getAppId
(),
"/employeeregistration/inner/updateRegistByPreInfo"
,
JSON
.
toJSONString
(
updateVo
),
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
}
/**
* @Author huyc
* @Description 更新入离职登记前端客服姓名
* @Date 10:15 2025/3/24
* @Param
* @return
**/
public
R
<
Boolean
>
updateRegistCustomerUserInfo
(
EmployeeRegistrationCustomerUserUpdateVo
updateVo
)
{
return
HttpDaprUtil
.
invokeMethodPost
(
daprCspProperties
.
getAppUrl
(),
daprCspProperties
.
getAppId
(),
"/employeeregistration/inner/updateRegistCustomerUserInfo"
,
JSON
.
toJSONString
(
updateVo
),
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
}
}
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/vo/EmployeeRegistrationCustomerUserUpdateVo.java
0 → 100644
View file @
b5394d63
package
com
.
yifu
.
cloud
.
plus
.
v1
.
csp
.
vo
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
* 入离职登记表
*
* @author huych
* @date 2025-03-17 9:48:11
*/
@Data
public
class
EmployeeRegistrationCustomerUserUpdateVo
implements
Serializable
{
@Schema
(
description
=
"最新的前端客服姓名"
)
private
String
customerUserName
;
@Schema
(
description
=
"项目编码"
)
private
String
deptNo
;
}
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/controller/EmployeeRegistrationController.java
View file @
b5394d63
...
...
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.csp.entity.EmployeeRegistration
;
import
com.yifu.cloud.plus.v1.csp.service.EmployeeRegistrationService
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationCustomerUserUpdateVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationReceiveVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationSearchVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationUpdateVo
;
...
...
@@ -180,6 +181,8 @@ public class EmployeeRegistrationController {
@Operation
(
description
=
"导出入离职登记表"
)
@PostMapping
(
"/export"
)
public
void
export
(
HttpServletResponse
response
,
@RequestBody
EmployeeRegistrationSearchVo
searchVo
)
{
// 1.9.8:客户服务平台仅展示来源是“客户端”的数据
searchVo
.
setDataSource
(
CommonConstants
.
ONE_STRING
);
employeeRegistrationService
.
listExport
(
response
,
searchVo
);
}
...
...
@@ -303,10 +306,24 @@ public class EmployeeRegistrationController {
@SysLog
(
"更新入离职登记表"
)
@Inner
@PostMapping
(
"/inner/updateRegistByPreInfo"
)
public
R
updateRegistByPreInfo
(
@RequestBody
EmployeeRegistrationUpdateVo
updateVo
)
{
public
Boolean
updateRegistByPreInfo
(
@RequestBody
EmployeeRegistrationUpdateVo
updateVo
)
{
return
employeeRegistrationService
.
updateRegistByPreInfo
(
updateVo
);
}
/**
* 更新入离职登记表前端客服信息
*
* @param updateVo
* @return R
*/
@Operation
(
summary
=
"更新入离职登记表前端客服信息"
)
@SysLog
(
"更新入离职登记表前端客服信息"
)
@Inner
@PostMapping
(
"/inner/updateRegistCustomerUserInfo"
)
public
Boolean
updateRegistCustomerUserInfo
(
@RequestBody
EmployeeRegistrationCustomerUserUpdateVo
updateVo
)
{
return
employeeRegistrationService
.
updateRegistCustomerUserInfo
(
updateVo
);
}
/**
* 查询入职待确认数量
*
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/EmployeeRegistrationService.java
View file @
b5394d63
...
...
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.csp.entity.EmployeeRegistration
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationCustomerUserUpdateVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationReceiveVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationSearchVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationUpdateVo
;
...
...
@@ -136,11 +137,18 @@ public interface EmployeeRegistrationService extends IService<EmployeeRegistrati
* @param updateVo 状态和日志新增vo
* @return
*/
R
updateRegistByPreInfo
(
EmployeeRegistrationUpdateVo
updateVo
);
Boolean
updateRegistByPreInfo
(
EmployeeRegistrationUpdateVo
updateVo
);
/**
* 批量更新
* @param updateVo 前端客服信息更新vo
* @return
*/
Boolean
updateRegistCustomerUserInfo
(
EmployeeRegistrationCustomerUserUpdateVo
updateVo
);
/**
* 查询入职待确认数量
* @param
count
Vo 查询入职待确认数量vo
* @param
search
Vo 查询入职待确认数量vo
* @return
*/
long
getRegisterPreCount
(
EmployeeRegistrationSearchVo
searchVo
);
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
b5394d63
...
...
@@ -686,7 +686,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
@Override
public
R
updateRegistByPreInfo
(
EmployeeRegistrationUpdateVo
updateVo
)
{
public
Boolean
updateRegistByPreInfo
(
EmployeeRegistrationUpdateVo
updateVo
)
{
EmployeeRegistration
registration
=
baseMapper
.
selectOne
(
Wrappers
.<
EmployeeRegistration
>
query
().
lambda
()
.
eq
(
EmployeeRegistration:
:
getEmpIdcard
,
updateVo
.
getEmpIdcard
())
.
eq
(
EmployeeRegistration:
:
getDeptNo
,
updateVo
.
getDeptNo
())
...
...
@@ -699,7 +699,19 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
logService
.
saveLog
(
registration
.
getId
(),
CommonConstants
.
ZERO_STRING
,
RegistConstants
.
BACK_RECEIVE
,
LocalDateTime
.
now
(),
updateVo
.
getEmployeeName
(),
"拒绝入职原因:"
+
updateVo
.
getReason
());
}
return
R
.
ok
();
return
true
;
}
@Override
public
Boolean
updateRegistCustomerUserInfo
(
EmployeeRegistrationCustomerUserUpdateVo
updateVo
)
{
EmployeeRegistration
registration
=
baseMapper
.
selectOne
(
Wrappers
.<
EmployeeRegistration
>
query
().
lambda
()
.
eq
(
EmployeeRegistration:
:
getDeptNo
,
updateVo
.
getDeptNo
())
.
eq
(
EmployeeRegistration:
:
getFeedbackType
,
CommonConstants
.
ONE_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
registration
))
{
registration
.
setCustomerUsernameNew
(
updateVo
.
getCustomerUserName
());
}
return
true
;
}
@Override
...
...
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