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
38facf47
You need to sign in or sign up before continuing.
Commit
38facf47
authored
Apr 11, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-入职登记商险待办提交
parent
e756c16c
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
31 deletions
+20
-31
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+11
-11
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+6
-2
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+0
-16
TEmployeeInsurancePre.java
...plus/v1/yifu/insurances/entity/TEmployeeInsurancePre.java
+0
-1
TEmployeeInsurancePreServiceImpl.java
...vice/insurance/impl/TEmployeeInsurancePreServiceImpl.java
+3
-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 @
38facf47
...
...
@@ -7,7 +7,6 @@ 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.entity.EmployeeRegistration
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationUpdateVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.EmployeeRegistrationPreMapper
;
...
...
@@ -24,7 +23,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.alisms.AliSmsResult
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.alisms.RegistParamVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.alisms.YiFuSmsUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.equator.HrEquator
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprInsurancesProperties
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.*
;
...
...
@@ -50,7 +48,6 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
import
javax.servlet.ServletOutputStream
;
import
javax.servlet.http.HttpServletResponse
;
import
java.net.URLEncoder
;
import
java.text.ParseException
;
import
java.time.LocalDateTime
;
import
java.util.*
;
...
...
@@ -1004,16 +1001,19 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
//获取人员档案id
EmployeeInfoMsgVo
msgInfoVo
=
baseMapper
.
getEmployeeArchivesInfo
(
id
);
//获取预入职信息,如果有的话提示
if
(
Common
.
isNotNull
(
msgInfoVo
))
{
TPreEmpMain
empMain
=
empMainMapper
.
selectOne
(
Wrappers
.<
TPreEmpMain
>
query
().
lambda
()
.
eq
(
TPreEmpMain:
:
getEmpIdcard
,
msgInfoVo
.
getCard
())
.
eq
(
TPreEmpMain:
:
getDeptId
,
msgInfoVo
.
getDeptId
())
.
in
(
TPreEmpMain:
:
getStatus
,
CommonConstants
.
preMainStatus
)
.
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
);
}
return
R
.
failed
(
CommonConstants
.
NO_DATA_TO_HANDLE
);
}
/**
* @Description: 获取前端客服的所有项目权限
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
38facf47
...
...
@@ -767,7 +767,9 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
//根据项目编码和身份证号查询预入职列表
TPreEmpMain
empMain
=
preEmpMainMapper
.
selectOne
(
Wrappers
.<
TPreEmpMain
>
query
()
.
lambda
().
eq
(
TPreEmpMain:
:
getEmpIdcard
,
contractInfo
.
getEmpIdcard
())
.
eq
(
TPreEmpMain:
:
getDeptNo
,
contractInfo
.
getDeptNo
()));
.
eq
(
TPreEmpMain:
:
getDeptNo
,
contractInfo
.
getDeptNo
())
.
ne
(
TPreEmpMain:
:
getStatus
,
CommonConstants
.
FIVE_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Optional
.
ofNullable
(
empMain
).
isPresent
())
{
//查询预入职项目档案表
TPreEmployeeProject
preEmployeeProject
=
preEmployeeProjectMapper
.
selectOne
(
Wrappers
.<
TPreEmployeeProject
>
query
()
...
...
@@ -1675,7 +1677,9 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
//根据项目编码和身份证号查询预入职列表
TPreEmpMain
empMain
=
preEmpMainMapper
.
selectOne
(
Wrappers
.<
TPreEmpMain
>
query
()
.
lambda
().
eq
(
TPreEmpMain:
:
getEmpIdcard
,
contract
.
getEmpIdcard
())
.
eq
(
TPreEmpMain:
:
getDeptNo
,
contract
.
getDeptNo
()));
.
eq
(
TPreEmpMain:
:
getDeptNo
,
contract
.
getDeptNo
())
.
ne
(
TPreEmpMain:
:
getStatus
,
CommonConstants
.
FIVE_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Optional
.
ofNullable
(
empMain
).
isPresent
())
{
//查询预入职项目档案表
TPreEmployeeProject
preEmployeeProject
=
preEmployeeProjectMapper
.
selectOne
(
Wrappers
.<
TPreEmployeeProject
>
query
()
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
38facf47
...
...
@@ -547,18 +547,12 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
@Override
public
R
confirmReceive
(
EmployeeRegistrationPreVo
preVo
)
{
if
(
preVo
.
getServerItem
().
contains
(
"商险"
)
&&
!
preVo
.
getEmployeeInsurancePreVos
().
isEmpty
())
{
// StringBuilder errorTemp = new StringBuilder();
List
<
TEmployeeInsuranceExitCheckVo
>
errorList
=
new
ArrayList
<>();
TEmployeeInsuranceExitCheckVo
checkVo
;
String
key
;
// 判断重复性MAP
Map
<
String
,
Integer
>
keyMap
=
new
HashMap
<>();
for
(
TEmployeeInsurancePreVo
insurancePreVo
:
preVo
.
getEmployeeInsurancePreVos
())
{
// //是否工作日判断
// String error = checkInsuranceBuy(insurancePreVo,CommonConstants.ONE_STRING);
// if (null != error) {
// errorTemp.append(error);
// }
insurancePreVo
.
setEmpIdcard
(
preVo
.
getEmpIdcard
());
insurancePreVo
.
setDeptNo
(
preVo
.
getDeptNo
());
//商险是否存在判断
...
...
@@ -574,9 +568,6 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
return
R
.
other
(
CommonConstants
.
TWO_INT
,
null
,
"保险公司、险种、购买标准、保单起、止日期不可同时重复;"
);
}
}
// if (errorTemp.length() > 0) {
// return R.other(CommonConstants.TWO_INT,null,errorTemp.toString());
// }
if
(!
errorList
.
isEmpty
())
{
return
R
.
other
(
CommonConstants
.
TWO_INT
,
null
,
errorList
);
}
...
...
@@ -634,13 +625,6 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if
(
Common
.
isEmpty
(
preVo
))
{
return
R
.
failed
(
CommonConstants
.
PARAM_IS_NOT_ERROR
);
}
// if (preVo.getServerItem().contains("商险") && !preVo.getEmployeeInsurancePreVos().isEmpty()) {
// TEmployeeInsurancePreVo insurancePreVo = preVo.getEmployeeInsurancePreVos().get(0);
// String error = checkInsuranceBuy(insurancePreVo, CommonConstants.TWO_STRING);
// if (null != error) {
// return R.other(CommonConstants.TWO_INT, null, error);
// }
// }
//查询该项目该前端客服下所有待接收的入职登记
//前端客服的所有项目权限赋值
EmployeeRegistrationSearchVo
searchVo
=
new
EmployeeRegistrationSearchVo
();
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TEmployeeInsurancePre.java
View file @
38facf47
...
...
@@ -41,7 +41,6 @@ public class TEmployeeInsurancePre extends BaseEntity {
@Schema
(
description
=
"手机号码"
)
private
String
empPhone
;
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@Schema
(
description
=
"入职日期"
)
private
Date
joinLeaveDate
;
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TEmployeeInsurancePreServiceImpl.java
View file @
38facf47
...
...
@@ -94,7 +94,9 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
public
List
<
TEmployeeInsurancePre
>
getTEmployeeInsurancePreNoPage
(
TEmployeeInsurancePreSearchVo
tEmployeeInsurancePre
)
{
//权限赋值
tEmployeeInsurancePre
.
setType
(
CommonConstants
.
ONE_STRING
);
if
(
Common
.
isEmpty
(
tEmployeeInsurancePre
.
getStatusList
()))
{
tEmployeeInsurancePre
.
setProcessStatus
(
CommonConstants
.
ZERO_STRING
);
}
initSearchVo
(
tEmployeeInsurancePre
);
return
baseMapper
.
getTEmployeeInsurancePreNoPage
(
tEmployeeInsurancePre
);
...
...
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