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
9984d27e
Commit
9984d27e
authored
May 18, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
入职确认接收新增字段:移动端标识(含单个、批量)、劳务费是否可修改、计时工资是否可修改、计件工资是否可修改-fxj
parent
3eab20ea
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
64 additions
and
1 deletion
+64
-1
EmployeeRegistrationPre.java
...plus/v1/yifu/archives/entity/EmployeeRegistrationPre.java
+15
-0
EmployeeRegistrationPreVo.java
...d/plus/v1/yifu/archives/vo/EmployeeRegistrationPreVo.java
+15
-0
TEmployeePreLogServiceImpl.java
...ifu/archives/service/impl/TEmployeePreLogServiceImpl.java
+7
-0
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+27
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/EmployeeRegistrationPre.java
View file @
9984d27e
...
...
@@ -209,4 +209,19 @@ public class EmployeeRegistrationPre extends BaseEntity {
*/
@Schema
(
description
=
"是否已确认离职: 0 是 1 "
)
private
String
isLeave
;
@Schema
(
description
=
"接收终端:0-移动端,1-PC端"
)
private
String
receiveTerminal
;
@Schema
(
description
=
"接收方式:0-单个接收,1-批量接收"
)
private
String
receiveType
;
@Schema
(
description
=
"劳务费可修改标识:0-可修改,1-不可修改"
)
private
String
laborFeeModifyFlag
;
@Schema
(
description
=
"计时工资可修改标识:0-可修改,1-不可修改"
)
private
String
hourlyWageModifyFlag
;
@Schema
(
description
=
"计件工资可修改标识:0-可修改,1-不可修改"
)
private
String
pieceWageModifyFlag
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeRegistrationPreVo.java
View file @
9984d27e
...
...
@@ -180,4 +180,19 @@ public class EmployeeRegistrationPreVo implements Serializable {
@TableField
(
exist
=
false
)
private
Boolean
fundUpdateFlag
;
@Schema
(
description
=
"接收终端:0-移动端,1-PC端"
)
private
String
receiveTerminal
;
@Schema
(
description
=
"接收方式:0-单个接收,1-批量接收"
)
private
String
receiveType
;
@Schema
(
description
=
"劳务费可修改标识:0-可修改,1-不可修改"
)
private
String
laborFeeModifyFlag
;
@Schema
(
description
=
"计时工资可修改标识:0-可修改,1-不可修改"
)
private
String
hourlyWageModifyFlag
;
@Schema
(
description
=
"计件工资可修改标识:0-可修改,1-不可修改"
)
private
String
pieceWageModifyFlag
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeePreLogServiceImpl.java
View file @
9984d27e
...
...
@@ -179,6 +179,13 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
IGNORE_FIELD
.
add
(
"isLeave"
);
IGNORE_FIELD
.
add
(
"isRefuse"
);
IGNORE_FIELD
.
add
(
"configId"
);
// 接收终端和接收方式
IGNORE_FIELD
.
add
(
"receiveTerminal"
);
IGNORE_FIELD
.
add
(
"receiveType"
);
// 工资可修改标识
IGNORE_FIELD
.
add
(
"laborFeeModifyFlag"
);
IGNORE_FIELD
.
add
(
"hourlyWageModifyFlag"
);
IGNORE_FIELD
.
add
(
"pieceWageModifyFlag"
);
}
private
static
final
List
<
String
>
PRE_IGNORE_FIELD
=
new
ArrayList
<>();
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
9984d27e
...
...
@@ -900,6 +900,16 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
logService
.
saveLog
(
registration
.
getId
(),
CommonConstants
.
ZERO_STRING
,
RegistConstants
.
CONFIRM_SUBMIT
,
LocalDateTime
.
now
(),
user
.
getNickname
(),
null
);
try
{
// 设置接收终端和接收方式
if
(
Common
.
isNotNull
(
preVo
))
{
// 默认PC端单个接收,前端可传值覆盖
if
(
Common
.
isEmpty
(
preVo
.
getReceiveTerminal
()))
{
preVo
.
setReceiveTerminal
(
CommonConstants
.
ONE_STRING
);
// 1-PC端
}
if
(
Common
.
isEmpty
(
preVo
.
getReceiveType
()))
{
preVo
.
setReceiveType
(
CommonConstants
.
ZERO_STRING
);
// 0-单个接收
}
}
List
<
String
>
cardDeptList
=
new
ArrayList
<>();
List
<
String
>
curIdList
=
new
ArrayList
<>();
String
cardDeptKey
=
registration
.
getEmpIdcard
()
+
CommonConstants
.
DOWN_LINE_STRING
+
registration
.
getDeptNo
();
...
...
@@ -1745,6 +1755,14 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
logService
.
saveLog
(
registration
.
getId
(),
CommonConstants
.
ZERO_STRING
,
RegistConstants
.
CONFIRM_SUBMIT
,
LocalDateTime
.
now
(),
user
.
getNickname
(),
null
);
try
{
// 设置接收终端和接收方式(批量接收)
if
(
Common
.
isNotNull
(
preVo
))
{
// 默认PC端批量接收,前端可传值覆盖
if
(
Common
.
isEmpty
(
preVo
.
getReceiveTerminal
()))
{
preVo
.
setReceiveTerminal
(
CommonConstants
.
ONE_STRING
);
// 1-PC端
}
preVo
.
setReceiveType
(
CommonConstants
.
ONE_STRING
);
// 1-批量接收
}
historyId
=
historyIdMap
.
get
(
cardDeptKey
);
if
(
Common
.
isNotNull
(
historyId
))
{
// 历史数据归档
...
...
@@ -3346,7 +3364,15 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
archiveDetail
.
setPreId
(
empPreId
);
archiveDetail
.
setPreLogId
(
logId
);
archiveDetail
.
setOldInfo
(
null
);
// old对象为空
archiveDetail
.
setNewInfo
(
JSON
.
toJSONString
(
preVo
,
JSON_FEATURES
));
// 创建副本,排除不记录日志的字段
EmployeeRegistrationPreVo
logPreVo
=
new
EmployeeRegistrationPreVo
();
BeanUtils
.
copyProperties
(
preVo
,
logPreVo
);
logPreVo
.
setReceiveTerminal
(
null
);
logPreVo
.
setReceiveType
(
null
);
logPreVo
.
setLaborFeeModifyFlag
(
null
);
logPreVo
.
setHourlyWageModifyFlag
(
null
);
logPreVo
.
setPieceWageModifyFlag
(
null
);
archiveDetail
.
setNewInfo
(
JSON
.
toJSONString
(
logPreVo
,
JSON_FEATURES
));
archiveDetail
.
setDifferenceInfo
(
null
);
archiveDetail
.
setCreateBy
(
user
.
getId
());
archiveDetail
.
setCreateName
(
user
.
getNickname
());
...
...
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