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
dc08e148
Commit
dc08e148
authored
Aug 17, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
工资-a.DELETE_FLAG = 0
parent
e5d176ea
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
8 deletions
+3
-8
SalaryAccountUtil.java
...ifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
+1
-1
SalaryConstants.java
.../yifu/cloud/plus/v1/yifu/salary/util/SalaryConstants.java
+1
-0
TOwnDeptMapper.xml
...u-salary-biz/src/main/resources/mapper/TOwnDeptMapper.xml
+1
-7
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
View file @
dc08e148
...
@@ -197,7 +197,7 @@ public class SalaryAccountUtil implements Serializable {
...
@@ -197,7 +197,7 @@ public class SalaryAccountUtil implements Serializable {
}
}
newEmp
.
setEmpName
(
empName
);
newEmp
.
setEmpName
(
empName
);
}
}
if
(
SalaryConstants
.
IF_NEW_EMPLOYEE
.
equals
(
dbFiedName
)
if
(
(
SalaryConstants
.
IF_NEW_EMPLOYEE
.
equals
(
dbFiedName
)
||
SalaryConstants
.
IS_NEW_EMPLOYEE
.
equals
(
dbFiedName
)
)
&&
SalaryConstants
.
IS_NEW
.
equals
(
cellValueStr
))
{
&&
SalaryConstants
.
IS_NEW
.
equals
(
cellValueStr
))
{
isNewEmployee
=
true
;
isNewEmployee
=
true
;
}
}
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryConstants.java
View file @
dc08e148
...
@@ -89,6 +89,7 @@ public class SalaryConstants {
...
@@ -89,6 +89,7 @@ public class SalaryConstants {
public
static
final
String
IS_MUST
=
"1"
;
public
static
final
String
IS_MUST
=
"1"
;
public
static
final
String
EMP_NAME
=
"姓名"
;
public
static
final
String
EMP_NAME
=
"姓名"
;
public
static
final
String
IF_NEW_EMPLOYEE
=
"是否新员工(默认否)"
;
public
static
final
String
IF_NEW_EMPLOYEE
=
"是否新员工(默认否)"
;
public
static
final
String
IS_NEW_EMPLOYEE
=
"是否新员工"
;
public
static
final
String
IS_NEW
=
"是"
;
public
static
final
String
IS_NEW
=
"是"
;
public
static
final
String
ID_NUMBER
=
"身份证号"
;
public
static
final
String
ID_NUMBER
=
"身份证号"
;
public
static
final
String
CHECK_ID_NUMBER
=
"身份证号码"
;
public
static
final
String
CHECK_ID_NUMBER
=
"身份证号码"
;
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TOwnDeptMapper.xml
View file @
dc08e148
...
@@ -50,12 +50,6 @@
...
@@ -50,12 +50,6 @@
</select>
</select>
<!--获取自有员工身份证-->
<!--获取自有员工身份证-->
<select
id=
"getOwnEmpList"
resultType=
"String"
>
<select
id=
"getOwnEmpList"
resultType=
"String"
>
SELECT
SELECT EMP_IDCARD FROM view_own_employee
e.EMP_IDCARD
FROM
t_own_dept d
LEFT JOIN t_salary_employee e ON e.DEPT_ID = d.dept_id
WHERE
e.FILE_STATUS = '0'
</select>
</select>
</mapper>
</mapper>
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