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
6c406d6c
Commit
6c406d6c
authored
Jul 05, 2023
by
wangzb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feature-wzb :档案和社保处Bug修复
parent
95e01019
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
197 additions
and
18 deletions
+197
-18
DispatchEmpVo.java
...om/yifu/cloud/plus/v1/yifu/archives/vo/DispatchEmpVo.java
+5
-0
UpProjectSocialFundVo.java
...cloud/plus/v1/yifu/archives/vo/UpProjectSocialFundVo.java
+2
-0
UpdateEmpVo.java
.../com/yifu/cloud/plus/v1/yifu/archives/vo/UpdateEmpVo.java
+2
-0
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+34
-3
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+4
-0
TEmployeeInfoMapper.xml
...ves-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
+5
-2
ArchivesDaprUtil.java
...cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
+2
-1
TDispatchInfo.java
.../yifu/cloud/plus/v1/yifu/social/entity/TDispatchInfo.java
+1
-0
FundHandleExportVo.java
...yifu/cloud/plus/v1/yifu/social/vo/FundHandleExportVo.java
+6
-0
SocialHandleExportVo.java
...fu/cloud/plus/v1/yifu/social/vo/SocialHandleExportVo.java
+9
-0
TDispatchAuditExportVo.java
.../cloud/plus/v1/yifu/social/vo/TDispatchAuditExportVo.java
+6
-0
TDispatchImportVo.java
.../yifu/cloud/plus/v1/yifu/social/vo/TDispatchImportVo.java
+0
-1
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+119
-11
TDispatchInfoMapper.xml
...ial-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
+2
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/DispatchEmpVo.java
View file @
6c406d6c
...
...
@@ -198,4 +198,9 @@ public class DispatchEmpVo implements Serializable {
@Schema
(
description
=
"项目状态(0正常;1已减项)"
)
private
Integer
projectStatus
;
/**
* 通信地址
*/
private
String
contactAddress
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/UpProjectSocialFundVo.java
View file @
6c406d6c
...
...
@@ -51,4 +51,6 @@ public class UpProjectSocialFundVo implements Serializable {
String
empName
;
String
deptName
;
String
detailId
;
String
contactAddress
;
String
highEducation
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/UpdateEmpVo.java
View file @
6c406d6c
...
...
@@ -25,6 +25,8 @@ public class UpdateEmpVo implements Serializable {
// 备注
String
remarkTemp
;
// 通信地址
String
contactAddress
;
// type 0 审核通过 2.审核不通过
String
type
;
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
6c406d6c
...
...
@@ -2211,9 +2211,11 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
employeeInfo
=
baseMapper
.
selectOne
(
Wrappers
.<
TEmployeeInfo
>
query
().
lambda
()
.
eq
(
TEmployeeInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
TEmployeeInfo:
:
getEmpIdcard
,
vo
.
getEmpIdCard
())
.
eq
(
TEmployeeInfo:
:
getStatus
,
CommonConstants
.
ZERO_INT
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
employeeInfo
)){
if
(
Common
.
isNotNull
(
vo
.
getContactAddress
()))
{
employeeInfo
.
setContactAddress
(
vo
.
getContactAddress
());
}
employeeInfo
.
setStatus
(
CommonConstants
.
ONE_INT
);
baseMapper
.
updateById
(
employeeInfo
);
}
...
...
@@ -2368,9 +2370,38 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
employeeInfo
=
new
TEmployeeInfo
();
BeanUtil
.
copyProperties
(
empAdd
,
employeeInfo
);
employeeInfo
.
setEmpCode
(
getCode
());
employeeInfo
.
setContactAddress
(
employeeInfo
.
getContactAddress
());
employeeInfo
.
setContactAddress
(
empAdd
.
getContactAddress
());
if
(
empAdd
.
getHignEducation
().
equals
(
"文盲"
))
{
employeeInfo
.
setHignEducation
(
"1"
);
}
if
(
empAdd
.
getHignEducation
().
equals
(
"小学"
))
{
employeeInfo
.
setHignEducation
(
"2"
);
}
if
(
empAdd
.
getHignEducation
().
equals
(
"初中"
))
{
employeeInfo
.
setHignEducation
(
"3"
);
}
if
(
empAdd
.
getHignEducation
().
equals
(
"高中"
))
{
employeeInfo
.
setHignEducation
(
"4"
);
}
if
(
empAdd
.
getHignEducation
().
equals
(
"大专"
))
{
employeeInfo
.
setHignEducation
(
"5"
);
}
if
(
empAdd
.
getHignEducation
().
equals
(
"本科"
))
{
employeeInfo
.
setHignEducation
(
"6"
);
}
if
(
empAdd
.
getHignEducation
().
equals
(
"硕士"
))
{
employeeInfo
.
setHignEducation
(
"7"
);
}
if
(
empAdd
.
getHignEducation
().
equals
(
"技工"
))
{
employeeInfo
.
setHignEducation
(
"9"
);
}
if
(
empAdd
.
getHignEducation
().
equals
(
"职高"
))
{
employeeInfo
.
setHignEducation
(
"10"
);
}
if
(
empAdd
.
getHignEducation
().
equals
(
"中专"
))
{
employeeInfo
.
setHignEducation
(
"11"
);
}
employeeInfo
.
setIsCollege
(
CommonConstants
.
ONE_INT
);
employeeInfo
.
setHignEducation
(
employeeInfo
.
getHignEducation
());
employeeInfo
.
setStatus
(
CommonConstants
.
ZERO_INT
);
date
=
IdCardUtil
.
getBirthdate
(
employeeInfo
.
getEmpIdcard
());
if
(
Common
.
isNotNull
(
date
))
{
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
6c406d6c
...
...
@@ -1396,6 +1396,9 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
if
(
Common
.
isNotNull
(
vo
.
getFundStatus
()))
{
employee
.
setFundStatus
(
Integer
.
parseInt
(
vo
.
getFundStatus
()));
}
if
(
Common
.
isNotNull
(
vo
.
getHighEducation
()))
{
employee
.
setHignEducation
(
vo
.
getHighEducation
());
}
if
(
Common
.
isNotNull
(
vo
.
getFileProvince
()))
{
employee
.
setFileProvince
(
Integer
.
parseInt
(
vo
.
getFileProvince
()));
}
...
...
@@ -1410,6 +1413,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
if
(
Common
.
isNotNull
(
vo
.
getMobile
()))
{
employee
.
setEmpPhone
(
vo
.
getMobile
());
}
employee
.
setIsCollege
(
CommonConstants
.
ONE_INT
);
tEmployeeInfoMapper
.
updateSocialInfoById
(
employee
);
}
TEmployeeProject
project
=
baseMapper
.
selectOne
(
Wrappers
.<
TEmployeeProject
>
query
().
lambda
()
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
View file @
6c406d6c
...
...
@@ -873,7 +873,7 @@
select
a.ID,a.EMP_CODE,a.EMP_NAME,
a.EMP_IDCARD,a.EMP_NATIONAL,a.EMP_PHONE,a.ID_PROVINCE,a.ID_CITY,
a.ID_TOWN,a.EMP_REGIS_TYPE,a.FILE_PROVINCE,a.FILE_CITY,a.FILE_TOWN,a.HIGN_EDUCATION,a.FILE_STATUS,
a.ID_TOWN,a.EMP_REGIS_TYPE,a.FILE_PROVINCE,a.FILE_CITY,a.FILE_TOWN,a.HIGN_EDUCATION,a.FILE_STATUS,
a.CONTACT_ADDRESS,
b.CONTRACT_NAME,b.CONTRACT_TYPE,
b.CONTRACT_START,b.CONTRACT_END,b.CONTRACT_TERM,b.CONTRACT_SUB_NAME,b.CONTRACT_ID,
...
...
@@ -882,7 +882,7 @@
c.UNIT_NO,c.DEPT_ID,c.DEPT_NAME,c.DEPT_NO,c.POST,c.EMP_NO,c.PROJECT_STATUS,c.EMP_NATRUE
from (
select e.ID,e.EMP_CODE,e.EMP_NAME,e.EMP_IDCARD,e.EMP_NATIONAL,e.EMP_PHONE,e.ID_PROVINCE,e.ID_CITY,
e.ID_TOWN,e.EMP_REGIS_TYPE,e.FILE_PROVINCE,e.FILE_CITY,e.FILE_TOWN,e.HIGN_EDUCATION,e.FILE_STATUS
e.ID_TOWN,e.EMP_REGIS_TYPE,e.FILE_PROVINCE,e.FILE_CITY,e.FILE_TOWN,e.HIGN_EDUCATION,e.FILE_STATUS
,e.CONTACT_ADDRESS
from t_employee_info e
where 1=1 and e.DELETE_FLAG = '0'
<if
test=
"checkVo != null"
>
...
...
@@ -1139,6 +1139,9 @@
<if
test=
"tEmployeeInfo.id != null"
>
a.id=a.id,
</if>
<if
test=
"tEmployeeInfo.socialStatus != null"
>
SOCIAL_STATUS=#{tEmployeeInfo.socialStatus},
</if>
<if
test=
"tEmployeeInfo.fundStatus != null"
>
FUND_STATUS=#{tEmployeeInfo.fundStatus},
</if>
<if
test=
"tEmployeeInfo.hignEducation != null"
>
HIGN_EDUCATION=#{tEmployeeInfo.hignEducation},
</if>
<if
test=
"tEmployeeInfo.contactAddress != null"
>
CONTACT_ADDRESS=#{tEmployeeInfo.contactAddress},
</if>
<if
test=
"tEmployeeInfo.isCollege != null"
>
IS_COLLEGE='1',
</if>
<if
test=
"tEmployeeInfo.fileProvince != null"
>
a.FILE_PROVINCE=#{tEmployeeInfo.fileProvince},
</if>
<if
test=
"tEmployeeInfo.fileCity != null"
>
a.FILE_CITY=#{tEmployeeInfo.fileCity},
</if>
<if
test=
"tEmployeeInfo.fileCity != null"
>
...
...
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
View file @
6c406d6c
...
...
@@ -281,7 +281,7 @@ public class ArchivesDaprUtil {
* @Param type 0 审核通过 1 审核不通过
* @return
**/
public
R
<
Boolean
>
updateEmpInfo
(
String
empIdCard
,
String
projectNo
,
String
contractId
,
String
type
,
String
remarkTemp
,
YifuUser
user
){
public
R
<
Boolean
>
updateEmpInfo
(
String
empIdCard
,
String
contactAddress
,
String
projectNo
,
String
contractId
,
String
type
,
String
remarkTemp
,
YifuUser
user
){
if
(
Common
.
isEmpty
(
empIdCard
)
||
Common
.
isEmpty
(
projectNo
)
||
Common
.
isEmpty
(
type
)){
...
...
@@ -295,6 +295,7 @@ public class ArchivesDaprUtil {
vo
.
setType
(
type
);
vo
.
setCreateBy
(
user
.
getId
());
vo
.
setCreateName
(
user
.
getNickname
());
vo
.
setContactAddress
(
contactAddress
);
R
<
Boolean
>
res
=
HttpDaprUtil
.
invokeMethodPost
(
daprArchivesProperties
.
getAppUrl
(),
daprArchivesProperties
.
getAppId
()
,
"/temployeeinfo/inner/updateEmpInfo"
,
JSON
.
toJSONString
(
vo
),
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TDispatchInfo.java
View file @
6c406d6c
...
...
@@ -769,4 +769,5 @@ public class TDispatchInfo extends BaseEntity {
@TableField
(
exist
=
false
)
private
String
socialFailureType
;
private
String
contactAddress
;
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/FundHandleExportVo.java
View file @
6c406d6c
...
...
@@ -92,6 +92,12 @@ public class FundHandleExportVo implements Serializable {
@ExcelProperty
(
"身份证所在地"
)
private
String
idCardAddress
;
@ExcelAttribute
(
name
=
"通信地址"
)
@Schema
(
description
=
"通信地址"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"通信地址"
)
private
String
contactAddress
;
/**
* 创建人姓名
*/
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SocialHandleExportVo.java
View file @
6c406d6c
...
...
@@ -160,6 +160,15 @@ public class SocialHandleExportVo implements Serializable {
@ExcelProperty
(
"身份证所在地"
)
private
String
idCardAddress
;
/**
* 通信地址
*/
@ExcelAttribute
(
name
=
"通信地址"
)
@Schema
(
description
=
"通信地址"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"通信地址"
)
private
String
contactAddress
;
/**
* 户口性质
*/
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchAuditExportVo.java
View file @
6c406d6c
...
...
@@ -94,6 +94,12 @@ public class TDispatchAuditExportVo {
@ExcelProperty
(
"身份证所在地"
)
private
String
idCardAddress
;
@ExcelAttribute
(
name
=
"通信地址"
)
@Schema
(
description
=
"通信地址"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"通信地址"
)
private
String
contactAddress
;
@ExcelAttribute
(
name
=
"社保户"
,
maxLength
=
50
)
@Schema
(
description
=
"社保户"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchImportVo.java
View file @
6c406d6c
...
...
@@ -502,7 +502,6 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
private
String
dispatchId
;
/**
* 订单ID
*/
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
6c406d6c
...
...
@@ -445,7 +445,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
Map
<
String
,
TDispatchInfo
>
dispatchMap
=
new
HashMap
<>();
// 新增社保公积金查询
Map
<
String
,
TSocialFundInfo
>
socialFundAddMap
=
new
HashMap
<>();
DispatchEmpVo
empVo
;
DispatchEmpVo
empVo
=
null
;
SysBaseSetInfo
socialSet
;
SysBaseSetInfo
fundSet
;
ProjectSetInfoVo
setInfoVo
=
null
;
...
...
@@ -592,7 +592,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
addVo
.
setProjectsMap
(
projectsMap
);
R
<
EmpDispatchAddVo
>
res
=
archivesDaprUtil
.
addDispatchInfo
(
addVo
);
// 开始插入各种数据了
insertAllInfo
(
excelVOList
,
errorMessageList
,
res
,
socialsMap
,
fundsMap
,
socialFundAddMap
,
dispatchMap
,
excelVOTemp
,
dispatchPart
,
injury
);
insertAllInfo
(
excelVOList
,
errorMessageList
,
empVo
,
res
,
socialsMap
,
fundsMap
,
socialFundAddMap
,
dispatchMap
,
excelVOTemp
,
dispatchPart
,
injury
);
// 清理map list 等数据
Common
.
clear
(
excelVOList
);
Common
.
clear
(
empAddsMap
);
...
...
@@ -621,6 +621,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
private
void
insertAllInfo
(
List
<
TDispatchImportVo
>
excelVOList
,
List
<
ErrorMessage
>
errorMessageList
,
DispatchEmpVo
empVo
,
R
<
EmpDispatchAddVo
>
res
,
Map
<
String
,
TSocialInfo
>
socialsMap
,
Map
<
String
,
TProvidentFund
>
fundsMap
,
...
...
@@ -693,6 +694,13 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if
(
Common
.
isNotNull
(
dispatchMap
)){
dispatch
=
dispatchMap
.
get
(
excel
.
getEmpIdcard
());
if
(
Common
.
isNotNull
(
dispatch
)){
if
(
Common
.
isNotNull
(
empVo
))
{
if
(
Common
.
isNotNull
(
empVo
.
getContactAddress
())
&&
!
excel
.
getContactAddress
().
equals
(
empVo
.
getContactAddress
()))
{
dispatch
.
setContactAddress
(
empVo
.
getContactAddress
());
}
}
else
{
dispatch
.
setContactAddress
(
excel
.
getContactAddress
());
}
if
(
Common
.
isNotNull
(
social
)){
dispatch
.
setSocialId
(
social
.
getId
());
dispatch
.
setSocialHouseholdName
(
social
.
getSocialHouseholdName
());
...
...
@@ -708,6 +716,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if
(
Common
.
isNotNull
(
project
)){
dispatch
.
setEmpNo
(
project
.
getEmpNo
());
}
insertDispatch
(
emp
,
dispatch
);
// 新增派单申请提交记录
auditInfo
=
new
TAuditInfo
();
...
...
@@ -727,7 +736,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
forecastLibraryService
.
updateForecastLibaryByDispatch
(
null
,
null
,
socialFund
);
}
// 同步更新人员档案和项目档案的社保公积金状态
updateDocSocialFund
(
social
,
fund
,
socialFund
,
excel
);
updateDocSocialFund
(
social
,
fund
,
socialFund
,
empVo
,
excel
);
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
CommonConstants
.
SAVE_SUCCESS
,
CommonConstants
.
GREEN
));
}
catch
(
Exception
e
){
log
.
error
(
"派单新增异常:"
,
e
);
...
...
@@ -755,13 +765,13 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
auditInfoMapper
.
insert
(
auditInfo
);
}
private
void
updateDocSocialFund
(
TSocialInfo
social
,
TProvidentFund
fund
,
TSocialFundInfo
socialFund
,
TDispatchImportVo
excel
)
{
private
void
updateDocSocialFund
(
TSocialInfo
social
,
TProvidentFund
fund
,
TSocialFundInfo
socialFund
,
DispatchEmpVo
empVo
,
TDispatchImportVo
excel
)
{
UpProjectSocialFundVo
vo
=
new
UpProjectSocialFundVo
();
if
(
Common
.
isNotNull
(
social
)){
if
(
Common
.
isNotNull
(
social
))
{
vo
.
setSocialStatus
(
CommonConstants
.
ONE_STRING
);
vo
.
setDepartNo
(
socialFund
.
getSettleDomainCode
());
}
if
(
Common
.
isNotNull
(
fund
)){
if
(
Common
.
isNotNull
(
fund
))
{
vo
.
setFundStatus
(
CommonConstants
.
ONE_STRING
);
vo
.
setDepartNo
(
socialFund
.
getSettleDomainCodeFund
());
}
...
...
@@ -782,9 +792,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
&&
(
(
CommonConstants
.
ONE_STRING
.
equals
(
socialFund
.
getBigailmentHandle
())
&&
CommonConstants
.
ZERO_STRING
.
equals
(
socialFund
.
getIsIllness
()))
||
(
CommonConstants
.
ONE_STRING
.
equals
(
socialFund
.
getIsIllness
()))
||
(
CommonConstants
.
ONE_STRING
.
equals
(
socialFund
.
getIsIllness
()))
));
if
(
Common
.
isNotNull
(
socialFund
)
&&
flagTemp
){
if
(
Common
.
isNotNull
(
socialFund
)
&&
flagTemp
)
{
vo
.
setSocialStatus
(
CommonConstants
.
TWO_STRING
);
}
vo
.
setFileProvince
(
excel
.
getFileProvince
());
...
...
@@ -792,6 +802,95 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
vo
.
setFileTown
(
excel
.
getFileTown
());
vo
.
setMobile
(
excel
.
getEmpMobile
());
vo
.
setEmpIdCard
(
socialFund
.
getEmpIdcard
());
if
(
Common
.
isNotNull
(
excel
.
getEducationName
()))
{
if
(
Common
.
isNotNull
(
empVo
))
{
if
(
Common
.
isEmpty
(
empVo
.
getHignEducation
()))
{
if
(
excel
.
getEducationName
().
equals
(
"文盲"
))
{
vo
.
setHighEducation
(
"1"
);
}
if
(
excel
.
getEducationName
().
equals
(
"小学"
))
{
vo
.
setHighEducation
(
"2"
);
}
if
(
excel
.
getEducationName
().
equals
(
"初中"
))
{
vo
.
setHighEducation
(
"3"
);
}
if
(
excel
.
getEducationName
().
equals
(
"高中"
))
{
vo
.
setHighEducation
(
"4"
);
}
if
(
excel
.
getEducationName
().
equals
(
"大专"
))
{
vo
.
setHighEducation
(
"5"
);
}
if
(
excel
.
getEducationName
().
equals
(
"本科"
))
{
vo
.
setHighEducation
(
"6"
);
}
if
(
excel
.
getEducationName
().
equals
(
"硕士"
))
{
vo
.
setHighEducation
(
"7"
);
}
if
(
excel
.
getEducationName
().
equals
(
"技工"
))
{
vo
.
setHighEducation
(
"9"
);
}
if
(
excel
.
getEducationName
().
equals
(
"职高"
))
{
vo
.
setHighEducation
(
"10"
);
}
if
(
excel
.
getEducationName
().
equals
(
"中专"
))
{
vo
.
setHighEducation
(
"11"
);
}
}
if
(
Common
.
isNotNull
(
empVo
.
getHignEducation
()))
{
if
(
excel
.
getEducationName
().
equals
(
"文盲"
))
{
if
(
empVo
.
getHignEducation
()
==
"1"
)
{
vo
.
setHighEducation
(
"1"
);
}
}
if
(
excel
.
getEducationName
().
equals
(
"小学"
))
{
if
(
empVo
.
getHignEducation
()
==
"2"
)
{
vo
.
setHighEducation
(
"2"
);
}
}
if
(
excel
.
getEducationName
().
equals
(
"初中"
))
{
if
(
empVo
.
getHignEducation
()
==
"3"
)
{
vo
.
setHighEducation
(
"3"
);
}
}
if
(
excel
.
getEducationName
().
equals
(
"高中"
))
{
if
(
empVo
.
getHignEducation
()
==
"4"
)
{
vo
.
setHighEducation
(
"4"
);
}
}
if
(
excel
.
getEducationName
().
equals
(
"大专"
))
{
if
(
empVo
.
getHignEducation
()
==
"5"
)
{
vo
.
setHighEducation
(
"5"
);
}
}
if
(
excel
.
getEducationName
().
equals
(
"本科"
))
{
if
(
empVo
.
getHignEducation
()
==
"6"
)
{
vo
.
setHighEducation
(
"6"
);
}
}
if
(
excel
.
getEducationName
().
equals
(
"硕士"
))
{
if
(
empVo
.
getHignEducation
()
==
"7"
)
{
vo
.
setHighEducation
(
"7"
);
}
}
if
(
excel
.
getEducationName
().
equals
(
"技工"
))
{
if
(
empVo
.
getHignEducation
()
==
"9"
)
{
vo
.
setHighEducation
(
"9"
);
}
}
if
(
excel
.
getEducationName
().
equals
(
"职高"
))
{
if
(
empVo
.
getHignEducation
()
==
"10"
)
{
vo
.
setHighEducation
(
"10"
);
}
}
if
(
excel
.
getEducationName
().
equals
(
"中专"
))
{
if
(
empVo
.
getHignEducation
()
==
"11"
)
{
vo
.
setHighEducation
(
"11"
);
}
}
}
}
}
R
<
Boolean
>
resUp
=
archivesDaprUtil
.
updateProjectSocialFund
(
vo
);
if
(
Common
.
isEmpty
(
resUp
)
||
!(
CommonConstants
.
SUCCESS
.
intValue
()
==
resUp
.
getCode
())
||
!
resUp
.
getData
().
booleanValue
()){
ServiceUtil
.
runTimeExceptionDiy
(
vo
.
getEmpIdCard
()+
DispatchConstants
.
DISPATCH_SYN_DOC_EXE
);
...
...
@@ -1211,6 +1310,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if
(
Common
.
isEmpty
(
dispatch
.
getDispatchItem
())){
return
true
;
}
dispatch
.
setContactAddress
(
excel
.
getContactAddress
());
dispatch
.
setOrganName
(
user
.
getDeptName
());
dispatch
.
setCreateBy
(
user
.
getId
());
dispatch
.
setCreateTime
(
LocalDateTime
.
now
());
...
...
@@ -1501,7 +1601,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
// 有档案无项目档案无合同
if
(
Common
.
isNotNull
(
empVo
)
&&
Common
.
isEmpty
(
empVo
.
getDeptNo
()))
{
// 初始化项目档案
Map
<
String
,
String
>
map
=
new
HashMap
<
String
,
String
>();
map
.
put
(
empVo
.
getEmpIdcard
(),
empVo
.
getContactAddress
());
initProjectInfo
(
projects
,
excel
,
empVo
,
user
,
setInfoVo
,
socialSet
);
// 初始化合同
initContractInfo
(
contracts
,
excel
,
empVo
,
setInfoVo
,
user
);
...
...
@@ -1510,6 +1615,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if
(
Common
.
isNotNull
(
empVo
)
&&
Common
.
isNotNull
(
empVo
.
getDeptNo
())
&&
Common
.
isEmpty
(
empVo
.
getContractType
()))
{
// 初始化合同
initContractInfo
(
contracts
,
excel
,
empVo
,
setInfoVo
,
user
);
}
...
...
@@ -2054,6 +2161,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
emp
.
setEmpNatrue
(
excel
.
getEmpType
());
emp
.
setEmpPhone
(
excel
.
getEmpMobile
());
emp
.
setEmpRegisType
(
excel
.
getEmpRegisType
());
emp
.
setHignEducation
(
excel
.
getEducationName
());
emp
.
setContractStatus
(
CommonConstants
.
ZERO_INT
);
emp
.
setDeleteFlag
(
CommonConstants
.
ZERO_STRING
);
emp
.
setFileSource
(
CommonConstants
.
ONE_STRING
);
...
...
@@ -3378,10 +3486,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if
(
CommonConstants
.
dingleDigitStrArray
[
0
].
equals
(
dis
.
getType
())){
R
<
Boolean
>
res
=
null
;
if
(
CommonConstants
.
ZERO_INT
==
flag
&&
!
isSSC
){
res
=
archivesDaprUtil
.
updateEmpInfo
(
dis
.
getEmpIdcard
(),
dis
.
getSettleDomainCode
(),
dis
.
getContractId
(),
CommonConstants
.
ZERO_STRING
,
remarkTemp
,
user
);
res
=
archivesDaprUtil
.
updateEmpInfo
(
dis
.
getEmpIdcard
(),
dis
.
get
ContactAddress
(),
dis
.
get
SettleDomainCode
(),
dis
.
getContractId
(),
CommonConstants
.
ZERO_STRING
,
remarkTemp
,
user
);
}
if
(
CommonConstants
.
ONE_INT
==
flag
){
res
=
archivesDaprUtil
.
updateEmpInfo
(
dis
.
getEmpIdcard
(),
dis
.
getSettleDomainCode
(),
dis
.
getContractId
(),
CommonConstants
.
ONE_STRING
,
remarkTemp
,
user
);
res
=
archivesDaprUtil
.
updateEmpInfo
(
dis
.
getEmpIdcard
(),
null
,
dis
.
getSettleDomainCode
(),
dis
.
getContractId
(),
CommonConstants
.
ONE_STRING
,
remarkTemp
,
user
);
}
if
((
Common
.
isEmpty
(
res
)
||
CommonConstants
.
SUCCESS
!=
res
.
getCode
())
&&
!
isSSC
){
ServiceUtil
.
runTimeExceptionDiy
(
"更新人员档案、项目档案、合同状态异常:"
+
(
Common
.
isNotNull
(
res
)?
res
.
getMsg
():
CommonConstants
.
EMPTY_STRING
));
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @
6c406d6c
...
...
@@ -866,6 +866,7 @@
a.FUND_REDUCE_DATE,
a.LEAVE_DATE,
a.REDUCE_REASON,
a.CONTACT_ADDRESS,
b.SOCIAL_START_DATE,
b.PAYMENT_TYPE,
b.RECORD_BASE,
...
...
@@ -1159,6 +1160,7 @@
a.ID_CARD_ADDRESS,
a.CREATE_NAME,
a.PROVIDENT_HOUSEHOLD_NAME,
a.CONTACT_ADDRESS,
f.PROVIDENT_START,
f.UNIT_PROVIDENG_CARDINAL,
a.FUND_REDUCE_DATE,
...
...
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