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
05d7872c
Commit
05d7872c
authored
Dec 22, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-入职确认信息编辑提交
parent
ed2ff005
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
52 additions
and
45 deletions
+52
-45
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+46
-44
TEmployeePreLogServiceImpl.java
...ifu/archives/service/impl/TEmployeePreLogServiceImpl.java
+6
-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 @
05d7872c
...
@@ -618,6 +618,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
...
@@ -618,6 +618,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
if
(
Common
.
isNotNull
(
insurancePreVo
.
getId
()))
{
if
(
Common
.
isNotNull
(
insurancePreVo
.
getId
()))
{
newMap
.
put
(
insurancePreVo
.
getId
(),
insurancePreVo
);
newMap
.
put
(
insurancePreVo
.
getId
(),
insurancePreVo
);
}
}
if
(
CommonConstants
.
FOUR_STRING
.
equals
(
insurancePreVo
.
getModelType
()))
{
// 初始化信息
// 初始化信息
initInsurancePreInfo
(
employeeRegistrationPre
,
insurancePreVo
,
user
,
id
);
initInsurancePreInfo
(
employeeRegistrationPre
,
insurancePreVo
,
user
,
id
);
// 1:重复性判断
// 1:重复性判断
...
@@ -672,6 +673,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
...
@@ -672,6 +673,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
}
}
}
}
}
}
}
// if (!errorList.isEmpty()) {
// if (!errorList.isEmpty()) {
// return R.other(CommonConstants.TWO_INT, null, errorList);
// return R.other(CommonConstants.TWO_INT, null, errorList);
// }
// }
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeePreLogServiceImpl.java
View file @
05d7872c
...
@@ -316,6 +316,8 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
...
@@ -316,6 +316,8 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
oldMap
=
new
HashMap
<>();
oldMap
=
new
HashMap
<>();
}
}
List
<
TEmployeeInsurancePre
>
saveOrUpdateList
=
new
ArrayList
<>();
List
<
TEmployeeInsurancePre
>
saveOrUpdateList
=
new
ArrayList
<>();
//加一个禁止编辑的判断
List
<
TEmployeeInsurancePre
>
unUpdateList
=
new
ArrayList
<>();
// 是否修改了商险
// 是否修改了商险
boolean
isModifyInsurance
=
false
;
boolean
isModifyInsurance
=
false
;
TEmployeeInsurancePre
oldInsurance
;
TEmployeeInsurancePre
oldInsurance
;
...
@@ -400,6 +402,9 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
...
@@ -400,6 +402,9 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
this
.
setLogBaseInfo
(
empPreId
,
newInsurance
,
null
,
user
,
differenceInsuranceKey
,
logId
,
detailInsuranceLog
);
this
.
setLogBaseInfo
(
empPreId
,
newInsurance
,
null
,
user
,
differenceInsuranceKey
,
logId
,
detailInsuranceLog
);
isModifyInsurance
=
true
;
isModifyInsurance
=
true
;
detailList
.
add
(
detailInsuranceLog
);
detailList
.
add
(
detailInsuranceLog
);
}
else
if
(
CommonConstants
.
FOUR_STRING
.
equals
(
newInsurance
.
getModelType
()))
{
// 4:不可编辑
unUpdateList
.
add
(
newInsurance
);
}
}
}
else
{
}
else
{
// 没有调整的
// 没有调整的
...
@@ -667,7 +672,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
...
@@ -667,7 +672,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
HttpDaprUtil
.
invokeMethodPost
(
daprInsurancesProperties
.
getAppUrl
(),
daprInsurancesProperties
.
getAppId
()
HttpDaprUtil
.
invokeMethodPost
(
daprInsurancesProperties
.
getAppUrl
(),
daprInsurancesProperties
.
getAppId
()
,
"/temployeeinsurancepre/inner/saveOrUpdateInsuranceList"
,
"/temployeeinsurancepre/inner/saveOrUpdateInsuranceList"
,
saveOrUpdateList
,
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
,
saveOrUpdateList
,
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
}
else
{
}
else
if
(
unUpdateList
.
isEmpty
())
{
HttpDaprUtil
.
invokeMethodPost
(
daprInsurancesProperties
.
getAppUrl
(),
daprInsurancesProperties
.
getAppId
()
HttpDaprUtil
.
invokeMethodPost
(
daprInsurancesProperties
.
getAppUrl
(),
daprInsurancesProperties
.
getAppId
()
,
"/temployeeinsurancepre/inner/deleteInsuranceByPreId"
,
"/temployeeinsurancepre/inner/deleteInsuranceByPreId"
,
empPreId
,
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
,
empPreId
,
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
...
...
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