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
0c550a1b
Commit
0c550a1b
authored
Sep 14, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.10工资相关
parent
6b6d6b53
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
10 deletions
+21
-10
TSalaryStandardOriginalServiceImpl.java
...lary/service/impl/TSalaryStandardOriginalServiceImpl.java
+21
-10
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardOriginalServiceImpl.java
View file @
0c550a1b
...
...
@@ -947,11 +947,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
if
(
Common
.
isEmpty
(
rule
))
{
rule
=
"等于"
;
}
switch
(
rule
)
{
case
"等于"
:
isError
=
!
titleStr
.
equals
(
key
);
break
;
case
"包含"
:
isError
=
!
titleStr
.
contains
(
key
);
break
;
default
:
isError
=
!
titleStr
.
equals
(
key
);
break
;
}
isError
=
this
.
judgeRule
(
titleStr
,
key
,
rule
);
if
(
isError
&&
isOther
)
{
return
R
.
failed
(
"未找到对应配置的表头,请核实导入的原表信息后,重新尝试!!"
);
}
...
...
@@ -965,11 +961,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
if
(
Common
.
isEmpty
(
rule
))
{
rule
=
"等于"
;
}
switch
(
rule
)
{
case
"等于"
:
isFixError
=
!
titleStr
.
equals
(
key
);
break
;
case
"包含"
:
isFixError
=
!
titleStr
.
contains
(
key
);
break
;
default
:
isFixError
=
!
titleStr
.
equals
(
key
);
break
;
}
isFixError
=
this
.
judgeRule
(
titleStr
,
key
,
rule
);
// 表示匹配到了
if
(!
isFixError
)
{
curValue
=
curMap
.
get
(
key
);
...
...
@@ -1097,6 +1089,25 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
return
R
.
failed
(
"无法识别数据!请联系管理员!"
);
}
/**
* @param titleStr Excel表头
* @param key 关键字
* @param rule 规则,汉字:等于、包含
* @Description: 判断关键字是否正确
* @Author: hgw
* @Date: 2024/9/13 17:35
* @return: boolean
**/
private
boolean
judgeRule
(
String
titleStr
,
String
key
,
String
rule
)
{
boolean
isFixError
;
switch
(
rule
)
{
case
"等于"
:
isFixError
=
!
titleStr
.
equals
(
key
);
break
;
case
"包含"
:
isFixError
=
!
titleStr
.
contains
(
key
);
break
;
default
:
isFixError
=
!
titleStr
.
equals
(
key
);
break
;
}
return
isFixError
;
}
/**
* @Description: 薪资原表配置导出
* @Author: hgw
...
...
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