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
511656cc
Commit
511656cc
authored
Jun 25, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.12' into MVP1.7.12
parents
152462f4
43674d38
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
34 additions
and
26 deletions
+34
-26
TEmployeePreLogDetail.java
...d/plus/v1/yifu/archives/entity/TEmployeePreLogDetail.java
+4
-4
TAutoMainRelServiceImpl.java
...1/yifu/archives/service/impl/TAutoMainRelServiceImpl.java
+3
-7
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+1
-0
TEmployeePreLogServiceImpl.java
...ifu/archives/service/impl/TEmployeePreLogServiceImpl.java
+26
-15
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeePreLogDetail.java
View file @
511656cc
...
@@ -52,10 +52,10 @@ public class TEmployeePreLogDetail extends BaseEntity {
...
@@ -52,10 +52,10 @@ public class TEmployeePreLogDetail extends BaseEntity {
/**
/**
* 类型:1档案;2商险
* 类型:1档案;2商险
*/
*/
@ExcelAttribute
(
name
=
"类型:1档案;2商险"
,
maxLength
=
1
)
@ExcelAttribute
(
name
=
"类型:1档案;2商险
3合同
"
,
maxLength
=
1
)
@Length
(
max
=
1
,
message
=
"类型:1档案;2商险不能超过1个字符"
)
@Length
(
max
=
1
,
message
=
"类型:1档案;2商险
3合同
不能超过1个字符"
)
@ExcelProperty
(
"类型:1档案;2商险"
)
@ExcelProperty
(
"类型:1档案;2商险
3合同
"
)
@Schema
(
description
=
"类型:1档案;2商险"
)
@Schema
(
description
=
"类型:1档案;2商险
3合同
"
)
private
String
type
;
private
String
type
;
/**
/**
* 入职确认信息表ID
* 入职确认信息表ID
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TAutoMainRelServiceImpl.java
View file @
511656cc
...
@@ -485,9 +485,7 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
...
@@ -485,9 +485,7 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
break
;
break
;
}
}
}
}
if
(!
result
)
{
map
.
clear
();
map
.
clear
();
}
}
}
return
result
;
return
result
;
}
}
...
@@ -502,9 +500,7 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
...
@@ -502,9 +500,7 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
break
;
break
;
}
}
}
}
if
(!
result
)
{
map
.
clear
();
map
.
clear
();
}
}
}
return
result
;
return
result
;
}
}
...
@@ -811,7 +807,7 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
...
@@ -811,7 +807,7 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
if
(
Common
.
isEmpty
(
autoContractRuleOld
)){
if
(
Common
.
isEmpty
(
autoContractRuleOld
)){
autoInsurRuleOld
=
new
TAutoInsurRuleInfo
();
autoInsurRuleOld
=
new
TAutoInsurRuleInfo
();
}
}
String
differenceKey
=
HrEquator
.
comparisonValueIgnoreField
(
autoInsurRuleOld
,
auto
Insur
RuleNew
,
ignoreFields
);
String
differenceKey
=
HrEquator
.
comparisonValueIgnoreField
(
autoInsurRuleOld
,
auto
Contract
RuleNew
,
ignoreFields
);
if
(!
Common
.
isEmpty
(
differenceKey
)){
if
(!
Common
.
isEmpty
(
differenceKey
)){
diffKeyMap
.
put
(
"contractRule"
,
differenceKey
);
diffKeyMap
.
put
(
"contractRule"
,
differenceKey
);
oldMap
.
put
(
"oldcontractRule"
,
autoContractRuleOld
);
oldMap
.
put
(
"oldcontractRule"
,
autoContractRuleOld
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
511656cc
...
@@ -3712,6 +3712,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -3712,6 +3712,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
if
(
Common
.
isNotNull
(
detail
.
getValidityStart
())
if
(
Common
.
isNotNull
(
detail
.
getValidityStart
())
&&
Common
.
isNotNull
(
detail
.
getValidityEnd
())
&&
Common
.
isNotNull
(
detail
.
getValidityEnd
())
&&
!
"长期"
.
equals
(
detail
.
getValidityEnd
())
&&
!
"长期"
.
equals
(
detail
.
getValidityEnd
())
&&
DateUtil
.
checkStringToDate
(
detail
.
getValidityEnd
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
&&
!
DateUtil
.
stringToDate
(
detail
.
getValidityEnd
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
&&
!
DateUtil
.
stringToDate
(
detail
.
getValidityEnd
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
.
after
(
DateUtil
.
stringToDate
(
detail
.
getValidityStart
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
))){
.
after
(
DateUtil
.
stringToDate
(
detail
.
getValidityStart
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
))){
detail
.
setErrorInfo
(
EmployeeConstants
.
EMP_VALIDITY_END_START_DATE
);
detail
.
setErrorInfo
(
EmployeeConstants
.
EMP_VALIDITY_END_START_DATE
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeePreLogServiceImpl.java
View file @
511656cc
...
@@ -217,8 +217,10 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
...
@@ -217,8 +217,10 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
List
<
TEmployeePreLogDetail
>
detailList
=
new
ArrayList
<>();
List
<
TEmployeePreLogDetail
>
detailList
=
new
ArrayList
<>();
// 档案信息修改
// 档案信息修改
TEmployeePreLogDetail
detailEmpLog
=
null
;
TEmployeePreLogDetail
detailEmpLog
=
null
;
if
(
Common
.
isNotNull
(
differenceKey
)
&&
!
"insurancePreList"
.
equals
(
differenceKey
))
{
if
(
Common
.
isNotNull
(
differenceKey
)
&&
!
"insurancePreList"
.
equals
(
differenceKey
)
&&
!
"employeeContractPre"
.
equals
(
differenceKey
))
{
differenceKey
=
differenceKey
.
replace
(
"insurancePreList"
,
""
);
differenceKey
=
differenceKey
.
replace
(
"insurancePreList"
,
""
);
differenceKey
=
differenceKey
.
replace
(
"employeeContractPre"
,
""
);
diffTitle
=
"档案信息"
;
diffTitle
=
"档案信息"
;
detailEmpLog
=
new
TEmployeePreLogDetail
();
detailEmpLog
=
new
TEmployeePreLogDetail
();
detailEmpLog
.
setModelType
(
CommonConstants
.
TWO_STRING
);
detailEmpLog
.
setModelType
(
CommonConstants
.
TWO_STRING
);
...
@@ -236,7 +238,6 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
...
@@ -236,7 +238,6 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
boolean
isModifyInsurance
=
false
;
boolean
isModifyInsurance
=
false
;
TEmployeeInsurancePre
oldInsurance
;
TEmployeeInsurancePre
oldInsurance
;
String
differenceInsuranceKey
;
String
differenceInsuranceKey
;
String
differenceContractKey
;
TEmployeePreLogDetail
detailInsuranceLog
;
TEmployeePreLogDetail
detailInsuranceLog
;
for
(
TEmployeeInsurancePre
newInsurance
:
newList
)
{
for
(
TEmployeeInsurancePre
newInsurance
:
newList
)
{
differenceInsuranceKey
=
null
;
differenceInsuranceKey
=
null
;
...
@@ -292,13 +293,6 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
...
@@ -292,13 +293,6 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
saveOrUpdateList
.
add
(
newInsurance
);
saveOrUpdateList
.
add
(
newInsurance
);
}
}
}
}
boolean
isModifyContract
=
false
;
if
(
contractOld
!=
null
&&
newInfo
.
getEmployeeContractPre
()
!=
null
)
{
differenceContractKey
=
HrEquator
.
comparisonValueIgnoreField
(
contractOld
,
newInfo
.
getEmployeeContractPre
(),
CONTRACT_IGNORE_FIELD
);
if
(
null
!=
differenceContractKey
)
{
isModifyContract
=
true
;
}
}
// 如果变更了
// 如果变更了
if
(
isModifyInsurance
)
{
if
(
isModifyInsurance
)
{
if
(
Common
.
isNotNull
(
diffTitle
))
{
if
(
Common
.
isNotNull
(
diffTitle
))
{
...
@@ -307,13 +301,30 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
...
@@ -307,13 +301,30 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
diffTitle
=
"商险信息"
;
diffTitle
=
"商险信息"
;
}
}
}
}
if
(
isModifyContract
)
{
}
if
(
Common
.
isNotNull
(
diffTitle
))
{
boolean
isModifyContract
=
false
;
diffTitle
+=
"、合同信息"
;
String
differenceContractKey
=
""
;
}
else
{
if
(
contractOld
!=
null
&&
newInfo
.
getEmployeeContractPre
()
!=
null
)
{
diffTitle
=
"合同信息"
;
TEmployeeContractPre
employeeContractPre
=
newInfo
.
getEmployeeContractPre
();
}
//1.9.11 huych 附件类型不比较差异
contractOld
.
setAttaList
(
null
);
employeeContractPre
.
setAttaList
(
null
);
differenceContractKey
=
HrEquator
.
comparisonValueIgnoreField
(
contractOld
,
employeeContractPre
,
CONTRACT_IGNORE_FIELD
);
if
(
differenceContractKey
.
length
()
>
0
)
{
isModifyContract
=
true
;
}
}
if
(
isModifyContract
)
{
if
(
Common
.
isNotNull
(
diffTitle
))
{
diffTitle
+=
"、合同信息"
;
}
else
{
diffTitle
=
"合同信息"
;
}
}
detailEmpLog
=
new
TEmployeePreLogDetail
();
detailEmpLog
.
setModelType
(
CommonConstants
.
TWO_STRING
);
detailEmpLog
.
setType
(
CommonConstants
.
THREE_STRING
);
this
.
setLogBaseInfo
(
empPreId
,
contractOld
,
newInfo
.
getEmployeeContractPre
(),
user
,
differenceContractKey
,
logId
,
detailEmpLog
);
detailList
.
add
(
detailEmpLog
);
}
}
// 有修改,则加日志
// 有修改,则加日志
if
(
Common
.
isNotNull
(
diffTitle
))
{
if
(
Common
.
isNotNull
(
diffTitle
))
{
...
...
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