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
8afe872a
You need to sign in or sign up before continuing.
Commit
8afe872a
authored
Nov 29, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
30号版本:档案合同、商险、薪资状态;缴费库反馈列;合同提交的直接审核优化等
parent
4f49f53e
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
8 deletions
+10
-8
EmpIdCardAndDeptVo.java
...fu/cloud/plus/v1/yifu/archives/vo/EmpIdCardAndDeptVo.java
+0
-2
EmployeeConstants.java
...ud/plus/v1/yifu/archives/constants/EmployeeConstants.java
+1
-1
TEmployeeProjectMapper.xml
...-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
+1
-1
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+8
-4
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmpIdCardAndDeptVo.java
View file @
8afe872a
...
...
@@ -11,8 +11,6 @@ import lombok.Data;
public
class
EmpIdCardAndDeptVo
{
// 身份证
private
String
idCard
;
// 项目id
private
String
deptId
;
// 项目编码:薪资使用的,只有编码
private
String
deptNo
;
// 状态
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/constants/EmployeeConstants.java
View file @
8afe872a
...
...
@@ -71,6 +71,6 @@ public class EmployeeConstants {
* @Date: 2022/11/25 16:42
* @return:
**/
public
static
final
String
CONTRACT_NAME
[]
=
{
"标准合同"
,
"劳
动
派遣合同"
,
"其他"
};
public
static
final
String
CONTRACT_NAME
[]
=
{
"标准合同"
,
"劳
务
派遣合同"
,
"其他"
};
}
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
View file @
8afe872a
...
...
@@ -852,7 +852,7 @@
<!-- 更新项目档案商险状态 -->
<update
id=
"updateEmployeeInsuranceStatus"
>
update t_employee_project a set a.INSURANCE_STATUS = #{emp.status} where a.EMP_IDCARD = #{emp.idCard} and a.DEPT_
ID = #{emp.deptId
}
update t_employee_project a set a.INSURANCE_STATUS = #{emp.status} where a.EMP_IDCARD = #{emp.idCard} and a.DEPT_
NO = #{emp.deptNo
}
</update>
<!-- 更新项目档案薪资状态 -->
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
8afe872a
...
...
@@ -1571,11 +1571,15 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
Map
<
String
,
Integer
>
proStatusMap
=
new
HashMap
<>();
// 人员档案状态
Map
<
String
,
Integer
>
empStatusMap
=
new
HashMap
<>();
for
(
TInsuranceDetail
detail
:
sourceList
)
{
proStatusMap
.
put
(
detail
.
getEmpIdcardNo
()
+
CommonConstants
.
DOWN_LINE_STRING
+
detail
.
getDeptNo
(),
Integer
.
parseInt
(
toStatus
));
empStatusMap
.
put
(
detail
.
getEmpIdcardNo
(),
Integer
.
parseInt
(
toStatus
));
}
Integer
proStatus
;
Integer
empStatus
;
int
status
;
for
(
TInsuranceDetail
detail
:
sourceEmpList
)
{
proStatus
=
proStatusMap
.
get
(
detail
.
getEmpIdcardNo
()
+
CommonConstants
.
DOWN_LINE_STRING
+
detail
.
getDept
Id
());
proStatus
=
proStatusMap
.
get
(
detail
.
getEmpIdcardNo
()
+
CommonConstants
.
DOWN_LINE_STRING
+
detail
.
getDept
No
());
empStatus
=
empStatusMap
.
get
(
detail
.
getEmpIdcardNo
());
// 判断该项目的商险的状态 2正常>4处理中>3失效>0无商险
...
...
@@ -1600,7 +1604,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
else
{
empStatus
=
status
;
}
proStatusMap
.
put
(
detail
.
getEmpIdcardNo
()+
CommonConstants
.
DOWN_LINE_STRING
+
detail
.
getDept
Id
(),
proStatus
);
proStatusMap
.
put
(
detail
.
getEmpIdcardNo
()+
CommonConstants
.
DOWN_LINE_STRING
+
detail
.
getDept
No
(),
proStatus
);
empStatusMap
.
put
(
detail
.
getEmpIdcardNo
(),
empStatus
);
}
if
(!
proStatusMap
.
isEmpty
())
{
...
...
@@ -1631,7 +1635,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
for
(
Map
.
Entry
<
String
,
Integer
>
entry
:
empStatusMap
.
entrySet
())
{
if
(
isDept
)
{
empIdCardAndDeptVo
.
setIdCard
(
entry
.
getKey
().
split
(
CommonConstants
.
DOWN_LINE_STRING
)[
0
]);
empIdCardAndDeptVo
.
setDept
Id
(
entry
.
getKey
().
split
(
CommonConstants
.
DOWN_LINE_STRING
)[
1
]);
empIdCardAndDeptVo
.
setDept
No
(
entry
.
getKey
().
split
(
CommonConstants
.
DOWN_LINE_STRING
)[
1
]);
}
else
{
empIdCardAndDeptVo
.
setIdCard
(
entry
.
getKey
());
}
...
...
@@ -1680,7 +1684,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
List
<
EmpIdCardAndDeptVo
>
voList
=
new
ArrayList
<>();
for
(
TInsuranceDetail
d
:
sourceList
)
{
empIdCardAndDeptVo
.
setIdCard
(
d
.
getEmpIdcardNo
());
empIdCardAndDeptVo
.
setDept
Id
(
d
.
getDeptId
());
empIdCardAndDeptVo
.
setDept
No
(
d
.
getDeptNo
());
empIdCardAndDeptVo
.
setStatus
(
status
);
voList
.
add
(
empIdCardAndDeptVo
);
}
...
...
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