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
006e7aa5
Commit
006e7aa5
authored
Nov 25, 2022
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
项目档案问题优化
parent
84423075
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
44 additions
and
52 deletions
+44
-52
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+26
-44
DoJointTask.java
...m/yifu/cloud/plus/v1/yifu/archives/utils/DoJointTask.java
+18
-8
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
006e7aa5
...
@@ -41,14 +41,13 @@ import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeProjectService;
...
@@ -41,14 +41,13 @@ import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeProjectService;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TSettleDomainService
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TSettleDomainService
;
import
com.yifu.cloud.plus.v1.yifu.archives.utils.DoJointTask
;
import
com.yifu.cloud.plus.v1.yifu.archives.utils.DoJointTask
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes
;
import
com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprCheckProperties
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprCheckProperties
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprUpmsProperties
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprUpmsProperties
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
lombok.RequiredArgsConstructor
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.log4j.Log4j2
;
import
lombok.extern.log4j.Log4j2
;
...
@@ -468,7 +467,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
...
@@ -468,7 +467,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
/**
/**
* 单次缓存的数据量
* 单次缓存的数据量
*/
*/
public
static
final
int
BATCH_COUNT
=
CommonConstants
.
BATCH_COUNT
;
public
static
final
int
BATCH_COUNT
=
CommonConstants
.
BATCH_COUNT
1
;
/**
/**
*临时存储
*临时存储
*/
*/
...
@@ -523,52 +522,39 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
...
@@ -523,52 +522,39 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
EmployeeProjectNewOldVO
newOldProject
;
EmployeeProjectNewOldVO
newOldProject
;
// 新老项目档案List
// 新老项目档案List
List
<
EmployeeProjectNewOldVO
>
updateProjectList
=
new
ArrayList
<>();
List
<
EmployeeProjectNewOldVO
>
updateProjectList
=
new
ArrayList
<>();
String
leaveReason
;
// 渲染字典值
Map
<
String
,
String
>
dicObj
=
(
Map
<
String
,
String
>)
RedisUtil
.
redis
.
opsForValue
().
get
(
CacheConstants
.
DICT_DETAILS
+
CommonConstants
.
COLON_STRING
+
"social_reduce_reason"
);
TEmployeeProject
tEmployeeProject
;
TEmployeeInfo
tEmployeeInfo
;
TEmployeeProject
tEmployeeProjectOld
;
// 执行数据插入操作 组装 PostDto
// 执行数据插入操作 组装 PostDto
for
(
EmployeeXProjectVO
excel
:
excelVOList
)
{
for
(
EmployeeXProjectVO
excel
:
excelVOList
)
{
//根据身份证和项目编码获取项目档案
//根据身份证和项目编码获取项目档案
TEmployeeProject
tEmployeeProject
=
this
.
getOne
(
Wrappers
.<
TEmployeeProject
>
query
().
lambda
()
tEmployeeProject
=
this
.
getOne
(
Wrappers
.<
TEmployeeProject
>
query
().
lambda
()
.
eq
(
TEmployeeProject:
:
getEmpIdcard
,
excel
.
getEmpIdcard
())
.
eq
(
TEmployeeProject:
:
getEmpIdcard
,
excel
.
getEmpIdcard
())
.
eq
(
TEmployeeProject:
:
getDeptNo
,
excel
.
getDeptNo
())
.
eq
(
TEmployeeProject:
:
getDeptNo
,
excel
.
getDeptNo
())
.
eq
(
TEmployeeProject:
:
getDeleteFlag
,
CommonConstants
.
STATUS_NORMAL
)
.
eq
(
TEmployeeProject:
:
getDeleteFlag
,
CommonConstants
.
STATUS_NORMAL
)
.
eq
(
TEmployeeProject:
:
getProjectStatus
,
CommonConstants
.
ZERO_INT
));
.
eq
(
TEmployeeProject:
:
getProjectStatus
,
CommonConstants
.
ZERO_INT
));
leaveReason
=
null
==
dicObj
?
""
:
dicObj
.
get
(
excel
.
getLeaveReason
());
// 调用字典服务,渲染字典值
StringBuilder
errorMessage
=
new
StringBuilder
();
R
<
Map
<
String
,
Map
<
String
,
Map
<
String
,
String
>>>>
dictR
=
HttpDaprUtil
.
invokeMethodPost
(
daprUpmsProperties
.
getAppUrl
(),
daprUpmsProperties
.
getAppId
()
,
"/dict/inner/getDictToValue"
,
null
,
Map
.
class
,
SecurityConstants
.
FROM_IN
);
Map
<
String
,
Map
<
String
,
Map
<
String
,
String
>>>
dictDataMap
;
Map
<
String
,
Map
<
String
,
String
>>
dictMap
;
// 减项原因
Map
<
String
,
String
>
empReduceMap
;
if
(
dictR
==
null
||
dictR
.
getData
()
==
null
)
{
return
R
.
failed
(
"获取字典失败!"
);
}
else
{
dictDataMap
=
dictR
.
getData
();
dictMap
=
dictDataMap
.
get
(
"data"
);
if
(
dictMap
==
null
)
{
return
R
.
failed
(
"获取字典失败!!"
);
}
empReduceMap
=
dictMap
.
get
(
"social_reduce_reason"
);
}
String
leaveReason
=
""
;
if
(
empReduceMap
!=
null
)
{
leaveReason
=
empReduceMap
.
get
(
excel
.
getLeaveReason
());
}
String
errorMessage
=
""
;
if
(
Common
.
isNotNull
(
excel
.
getEmpName
()))
{
if
(
Common
.
isNotNull
(
excel
.
getEmpName
()))
{
errorMessage
=
errorMessage
.
concat
(
excel
.
getEmpName
()).
concat
(
";"
);
errorMessage
.
append
(
excel
.
getEmpName
());
}
else
{
errorMessage
.
append
(
";"
);
errorMessage
=
" "
.
concat
(
";"
);
}
}
errorMessage
=
errorMessage
+
excel
.
getEmpIdcard
()
+
";"
+
excel
.
getDeptNo
()
+
";"
+
leaveReason
+
";"
;
errorMessage
.
append
(
excel
.
getEmpIdcard
());
errorMessage
.
append
(
";"
);
errorMessage
.
append
(
excel
.
getDeptNo
());
errorMessage
.
append
(
";"
);
errorMessage
.
append
(
leaveReason
);
errorMessage
.
append
(
";"
);
if
(
Common
.
isNotNull
(
excel
.
getLeaveRemark
()))
{
if
(
Common
.
isNotNull
(
excel
.
getLeaveRemark
()))
{
errorMessage
=
errorMessage
.
concat
(
excel
.
getLeaveRemark
()).
concat
(
";"
);
errorMessage
.
append
(
excel
.
getLeaveRemark
());
}
else
{
errorMessage
.
append
(
";"
);
errorMessage
=
errorMessage
.
concat
(
" "
).
concat
(
";"
);
}
}
if
(
Common
.
isNotNull
(
tEmployeeProject
))
{
if
(
Common
.
isNotNull
(
tEmployeeProject
))
{
if
(
tEmployeeProject
.
getInsuranceStatus
()
!=
CommonConstants
.
dingleDigitIntArray
[
0
]
||
if
(
tEmployeeProject
.
getInsuranceStatus
()
!=
CommonConstants
.
dingleDigitIntArray
[
0
]
||
...
@@ -577,7 +563,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
...
@@ -577,7 +563,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
errorMessage
+
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
errorMessage
+
MsgUtils
.
getMessage
(
ErrorCodes
.
ARCHIVES_PROJECT_CHANGE_NOT_EXIST
)));
MsgUtils
.
getMessage
(
ErrorCodes
.
ARCHIVES_PROJECT_CHANGE_NOT_EXIST
)));
}
else
{
}
else
{
TEmployeeProject
tEmployeeProjectOld
=
this
.
getById
(
tEmployeeProject
.
getId
());
tEmployeeProjectOld
=
this
.
getById
(
tEmployeeProject
.
getId
());
tEmployeeProject
.
setProjectStatus
(
CommonConstants
.
dingleDigitIntArray
[
1
]);
tEmployeeProject
.
setProjectStatus
(
CommonConstants
.
dingleDigitIntArray
[
1
]);
tEmployeeProject
.
setLeaveReason
(
excel
.
getLeaveReason
());
tEmployeeProject
.
setLeaveReason
(
excel
.
getLeaveReason
());
tEmployeeProject
.
setLeaveRemark
(
excel
.
getLeaveRemark
());
tEmployeeProject
.
setLeaveRemark
(
excel
.
getLeaveRemark
());
...
@@ -589,7 +575,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
...
@@ -589,7 +575,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
newOldProject
.
setNewProjectEmployee
(
tEmployeeProject
);
newOldProject
.
setNewProjectEmployee
(
tEmployeeProject
);
updateProjectList
.
add
(
newOldProject
);
updateProjectList
.
add
(
newOldProject
);
TEmployeeInfo
tEmployeeInfo
=
tEmployeeInfoMapper
.
selectById
(
tEmployeeProject
.
getEmpId
());
tEmployeeInfo
=
tEmployeeInfoMapper
.
selectById
(
tEmployeeProject
.
getEmpId
());
//从剩下的项目档案中查找员工类型并更新
//从剩下的项目档案中查找员工类型并更新
updList
.
add
(
tEmployeeInfo
);
updList
.
add
(
tEmployeeInfo
);
...
@@ -599,7 +585,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
...
@@ -599,7 +585,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
MsgUtils
.
getMessage
(
ErrorCodes
.
PROJECT_PERSON_SEARCH_EXIT
)));
MsgUtils
.
getMessage
(
ErrorCodes
.
PROJECT_PERSON_SEARCH_EXIT
)));
}
}
}
}
if
(
errorMessageList
.
size
()
>
CommonConstants
.
ZERO_INT
)
{
if
(
!
errorMessageList
.
isEmpty
()
)
{
return
R
.
failed
(
errorMessageList
);
return
R
.
failed
(
errorMessageList
);
}
else
{
}
else
{
//更新项目档案
//更新项目档案
...
@@ -614,11 +600,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
...
@@ -614,11 +600,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
}
}
// 记录变更日志
// 记录变更日志
if
(!
updateProjectList
.
isEmpty
())
{
if
(!
updateProjectList
.
isEmpty
())
{
for
(
EmployeeProjectNewOldVO
newOldVO
:
updateProjectList
)
{
doJointTask
.
saveModificationRecord
(
updateProjectList
);
tEmployeeLogService
.
saveModificationRecord
(
CommonConstants
.
dingleDigitIntArray
[
1
]
,
""
,
newOldVO
.
getNewProjectEmployee
().
getId
()
,
newOldVO
.
getOldProjectEmployee
(),
newOldVO
.
getNewProjectEmployee
());
}
}
}
}
}
return
R
.
ok
();
return
R
.
ok
();
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/utils/DoJointTask.java
View file @
006e7aa5
...
@@ -7,6 +7,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
...
@@ -7,6 +7,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeProjectMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeProjectMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeInfoService
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeInfoService
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeLogService
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeLogService
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectNewOldVO
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
...
@@ -48,10 +49,12 @@ public class DoJointTask {
...
@@ -48,10 +49,12 @@ public class DoJointTask {
public
void
doUpdateEmployeeInfo
(
List
<
TEmployeeInfo
>
tEmployeeInfoList
,
YifuUser
user
)
{
public
void
doUpdateEmployeeInfo
(
List
<
TEmployeeInfo
>
tEmployeeInfoList
,
YifuUser
user
)
{
log
.
info
(
"档案-批量更新人员档案-线程开始"
);
log
.
info
(
"档案-批量更新人员档案-线程开始"
);
try
{
try
{
List
<
TEmployeeProject
>
list
;
TEmployeeInfo
tEmployeeInfoOld
;
for
(
TEmployeeInfo
tEmployeeInfo:
tEmployeeInfoList
)
{
for
(
TEmployeeInfo
tEmployeeInfo:
tEmployeeInfoList
)
{
TEmployeeInfo
tEmployeeInfoOld
=
tEmployeeInfoService
.
getById
(
tEmployeeInfo
.
getId
());
tEmployeeInfoOld
=
tEmployeeInfoService
.
getById
(
tEmployeeInfo
.
getId
());
//查询该人员所有的项目档案
//查询该人员所有的项目档案
List
<
TEmployeeProject
>
list
=
tEmployeeProjectMapper
.
selectList
(
Wrappers
.<
TEmployeeProject
>
query
().
lambda
()
list
=
tEmployeeProjectMapper
.
selectList
(
Wrappers
.<
TEmployeeProject
>
query
().
lambda
()
.
eq
(
TEmployeeProject:
:
getEmpIdcard
,
tEmployeeInfo
.
getEmpIdcard
())
.
eq
(
TEmployeeProject:
:
getEmpIdcard
,
tEmployeeInfo
.
getEmpIdcard
())
.
eq
(
TEmployeeProject:
:
getDeleteFlag
,
CommonConstants
.
STATUS_NORMAL
)
.
eq
(
TEmployeeProject:
:
getDeleteFlag
,
CommonConstants
.
STATUS_NORMAL
)
.
eq
(
TEmployeeProject:
:
getProjectStatus
,
CommonConstants
.
ZERO_INT
));
.
eq
(
TEmployeeProject:
:
getProjectStatus
,
CommonConstants
.
ZERO_INT
));
...
@@ -90,10 +93,12 @@ public class DoJointTask {
...
@@ -90,10 +93,12 @@ public class DoJointTask {
public
void
updateFddEmployeeInfo
(
List
<
TEmployeeInfo
>
tEmployeeInfoList
,
FddContractAttachInfo
fddContractAttachInfo
)
{
public
void
updateFddEmployeeInfo
(
List
<
TEmployeeInfo
>
tEmployeeInfoList
,
FddContractAttachInfo
fddContractAttachInfo
)
{
log
.
info
(
"法大大档案-批量更新人员档案-线程开始"
);
log
.
info
(
"法大大档案-批量更新人员档案-线程开始"
);
try
{
try
{
TEmployeeInfo
tEmployeeInfoOld
;
List
<
TEmployeeProject
>
list
;
for
(
TEmployeeInfo
tEmployeeInfo:
tEmployeeInfoList
)
{
for
(
TEmployeeInfo
tEmployeeInfo:
tEmployeeInfoList
)
{
TEmployeeInfo
tEmployeeInfoOld
=
tEmployeeInfoService
.
getById
(
tEmployeeInfo
.
getId
());
tEmployeeInfoOld
=
tEmployeeInfoService
.
getById
(
tEmployeeInfo
.
getId
());
//查询该人员所有的项目档案
//查询该人员所有的项目档案
List
<
TEmployeeProject
>
list
=
tEmployeeProjectMapper
.
selectList
(
Wrappers
.<
TEmployeeProject
>
query
().
lambda
()
list
=
tEmployeeProjectMapper
.
selectList
(
Wrappers
.<
TEmployeeProject
>
query
().
lambda
()
.
eq
(
TEmployeeProject:
:
getEmpIdcard
,
tEmployeeInfo
.
getEmpIdcard
())
.
eq
(
TEmployeeProject:
:
getEmpIdcard
,
tEmployeeInfo
.
getEmpIdcard
())
.
eq
(
TEmployeeProject:
:
getDeleteFlag
,
CommonConstants
.
STATUS_NORMAL
)
.
eq
(
TEmployeeProject:
:
getDeleteFlag
,
CommonConstants
.
STATUS_NORMAL
)
.
eq
(
TEmployeeProject:
:
getProjectStatus
,
CommonConstants
.
ZERO_INT
));
.
eq
(
TEmployeeProject:
:
getProjectStatus
,
CommonConstants
.
ZERO_INT
));
...
@@ -121,17 +126,22 @@ public class DoJointTask {
...
@@ -121,17 +126,22 @@ public class DoJointTask {
}
}
/**
/**
* @Description:
批量插入项目档案
* @Description:
更新项目档案操作记录
* @Author: huyc
* @Author: huyc
* @Date: 2022-11-22
* @Date: 2022-11-22
* @return: void
* @return: void
**/
**/
@Async
@Async
public
void
insertExcelEmpProject
(
List
<
TEmployeeProject
>
proIns
List
)
{
public
void
saveModificationRecord
(
List
<
EmployeeProjectNewOldVO
>
updateProject
List
)
{
try
{
try
{
tEmployeeProjectMapper
.
insertExcelEmpProject
(
proInsList
);
for
(
EmployeeProjectNewOldVO
newOldVO
:
updateProjectList
)
{
tEmployeeLogService
.
saveModificationRecord
(
CommonConstants
.
dingleDigitIntArray
[
1
]
,
""
,
newOldVO
.
getNewProjectEmployee
().
getId
()
,
newOldVO
.
getOldProjectEmployee
(),
newOldVO
.
getNewProjectEmployee
());
}
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
error
(
"档案-
批量插入项目档案
错误"
,
e
);
log
.
error
(
"档案-
更新项目档案操作记录
错误"
,
e
);
}
}
log
.
info
(
"档案-更新项目档案操作记录结束"
);
}
}
}
}
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