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
50078eba
Commit
50078eba
authored
Jun 17, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.12' into MVP1.7.12
parents
40ec7551
c63ba46c
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
196 additions
and
41 deletions
+196
-41
TEmployeeContractInfo.java
...d/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java
+12
-0
TEmployeeContractPre.java
...ud/plus/v1/yifu/archives/entity/TEmployeeContractPre.java
+4
-1
EmployeeContractVO.java
...fu/cloud/plus/v1/yifu/archives/vo/EmployeeContractVO.java
+10
-3
TEmployeeContractPreController.java
...u/archives/controller/TEmployeeContractPreController.java
+19
-5
TEmployeeContractPreMapper.java
...s/v1/yifu/archives/mapper/TEmployeeContractPreMapper.java
+1
-1
TEmployeeContractPreService.java
...v1/yifu/archives/service/TEmployeeContractPreService.java
+5
-1
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+74
-5
TEmployeeContractPreServiceImpl.java
...rchives/service/impl/TEmployeeContractPreServiceImpl.java
+27
-22
TGzOfferInfoServiceImpl.java
...1/yifu/archives/service/impl/TGzOfferInfoServiceImpl.java
+1
-1
TEmployeeContractPreMapper.xml
.../src/main/resources/mapper/TEmployeeContractPreMapper.xml
+4
-2
RegistConstants.java
...com/yifu/cloud/plus/v1/csp/constants/RegistConstants.java
+2
-0
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+21
-0
ArchiveTask.java
.../java/com/yifu/cloud/plus/v1/job/compont/ArchiveTask.java
+16
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java
View file @
50078eba
...
...
@@ -537,6 +537,16 @@ public class TEmployeeContractInfo extends BaseEntity {
@TableField
(
exist
=
false
)
private
int
limitEnd
;
@Schema
(
description
=
"合同待签订列表preId"
)
@TableField
(
exist
=
false
)
private
String
preId
;
/**
* preName
*/
@ExcelAttribute
(
name
=
"preName"
)
@ExcelProperty
(
value
=
"preName"
)
private
String
preName
;
/**
* 试用期(单位月)
...
...
@@ -545,4 +555,6 @@ public class TEmployeeContractInfo extends BaseEntity {
@ExcelProperty
(
value
=
"试用期"
)
private
String
tryPeriod
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractPre.java
View file @
50078eba
...
...
@@ -80,9 +80,12 @@ public class TEmployeeContractPre extends BaseEntity {
@Schema
(
description
=
"撤销签署原因"
)
private
String
revokeReason
;
@Schema
(
description
=
"
异常
原因"
)
@Schema
(
description
=
"
发起失败
原因"
)
private
String
errorInfo
;
@Schema
(
description
=
"发起失败时间"
)
private
Date
errorTime
;
@Schema
(
description
=
"法大大模版名称"
)
private
String
fadadaTemplate
;
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeContractVO.java
View file @
50078eba
...
...
@@ -227,7 +227,14 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
/**
* id
*/
@ExcelAttribute
(
name
=
"id"
)
@ExcelProperty
(
value
=
"id"
)
private
String
id
;
@ExcelAttribute
(
name
=
"preId"
)
@ExcelProperty
(
value
=
"preId"
)
private
String
preId
;
/**
* preName
*/
@ExcelAttribute
(
name
=
"preName"
)
@ExcelProperty
(
value
=
"preName"
)
private
String
preName
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeContractPreController.java
View file @
50078eba
...
...
@@ -7,6 +7,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractPre
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeContractInfoMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeContractPreService
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmpProjectStatusVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeAutoRegistRevokeVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeContractPreSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeContractPreVo
;
...
...
@@ -76,8 +77,8 @@ public class TEmployeeContractPreController {
* @return
*/
@Operation
(
description
=
"不分页查询"
)
@
Ge
tMapping
(
"/noPage"
)
public
R
<
List
<
TEmployeeContractPre
>>
getTEmployeeContractPreNoPage
(
TEmployeeContractPreSearchVo
tEmployeeContractPre
)
{
@
Pos
tMapping
(
"/noPage"
)
public
R
<
List
<
TEmployeeContractPre
>>
getTEmployeeContractPreNoPage
(
@RequestBody
TEmployeeContractPreSearchVo
tEmployeeContractPre
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
menuUtil
.
setAuthSql
(
user
,
tEmployeeContractPre
);
return
new
R
<>(
tEmployeeContractPreService
.
getTEmployeeContractPreNoPage
(
tEmployeeContractPre
));
...
...
@@ -89,8 +90,8 @@ public class TEmployeeContractPreController {
* @return
*/
@Operation
(
description
=
"合同待签订数量查询"
)
@
Ge
tMapping
(
"/getListCount"
)
public
R
getListCount
(
TEmployeeContractPreSearchVo
tEmployeeContractPre
)
{
@
Pos
tMapping
(
"/getListCount"
)
public
R
getListCount
(
@RequestBody
TEmployeeContractPreSearchVo
tEmployeeContractPre
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
menuUtil
.
setAuthSql
(
user
,
tEmployeeContractPre
);
return
R
.
ok
(
tEmployeeContractPreService
.
getTEmployeeContractCount
(
tEmployeeContractPre
));
...
...
@@ -113,7 +114,7 @@ public class TEmployeeContractPreController {
@Operation
(
description
=
"合同待签订信息单个/批量发起签署任务"
)
@PostMapping
(
"/dispatcherContract"
)
public
R
dispatcherContract
(
@RequestBody
List
<
String
>
idList
)
{
return
tEmployeeContractPreService
.
dispatcherContract
(
idList
);
return
tEmployeeContractPreService
.
dispatcherContract
(
idList
,
"1"
);
}
/**
...
...
@@ -235,4 +236,17 @@ public class TEmployeeContractPreController {
public
void
pushDisConfrimContracts
()
{
tEmployeeContractPreService
.
pushDisConfrimContracts
();
}
/**
* @param vo 人员信息
* @Description: 判断有没有流程中的合同待签订数据
* @Author: huyc
* @Date: 2025/6/17 18:18
* @return:
**/
@Inner
@PostMapping
(
"/inner/checkContractPreIsExit"
)
public
Boolean
checkContractPreIsExit
(
@RequestBody
EmpProjectStatusVo
vo
)
{
return
tEmployeeContractPreService
.
checkContractPreIsExit
(
vo
);
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TEmployeeContractPreMapper.java
View file @
50078eba
...
...
@@ -27,7 +27,7 @@ public interface TEmployeeContractPreMapper extends BaseMapper<TEmployeeContract
*/
IPage
<
TEmployeeContractPre
>
getTEmployeeContractPrePage
(
Page
<
TEmployeeContractPre
>
page
,
@Param
(
"tEmployeeContractPre"
)
TEmployeeContractPreSearchVo
tEmployeeContractPre
);
List
<
TEmployeeContractPre
>
getTEmployeeContractPreNoPage
(
@Param
(
"
T
EmployeeContractPre"
)
TEmployeeContractPreSearchVo
tEmployeeContractPre
);
List
<
TEmployeeContractPre
>
getTEmployeeContractPreNoPage
(
@Param
(
"
t
EmployeeContractPre"
)
TEmployeeContractPreSearchVo
tEmployeeContractPre
);
long
getTEmployeeContractPreExportCount
(
@Param
(
"tEmployeeContractPre"
)
TEmployeeContractPreSearchVo
tEmployeeContractPre
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeContractPreService.java
View file @
50078eba
...
...
@@ -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.yifu.archives.entity.TEmployeeContractPre
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmpProjectStatusVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeAutoRegistRevokeVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeContractPreSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeContractPreVo
;
...
...
@@ -60,9 +61,10 @@ public interface TEmployeeContractPreService extends IService<TEmployeeContractP
/**
* 合同待签订信息单个/批量发起签署任务
* @param idList id集合
* @param type 1 手动 2 自动
* @return
*/
R
dispatcherContract
(
List
<
String
>
idList
);
R
dispatcherContract
(
List
<
String
>
idList
,
String
type
);
/**
* 合同待签订撤销签署
...
...
@@ -75,4 +77,6 @@ public interface TEmployeeContractPreService extends IService<TEmployeeContractP
void
pushDisConfrimContracts
();
Boolean
checkContractPreIsExit
(
EmpProjectStatusVo
vo
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
50078eba
...
...
@@ -34,10 +34,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.constants.ArchivesConstants;
import
com.yifu.cloud.plus.v1.yifu.archives.constants.EmployeeConstants
;
import
com.yifu.cloud.plus.v1.yifu.archives.constants.EmployeeContractConstants
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeContractInfoMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeInfoMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TPreEmpMainMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TPreEmployeeProjectMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants
;
...
...
@@ -102,6 +99,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
// 缓存信息
private
final
CacheManager
cacheManager
;
private
final
TEmployeeContractPreMapper
contractPreMapper
;
/**
* 员工合同信息表简单分页查询
*
...
...
@@ -481,6 +480,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
String
code
=
this
.
getCode
(
true
);
tEmployeeContractInfo
.
setApplyNo
(
code
);
}
//自动化派单创建人赋值
if
(
Common
.
isNotNull
(
tEmployeeContractInfo
.
getPreName
()))
{
tEmployeeContractInfo
.
setCreateName
(
tEmployeeContractInfo
.
getPreName
());
tEmployeeContractInfo
.
setCreateBy
(
"1"
);
}
baseMapper
.
insert
(
tEmployeeContractInfo
);
// 标准合同、劳动派遣合同、其他。————社保公积金都派减,自动审核通过
...
...
@@ -511,6 +515,19 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
if
(
Common
.
isNotNull
(
tEmployeeContractInfo
.
getAttaList
())
&&
Common
.
isNotNull
(
tEmployeeContractInfo
.
getId
()))
{
this
.
updateFileMainId
(
tEmployeeContractInfo
);
}
//派单成功更新合同待签订列表数据
//更新合同状态为2线下签待审核
if
(
Common
.
isNotNull
(
tEmployeeContractInfo
.
getPreId
()))
{
TEmployeeContractPre
contractPre
=
contractPreMapper
.
selectOne
(
Wrappers
.<
TEmployeeContractPre
>
query
().
lambda
()
.
eq
(
TEmployeeContractPre:
:
getId
,
tEmployeeContractInfo
.
getPreId
())
.
in
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
socialInfoStatus
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
contractPre
))
{
contractPre
.
setProcessStatus
(
CommonConstants
.
TWO_STRING
);
contractPre
.
setContractId
(
tEmployeeContractInfo
.
getId
());
contractPreMapper
.
updateById
(
contractPre
);
}
}
}
else
{
// 标准合同、劳动派遣合同、其他。————社保公积金都派减,自动审核通过
this
.
judgeAuditStatus
(
tEmployeeContractInfo
,
user
);
...
...
@@ -595,6 +612,10 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
TEmployeeContractAudit
audit
=
new
TEmployeeContractAudit
();
if
(
CommonConstants
.
ONE_INT
==
tEmployeeContractInfo
.
getAuditStatus
())
{
audit
.
setRootName
(
"提交申请"
);
if
(
Common
.
isNotNull
(
tEmployeeContractInfo
.
getPreName
()))
{
audit
.
setCreateName
(
tEmployeeContractInfo
.
getPreName
());
audit
.
setCreateBy
(
"1"
);
}
}
if
(
CommonConstants
.
dingleDigitIntArray
[
2
]
==
tEmployeeContractInfo
.
getAuditStatus
())
{
audit
.
setRootName
(
"合同审核"
);
...
...
@@ -718,7 +739,6 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
return
R
.
failed
(
"不是待审核状态!"
);
}
if
(
tEmployeeContractInfo
.
getAuditStatus
()
==
CommonConstants
.
dingleDigitIntArray
[
2
])
{
// 非作废、终止,本条变为在用
if
(
Common
.
isEmpty
(
contractInfo
.
getSituation
())
||
(!
EmployeeConstants
.
SITUATION_SIX
.
equals
(
contractInfo
.
getSituation
())
...
...
@@ -842,6 +862,26 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
}
}
}
//更新合同状态为4线下签待归档
TEmployeeContractPre
contractPre
=
contractPreMapper
.
selectOne
(
Wrappers
.<
TEmployeeContractPre
>
query
().
lambda
()
.
eq
(
TEmployeeContractPre:
:
getContractId
,
contractInfo
.
getId
())
.
eq
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
TWO_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
contractPre
))
{
contractPre
.
setProcessStatus
(
CommonConstants
.
FOUR_STRING
);
contractPreMapper
.
updateById
(
contractPre
);
}
}
if
(
tEmployeeContractInfo
.
getAuditStatus
()
==
CommonConstants
.
dingleDigitIntArray
[
3
])
{
//更新合同状态为3线下签审核不通过
TEmployeeContractPre
contractPre
=
contractPreMapper
.
selectOne
(
Wrappers
.<
TEmployeeContractPre
>
query
().
lambda
()
.
eq
(
TEmployeeContractPre:
:
getContractId
,
contractInfo
.
getId
())
.
eq
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
TWO_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
contractPre
))
{
contractPre
.
setProcessStatus
(
CommonConstants
.
THREE_STRING
);
contractPreMapper
.
updateById
(
contractPre
);
}
}
tEmployeeContractInfo
.
setAuditUserName
(
user
.
getNickname
());
tEmployeeContractInfo
.
setContractNo
(
contractInfo
.
getContractNo
());
...
...
@@ -942,6 +982,15 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
tEmployeeContractInfo
.
setIsFile
(
CommonConstants
.
ONE_STRING
);
}
this
.
updateById
(
tEmployeeContractInfo
);
//更新合同状态为4线下签待归档
TEmployeeContractPre
contractPre
=
contractPreMapper
.
selectOne
(
Wrappers
.<
TEmployeeContractPre
>
query
().
lambda
()
.
eq
(
TEmployeeContractPre:
:
getContractId
,
tEmployeeContractInfo
.
getId
())
.
eq
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
FOUR_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
contractPre
))
{
contractPre
.
setProcessStatus
(
CommonConstants
.
NINE_STRING
);
contractPreMapper
.
updateById
(
contractPre
);
}
return
R
.
ok
();
}
return
R
.
failed
(
"参数不可为空"
);
...
...
@@ -1870,6 +1919,26 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
}
}
}
//更新合同状态为4线下签待归档
TEmployeeContractPre
contractPre
=
contractPreMapper
.
selectOne
(
Wrappers
.<
TEmployeeContractPre
>
query
().
lambda
()
.
eq
(
TEmployeeContractPre:
:
getContractId
,
contract
.
getId
())
.
eq
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
TWO_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
contractPre
))
{
contractPre
.
setProcessStatus
(
CommonConstants
.
FOUR_STRING
);
contractPreMapper
.
updateById
(
contractPre
);
}
}
if
(
tEmployeeContractInfo
.
getAuditStatus
()
==
CommonConstants
.
dingleDigitIntArray
[
3
])
{
//更新合同状态为3线下签审核不通过
TEmployeeContractPre
contractPre
=
contractPreMapper
.
selectOne
(
Wrappers
.<
TEmployeeContractPre
>
query
().
lambda
()
.
eq
(
TEmployeeContractPre:
:
getContractId
,
contract
.
getId
())
.
eq
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
TWO_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
contractPre
))
{
contractPre
.
setProcessStatus
(
CommonConstants
.
THREE_STRING
);
contractPreMapper
.
updateById
(
contractPre
);
}
}
// 不是待提交,记录审核记录
this
.
setAuditInfo
(
tEmployeeContractInfo
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreServiceImpl.java
View file @
50078eba
...
...
@@ -36,10 +36,8 @@ import org.springframework.web.client.RestTemplate;
import
javax.servlet.ServletOutputStream
;
import
javax.servlet.http.HttpServletResponse
;
import
java.net.URLEncoder
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.time.LocalDate
;
import
java.util.*
;
import
java.util.stream.Collectors
;
import
java.util.stream.Stream
;
...
...
@@ -257,7 +255,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
}
@Override
public
R
dispatcherContract
(
List
<
String
>
idList
)
{
public
R
dispatcherContract
(
List
<
String
>
idList
,
String
type
)
{
List
<
TEmployeeContractPre
>
contractPreList
=
baseMapper
.
selectList
(
Wrappers
.<
TEmployeeContractPre
>
query
()
.
lambda
().
in
(
TEmployeeContractPre:
:
getId
,
idList
)
.
in
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
socialInfoStatus
));
...
...
@@ -283,24 +281,22 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
//调用批量派单接口100条处理一次,同原合同派单保持一致
List
<
ErrorMessage
>
errorMessageList
=
new
ArrayList
<>();
contractInfoService
.
importContract
(
disList
,
errorMessageList
);
List
<
String
>
idUpdList
=
disList
.
stream
().
map
(
EmployeeContractVO:
:
getId
).
collect
(
Collectors
.
toList
());
if
(
errorMessageList
.
stream
().
allMatch
(
message
->
message
.
getMessage
().
equals
(
CommonConstants
.
SAVE_SUCCESS
)))
{
//更新合同状态为2线下签待审核
LambdaUpdateWrapper
<
TEmployeeContractPre
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
updateWrapper
.
in
(
TEmployeeContractPre:
:
getId
,
idUpdList
)
.
in
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
socialInfoStatus
)
.
set
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
TWO_STRING
);
// 执行更新操作
this
.
update
(
updateWrapper
);
}
else
{
if
(!
errorMessageList
.
stream
().
allMatch
(
message
->
message
.
getMessage
().
equals
(
CommonConstants
.
SAVE_SUCCESS
)))
{
errorMessageListAll
.
addAll
(
errorMessageList
);
//更新合同状态为5发起失败
LambdaUpdateWrapper
<
TEmployeeContractPre
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
updateWrapper
.
in
(
TEmployeeContractPre:
:
getId
,
idUpdList
)
.
in
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
socialInfoStatus
)
.
set
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
FIVE_STRING
);
// 执行更新操作
this
.
update
(
updateWrapper
);
for
(
ErrorMessage
errorMessage
:
errorMessageList
)
{
if
(!
errorMessage
.
getMessage
().
equals
(
CommonConstants
.
SAVE_SUCCESS
))
{
EmployeeContractVO
contractVO
=
disList
.
stream
().
filter
(
vo
->
Objects
.
equals
(
vo
.
getRowIndex
(),
errorMessage
.
getLineNum
())).
collect
(
Collectors
.
toList
()).
get
(
0
);
LambdaUpdateWrapper
<
TEmployeeContractPre
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
updateWrapper
.
in
(
TEmployeeContractPre:
:
getId
,
contractVO
.
getPreId
())
.
in
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
socialInfoStatus
)
.
set
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
FIVE_STRING
)
.
set
(
TEmployeeContractPre:
:
getErrorInfo
,
errorMessage
.
getMessage
())
.
set
(
TEmployeeContractPre:
:
getErrorTime
,
LocalDateTimeUtils
.
convertLDToDate
(
LocalDate
.
now
()));
// 执行更新操作
this
.
update
(
updateWrapper
);
}
}
}
}
}
...
...
@@ -406,13 +402,22 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
List
<
String
>
unConfirmList
=
baseMapper
.
getAllUnDisData
();
if
(
null
!=
unConfirmList
&&
!
unConfirmList
.
isEmpty
())
{
try
{
this
.
dispatcherContract
(
unConfirmList
);
this
.
dispatcherContract
(
unConfirmList
,
"2"
);
}
catch
(
Exception
e
)
{
log
.
error
(
"执行异常"
,
e
);
}
}
}
@Override
public
Boolean
checkContractPreIsExit
(
EmpProjectStatusVo
vo
)
{
return
baseMapper
.
selectCount
(
Wrappers
.<
TEmployeeContractPre
>
query
().
lambda
()
.
eq
(
TEmployeeContractPre:
:
getEmpIdcard
,
vo
.
getEmpIdcard
())
.
eq
(
TEmployeeContractPre:
:
getDeptNo
,
vo
.
getDeptNo
())
.
ne
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
NINE_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
))
>
0
;
}
//发送企业微信待办
private
void
sendMessageToWx
(
TEmployeeContractPre
pre
)
{
//获取前端客服
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TGzOfferInfoServiceImpl.java
View file @
50078eba
...
...
@@ -264,7 +264,7 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
public
R
sendOfferAlert
(
TGzOfferInfoVo
tGzOfferInfo
)
{
//获取所有满足条件的未发送offer提醒的数据
if
(
Common
.
isNotNull
(
tGzOfferInfo
))
{
tGzOfferInfo
.
setOfferS
endStatus
(
CommonConstants
.
ONE
_STRING
);
tGzOfferInfo
.
setOfferS
tatus
(
CommonConstants
.
FOUR
_STRING
);
List
<
TGzOfferInfoVo
>
offerList
=
baseMapper
.
getTGzOfferInfoSendAlertList
(
tGzOfferInfo
);
if
(
Common
.
isNotNull
(
offerList
)
&&
!
offerList
.
isEmpty
())
{
if
(
Common
.
isNotNull
(
offerList
)
&&
offerList
.
size
()
>
200
)
{
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractPreMapper.xml
View file @
50078eba
...
...
@@ -22,6 +22,7 @@
<result
property=
"signType"
column=
"sign_type"
/>
<result
property=
"signFlag"
column=
"sign_flag"
/>
<result
property=
"errorInfo"
column=
"error_info"
/>
<result
property=
"errorTime"
column=
"error_time"
/>
<result
property=
"fadadaTemplate"
column=
"fadada_template"
/>
<result
property=
"dataSource"
column=
"data_source"
/>
<result
property=
"expectedCollectionTime"
column=
"expected_collection_time"
/>
...
...
@@ -145,7 +146,7 @@
a.create_name,
a.create_time,
a.update_by,a.contract_term,a.sign_flag,a.error_info,a.contract_id,a.revoke_reason,
a.working_hours,a.working_reward,a.DISPATCH_PERIOD_YEAR,a.DISPATCH_PERIOD_MONTH
a.working_hours,a.working_reward,a.DISPATCH_PERIOD_YEAR,a.DISPATCH_PERIOD_MONTH
,a.error_time
</sql>
<sql
id=
"tEmployeeContractPre_where"
>
<if
test=
"tEmployeeContractPre != null"
>
...
...
@@ -452,7 +453,8 @@
null remark,
null changeContractAndEmployee,
a.TRY_PERIOD tryPeriod,
a.id
a.id preId,
if(#{type} = '1',concat('手动签署-',a.customer_username),concat('自动化签署-',a.customer_username)) preName
FROM t_employee_contract_pre a,(select @i:=0) as itable
<where>
1=1
...
...
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/constants/RegistConstants.java
View file @
50078eba
...
...
@@ -19,6 +19,8 @@ public class RegistConstants {
public
static
final
String
EMP_PROJECT_EXIT_CHECK
=
"未找到该人员对应的在项信息!"
;
public
static
final
String
EMP_CONTRACT_EXIT_CHECK
=
"已存在流程中的合同待签订数据!"
;
public
static
final
String
CONFIRM_SUBMIT
=
"确认接收"
;
public
static
final
String
BEFORE_IN_PROJECT
=
"入职登记前已增员"
;
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
50078eba
...
...
@@ -1141,6 +1141,15 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if
(
Common
.
isNotNull
(
exit
))
{
return
RegistConstants
.
REGIST_SAME_CHECK
;
}
//针对入职的判断是否存在流程中的合同待签订数据
if
(
CommonConstants
.
ONE_STRING
.
equals
(
registration
.
getFeedbackType
()))
{
EmpProjectStatusVo
vo
=
new
EmpProjectStatusVo
();
vo
.
setEmpIdcard
(
registration
.
getEmpIdcard
());
vo
.
setDeptNo
(
registration
.
getDeptNo
());
if
(
Boolean
.
TRUE
.
equals
(
checkContractPreIsExit
(
vo
)))
{
return
RegistConstants
.
EMP_CONTRACT_EXIT_CHECK
;
}
}
//针对离职的判断人员项目档案状态是否正常
if
(
CommonConstants
.
TWO_STRING
.
equals
(
registration
.
getFeedbackType
()))
{
EmpProjectStatusVo
vo
=
new
EmpProjectStatusVo
();
...
...
@@ -1167,6 +1176,18 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
}
//判断是否存在流程中的合同待签订数据
private
Boolean
checkContractPreIsExit
(
EmpProjectStatusVo
vo
)
{
//找到不在项人员的身份证信息
R
<
Boolean
>
sdr
=
HttpDaprUtil
.
invokeMethodPost
(
archivesProperties
.
getAppUrl
(),
archivesProperties
.
getAppId
()
,
"/temployeecontractpre/inner/checkContractPreIsExit"
,
vo
,
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
if
(
sdr
!=
null
&&
sdr
.
getData
()
!=
null
)
{
return
sdr
.
getData
();
}
else
{
return
false
;
}
}
//获取减项人员档案信息
private
EmpProjectStatusVo
getOutEmpProjectStatus
(
EmpProjectStatusVo
vo
)
{
//找到不在项人员的身份证信息
...
...
yifu-job/yifu-job-api/src/main/java/com/yifu/cloud/plus/v1/job/compont/ArchiveTask.java
View file @
50078eba
...
...
@@ -85,6 +85,21 @@ public class ArchiveTask {
log
.
info
(
"-------------每日刷新档案完整监控数据-定时任务开始------------"
);
}
public
void
pushWxContractConfrimMessage
()
{
log
.
info
(
"-------------每天8.30推送合同待签订信息------------"
);
HttpDaprUtil
.
invokeMethodPost
(
daprArchivesProperties
.
getAppUrl
(),
daprArchivesProperties
.
getAppId
(),
"/temployeecontractpre/inner/pushWxConfrimMessage"
,
""
,
Object
.
class
,
SecurityConstants
.
FROM_IN
);
log
.
info
(
"-------------每天8.30推送合同待签订信息-定时任务开始------------"
);
}
public
void
pushDisConfrimContracts
()
{
log
.
info
(
"-------------每天9点推送合同待签订信息------------"
);
HttpDaprUtil
.
invokeMethodPost
(
daprArchivesProperties
.
getAppUrl
(),
daprArchivesProperties
.
getAppId
(),
"/temployeecontractpre/inner/pushDisConfrimContracts"
,
""
,
Object
.
class
,
SecurityConstants
.
FROM_IN
);
log
.
info
(
"-------------每天9点推送合同待签订信息-定时任务开始------------"
);
}
public
void
everyDayCreateRiskMonitor
()
{
log
.
info
(
"-------------每日刷新运营风险管控数据------------"
);
...
...
@@ -93,4 +108,5 @@ public class ArchiveTask {
SecurityConstants
.
FROM_IN
);
log
.
info
(
"-------------每日刷新运营风险管控数据-定时任务开始------------"
);
}
}
\ No newline at end of file
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