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
af166cd3
Commit
af166cd3
authored
Nov 29, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
30号版本:档案合同、商险、薪资状态;缴费库反馈列;合同提交的直接审核优化等
parent
8afe872a
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
26 deletions
+1
-26
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+1
-1
TSalaryStandardServiceImpl.java
.../yifu/salary/service/impl/TSalaryStandardServiceImpl.java
+0
-25
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
af166cd3
...
@@ -1000,7 +1000,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -1000,7 +1000,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
* @return: void
* @return: void
**/
**/
private
void
judgeAuditStatus
(
TEmployeeContractInfo
insert
)
{
private
void
judgeAuditStatus
(
TEmployeeContractInfo
insert
)
{
if
(
insert
.
getAuditStatus
()
!=
CommonConstants
.
TWO
_INT
if
(
insert
.
getAuditStatus
()
==
CommonConstants
.
ONE
_INT
&&
(
EmployeeConstants
.
CONTRACT_NAME
[
0
].
equals
(
insert
.
getContractName
())
&&
(
EmployeeConstants
.
CONTRACT_NAME
[
0
].
equals
(
insert
.
getContractName
())
||
EmployeeConstants
.
CONTRACT_NAME
[
1
].
equals
(
insert
.
getContractName
())
||
EmployeeConstants
.
CONTRACT_NAME
[
1
].
equals
(
insert
.
getContractName
())
||
EmployeeConstants
.
CONTRACT_NAME
[
2
].
equals
(
insert
.
getContractName
())))
{
||
EmployeeConstants
.
CONTRACT_NAME
[
2
].
equals
(
insert
.
getContractName
())))
{
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java
View file @
af166cd3
...
@@ -659,31 +659,6 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
...
@@ -659,31 +659,6 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
}
}
}
}
/**
* @param isDept true :含项目,要分割字符串; false:不含项目,直接用身份证,仅更新人员档案
* @Description: 提取方法,塞值
* @Author: hgw
* @Date: 2022/11/23 16:48
* @return: com.yifu.cloud.plus.v1.yifu.archives.vo.EmpStatusVo
**/
private
EmpStatusVo
getEmpStatusVo
(
Map
<
String
,
Integer
>
empStatusMap
,
boolean
isDept
)
{
EmpStatusVo
empStatusVo
=
new
EmpStatusVo
();
EmpIdCardAndDeptVo
empIdCardAndDeptVo
=
new
EmpIdCardAndDeptVo
();
List
<
EmpIdCardAndDeptVo
>
voList
=
new
ArrayList
<>();
for
(
Map
.
Entry
<
String
,
Integer
>
entry
:
empStatusMap
.
entrySet
())
{
if
(
isDept
)
{
empIdCardAndDeptVo
.
setIdCard
(
entry
.
getKey
().
split
(
CommonConstants
.
DOWN_LINE_STRING
)[
0
]);
empIdCardAndDeptVo
.
setDeptId
(
entry
.
getKey
().
split
(
CommonConstants
.
DOWN_LINE_STRING
)[
1
]);
}
else
{
empIdCardAndDeptVo
.
setIdCard
(
entry
.
getKey
());
}
empIdCardAndDeptVo
.
setStatus
(
String
.
valueOf
(
entry
.
getValue
()));
voList
.
add
(
empIdCardAndDeptVo
);
}
empStatusVo
.
setEmpInfo
(
voList
);
return
empStatusVo
;
}
/**
/**
* @Description: 添加流程进展明细
* @Description: 添加流程进展明细
* @Author: hgw
* @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