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
7c099d37
Commit
7c099d37
authored
Jun 25, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
代码优化-fxj
parent
45cede82
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
TAutoMainRelServiceImpl.java
...1/yifu/archives/service/impl/TAutoMainRelServiceImpl.java
+2
-2
HrEquator.java
...loud/plus/v1/yifu/common/core/util/equator/HrEquator.java
+2
-2
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TAutoMainRelServiceImpl.java
View file @
7c099d37
...
...
@@ -805,9 +805,9 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
//处理员工合同签订规则日志
if
(
Common
.
isNotNull
(
autoContractRuleNew
)){
if
(
Common
.
isEmpty
(
autoContractRuleOld
)){
auto
InsurRuleOld
=
new
TAutoInsur
RuleInfo
();
auto
ContractRuleOld
=
new
TAutoContract
RuleInfo
();
}
String
differenceKey
=
HrEquator
.
comparisonValueIgnoreField
(
auto
Insur
RuleOld
,
autoContractRuleNew
,
ignoreFields
);
String
differenceKey
=
HrEquator
.
comparisonValueIgnoreField
(
auto
Contract
RuleOld
,
autoContractRuleNew
,
ignoreFields
);
if
(!
Common
.
isEmpty
(
differenceKey
)){
diffKeyMap
.
put
(
"contractRule"
,
differenceKey
);
oldMap
.
put
(
"oldcontractRule"
,
autoContractRuleOld
);
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/util/equator/HrEquator.java
View file @
7c099d37
...
...
@@ -150,12 +150,12 @@ public class HrEquator extends GetterBaseEquator {
continue
;
}
curMap
.
put
(
fieldName
,
1
);
if
(!
"updateTime"
.
equals
(
fieldName
)
&&
!
"updateBy"
.
equals
(
fieldName
)
&&
!
"java.util.List"
.
equals
(
field
.
getFirstFieldType
().
getName
(
)))
{
if
(!
"updateTime"
.
equals
(
fieldName
)
&&
!
"updateBy"
.
equals
(
fieldName
)
&&
(
null
!=
field
.
getFirstFieldType
()
&&
!
"java.util.List"
.
equals
(
field
.
getFirstFieldType
().
getName
()
)))
{
newChange
=
true
;
sb
.
append
(
field
.
getFieldName
()).
append
(
","
);
}
try
{
if
(
"java.util.List"
.
equals
(
field
.
getFirstFieldType
().
getName
()))
{
if
(
null
!=
field
.
getFirstFieldType
()
&&
"java.util.List"
.
equals
(
field
.
getFirstFieldType
().
getName
()))
{
List
<
Object
>
firstList
=
(
List
<
Object
>)
field
.
getFirstVal
();
List
<
Object
>
secondList
=
(
List
<
Object
>)
field
.
getSecondVal
();
curMap
.
put
(
fieldName
,
1
);
...
...
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