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
46ea3e9e
Commit
46ea3e9e
authored
Apr 20, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.22' into MVP1.7.22
parents
e0cebcdb
5693b5f3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
718 additions
and
66 deletions
+718
-66
EmployeeRegistrationPreVo.java
...d/plus/v1/yifu/archives/vo/EmployeeRegistrationPreVo.java
+4
-1
TEmployeePreLogController.java
...1/yifu/archives/controller/TEmployeePreLogController.java
+13
-0
TEmployeePreLogDetailController.java
.../archives/controller/TEmployeePreLogDetailController.java
+56
-0
TEmployeeContractPreServiceImpl.java
...rchives/service/impl/TEmployeeContractPreServiceImpl.java
+1
-1
TEmployeePreLogServiceImpl.java
...ifu/archives/service/impl/TEmployeePreLogServiceImpl.java
+172
-29
DoFascTask.java
...om/yifu/cloud/plus/v1/yifu/archives/utils/DoFascTask.java
+1
-1
ArchivesDaprUtil.java
...cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
+43
-4
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+428
-30
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeRegistrationPreVo.java
View file @
46ea3e9e
...
@@ -3,6 +3,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.vo;
...
@@ -3,6 +3,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.vo;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.baomidou.mybatisplus.annotation.FieldStrategy
;
import
com.baomidou.mybatisplus.annotation.FieldStrategy
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsurancePreDetail
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsurancePreDetail
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsurancePreVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsurancePreVo
;
...
@@ -71,6 +72,7 @@ public class EmployeeRegistrationPreVo implements Serializable {
...
@@ -71,6 +72,7 @@ public class EmployeeRegistrationPreVo implements Serializable {
@Schema
(
description
=
"就职岗位"
)
@Schema
(
description
=
"就职岗位"
)
private
String
position
;
private
String
position
;
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@Schema
(
description
=
"入职日期"
)
@Schema
(
description
=
"入职日期"
)
private
Date
joinLeaveDate
;
private
Date
joinLeaveDate
;
...
@@ -100,13 +102,14 @@ public class EmployeeRegistrationPreVo implements Serializable {
...
@@ -100,13 +102,14 @@ public class EmployeeRegistrationPreVo implements Serializable {
@Schema
(
description
=
"数据来源"
)
@Schema
(
description
=
"数据来源"
)
private
String
dataSource
;
private
String
dataSource
;
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@Schema
(
description
=
"预计收集时间"
)
@Schema
(
description
=
"预计收集时间"
)
private
Date
expectedCollectionTime
;
private
Date
expectedCollectionTime
;
@Schema
(
description
=
"确认人"
)
@Schema
(
description
=
"确认人"
)
private
String
confirmUser
;
private
String
confirmUser
;
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@Schema
(
description
=
"确认时间"
)
@Schema
(
description
=
"确认时间"
)
private
Date
confirmTime
;
private
Date
confirmTime
;
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeePreLogController.java
View file @
46ea3e9e
...
@@ -23,6 +23,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeePreLog;
...
@@ -23,6 +23,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeePreLog;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeePreLogService
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeePreLogService
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeePreLogSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeePreLogSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
lombok.RequiredArgsConstructor
;
import
lombok.RequiredArgsConstructor
;
...
@@ -84,4 +85,16 @@ public class TEmployeePreLogController {
...
@@ -84,4 +85,16 @@ public class TEmployeePreLogController {
return
R
.
ok
(
tEmployeePreLogService
.
getById
(
id
));
return
R
.
ok
(
tEmployeePreLogService
.
getById
(
id
));
}
}
/**
* 批量保存入职确认信息变更日志(内部接口)
*
* @param preLogList 日志列表
* @return Boolean
*/
@Inner
@PostMapping
(
"/inner/saveBatch"
)
public
Boolean
saveBatch
(
@RequestBody
List
<
TEmployeePreLog
>
preLogList
)
{
return
tEmployeePreLogService
.
saveBatch
(
preLogList
);
}
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeePreLogDetailController.java
0 → 100644
View file @
46ea3e9e
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
controller
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeePreLogDetail
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeePreLogDetailService
;
import
com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
lombok.RequiredArgsConstructor
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.List
;
/**
* 入职确认信息变更日志明细表
*
* @author hgw
* @date 2025-04-07 15:35:05
*/
@RestController
@RequiredArgsConstructor
@RequestMapping
(
"/temployeeprelogdetail"
)
@Tag
(
name
=
"入职确认信息变更日志明细表管理"
)
public
class
TEmployeePreLogDetailController
{
private
final
TEmployeePreLogDetailService
tEmployeePreLogDetailService
;
/**
* 批量保存入职确认信息变更日志明细(内部接口)
*
* @param detailList 日志明细列表
* @return Boolean
*/
@Inner
@PostMapping
(
"/inner/saveBatch"
)
public
Boolean
saveBatch
(
@RequestBody
List
<
TEmployeePreLogDetail
>
detailList
)
{
return
tEmployeePreLogDetailService
.
saveBatch
(
detailList
);
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreServiceImpl.java
View file @
46ea3e9e
...
@@ -659,7 +659,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
...
@@ -659,7 +659,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
!
CommonConstants
.
ONE_STRING
.
equals
(
pre
.
getProcessStatus
())
&&
!
CommonConstants
.
ONE_STRING
.
equals
(
pre
.
getProcessStatus
())
&&
Common
.
isNotNull
(
pre
.
getContractId
()))
{
Common
.
isNotNull
(
pre
.
getContractId
()))
{
TEmployeeContractAudit
audit
=
new
TEmployeeContractAudit
();
TEmployeeContractAudit
audit
=
new
TEmployeeContractAudit
();
audit
.
setRootName
(
"撤销签署"
);
audit
.
setRootName
(
"撤销签署
(合同待办列表消失)
"
);
audit
.
setLinkId
(
pre
.
getContractId
());
audit
.
setLinkId
(
pre
.
getContractId
());
audit
.
setLinkType
(
CommonConstants
.
ONE_INT
);
audit
.
setLinkType
(
CommonConstants
.
ONE_INT
);
audit
.
setRemark
(
registRevokeVo
.
getReason
());
audit
.
setRemark
(
registRevokeVo
.
getReason
());
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeePreLogServiceImpl.java
View file @
46ea3e9e
This diff is collapsed.
Click to expand it.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/utils/DoFascTask.java
View file @
46ea3e9e
...
@@ -250,7 +250,7 @@ public class DoFascTask {
...
@@ -250,7 +250,7 @@ public class DoFascTask {
!
CommonConstants
.
ONE_STRING
.
equals
(
pre
.
getProcessStatus
())
&&
!
CommonConstants
.
ONE_STRING
.
equals
(
pre
.
getProcessStatus
())
&&
Common
.
isNotNull
(
pre
.
getContractId
()))
{
Common
.
isNotNull
(
pre
.
getContractId
()))
{
// 加日志
// 加日志
this
.
saveAuditLogFail
(
pre
,
"撤销签署成功"
,
terminationNote
);
this
.
saveAuditLogFail
(
pre
,
"撤销签署成功
(合同待办列表消失)
"
,
terminationNote
);
}
}
if
(!
CommonConstants
.
ELEVEN_STRING
.
equals
(
pre
.
getProcessStatus
()))
{
if
(!
CommonConstants
.
ELEVEN_STRING
.
equals
(
pre
.
getProcessStatus
()))
{
pre
.
setProcessStatus
(
CommonConstants
.
TEN_STRING
);
pre
.
setProcessStatus
(
CommonConstants
.
TEN_STRING
);
...
...
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
View file @
46ea3e9e
...
@@ -3,10 +3,7 @@ package com.yifu.cloud.plus.v1.yifu.common.dapr.util;
...
@@ -3,10 +3,7 @@ package com.yifu.cloud.plus.v1.yifu.common.dapr.util;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.TypeReference
;
import
com.alibaba.fastjson.TypeReference
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.vo.SysCspDeptVo
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.vo.SysCspDeptVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TBusinessEmployeeExtendInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants
;
...
@@ -783,5 +780,47 @@ public class ArchivesDaprUtil {
...
@@ -783,5 +780,47 @@ public class ArchivesDaprUtil {
}
}
return
res
;
return
res
;
}
}
/**
* @Description: 批量保存入职确认信息变更日志
* @Author: fxj
* @Date: 2026-04-16
* @param preLogList 日志主表列表
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.Boolean>
**/
public
R
<
Boolean
>
savePreLogBatch
(
List
<
TEmployeePreLog
>
preLogList
){
R
<
Boolean
>
res
=
HttpDaprUtil
.
invokeMethodPost
(
daprArchivesProperties
.
getAppUrl
(),
daprArchivesProperties
.
getAppId
(),
"/temployeeprelog/inner/saveBatch"
,
JSON
.
toJSONString
(
preLogList
),
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
if
(
Common
.
isEmpty
(
res
)){
return
R
.
failed
(
"保存入职确认信息变更日志失败!"
);
}
return
res
;
}
/**
* @Description: 批量保存入职确认信息变更日志明细
* @Author: fxj
* @Date: 2026-04-16
* @param detailList 日志明细列表
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.Boolean>
**/
public
R
<
Boolean
>
savePreLogDetailBatch
(
List
<
TEmployeePreLogDetail
>
detailList
){
R
<
Boolean
>
res
=
HttpDaprUtil
.
invokeMethodPost
(
daprArchivesProperties
.
getAppUrl
(),
daprArchivesProperties
.
getAppId
(),
"/temployeeprelogdetail/inner/saveBatch"
,
JSON
.
toJSONString
(
detailList
),
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
if
(
Common
.
isEmpty
(
res
)){
return
R
.
failed
(
"保存入职确认信息变更日志明细失败!"
);
}
return
res
;
}
}
}
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
46ea3e9e
This diff is collapsed.
Click to expand it.
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