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
2724558f
Commit
2724558f
authored
Nov 15, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
派单申请添加申请记录&合同新增 添加合同记录
parent
a5ae07a4
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
0 deletions
+33
-0
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+14
-0
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+19
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
2724558f
...
...
@@ -2246,6 +2246,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
TEmployeeContractInfo
contract
;
EmpAddDispatchVo
emp
;
EmpProjectDispatchVo
project
;
TEmployeeContractAudit
audit
;
for
(
Map
.
Entry
<
String
,
EmpContractDispatchVo
>
entry
:
contractsMap
.
entrySet
())
{
contractAdd
=
entry
.
getValue
();
try
{
...
...
@@ -2274,6 +2275,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
contract
.
setDispatchFlag
(
CommonConstants
.
ONE_STRING
);
contract
.
setType
(
CommonConstants
.
ZERO_STRING
);
contractServicer
.
save
(
contract
);
audit
=
new
TEmployeeContractAudit
();
addContractAudit
(
contract
,
audit
);
contractAdd
.
setId
(
contract
.
getId
());
contractAdd
.
setEmpNo
(
contract
.
getEmpNo
());
contractsMap
.
put
(
contractAdd
.
getEmpIdcard
()
+
CommonConstants
.
DOWN_LINE_STRING
+
contractAdd
.
getDeptNo
(),
contractAdd
);
...
...
@@ -2286,6 +2289,17 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
private
void
addContractAudit
(
TEmployeeContractInfo
contract
,
TEmployeeContractAudit
audit
)
{
audit
.
setCreateBy
(
contract
.
getCreateBy
());
audit
.
setCreateName
(
contract
.
getCreateName
());
audit
.
setCreateTime
(
LocalDateTime
.
now
());
audit
.
setUpdateBy
(
contract
.
getUpdateBy
());
audit
.
setUpdateTime
(
LocalDateTime
.
now
());
audit
.
setLinkId
(
contract
.
getId
());
audit
.
setLinkType
(
CommonConstants
.
ONE_INT
);
audit
.
setRootName
(
"提交申请"
);
}
private
void
saveEmp
(
Map
<
String
,
EmpAddDispatchVo
>
empAddsMap
)
{
if
(
Common
.
isNotNull
(
empAddsMap
))
{
EmpAddDispatchVo
empAdd
;
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
2724558f
...
...
@@ -580,6 +580,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
contractsMap
=
res
.
getData
().
getContractsMap
();
projectsMap
=
res
.
getData
().
getProjectsMap
();
}
TAuditInfo
auditInfo
=
null
;
for
(
int
i
=
0
;
i
<
excelVOList
.
size
();
i
++)
{
contract
=
null
;
social
=
null
;
...
...
@@ -645,6 +646,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
dispatch
.
setFirstBuyMonthSocial
(
getFirstBuyMonthSocial
(
social
));
insertDispatch
(
emp
,
dispatch
);
// 新增派单申请提交记录
auditInfo
=
new
TAuditInfo
();
addAuditInfo
(
dispatch
,
auditInfo
);
}
// 插入或更新社保公积金查询信息 大病在封装社保的时候已经算了 大病技术和金额了
if
(
Common
.
isNotNull
(
socialFundAddMap
)){
...
...
@@ -671,6 +675,21 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
Common
.
clear
(
projectsMap
);
}
private
void
addAuditInfo
(
TDispatchInfo
dispatch
,
TAuditInfo
auditInfo
)
{
auditInfo
.
setEmpIdcard
(
dispatch
.
getEmpIdcard
());
auditInfo
.
setSocialId
(
dispatch
.
getSocialId
());
auditInfo
.
setProvidentId
(
dispatch
.
getFundId
());
auditInfo
.
setAuditStatus
(
CommonConstants
.
ZERO_STRING
);
auditInfo
.
setDispatchInfoId
(
dispatch
.
getId
());
auditInfo
.
setAuditRemark
(
"派单申请提交"
);
auditInfo
.
setTitle
(
"派单申请"
);
auditInfo
.
setOrganName
(
dispatch
.
getOrganName
());
auditInfo
.
setAuditUser
(
dispatch
.
getCreateName
());
auditInfo
.
setAuditTime
(
new
Date
());
auditInfo
.
setIsCommision
(
CommonConstants
.
ONE_STRING
);
auditInfoMapper
.
insert
(
auditInfo
);
}
private
void
updateDocSocialFund
(
TSocialInfo
social
,
TProvidentFund
fund
,
TSocialFundInfo
socialFund
)
{
UpProjectSocialFundVo
vo
=
new
UpProjectSocialFundVo
();
if
(
Common
.
isNotNull
(
social
)){
...
...
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