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
b1b8143f
Commit
b1b8143f
authored
Aug 03, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
批量办理 100%
parent
8b2e4238
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
8 deletions
+27
-8
TEmployeeProject.java
.../cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java
+2
-0
EmpContractDispatchVo.java
...cloud/plus/v1/yifu/archives/vo/EmpContractDispatchVo.java
+9
-0
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+16
-8
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java
View file @
b1b8143f
...
...
@@ -17,6 +17,7 @@
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
entity
;
import
com.baomidou.mybatisplus.annotation.*
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
...
...
@@ -117,6 +118,7 @@ public class TEmployeeProject extends BaseEntity {
*/
@Schema
(
description
=
"减项时间"
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
LocalDateTime
leaveTime
;
/**
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmpContractDispatchVo.java
View file @
b1b8143f
...
...
@@ -215,4 +215,13 @@ public class EmpContractDispatchVo implements Serializable {
@ExcelAttribute
(
name
=
"客户名称"
,
maxLength
=
128
)
@Schema
(
description
=
"客户名称"
,
name
=
"subjectUnit"
)
private
String
subjectUnit
;
/**
* 合同年限
*/
@NotBlank
(
message
=
"合同年限不能为空"
)
@ExcelAttribute
(
name
=
"合同年限"
,
errorInfo
=
"合同年限不能为空"
)
@Schema
(
description
=
"合同年限"
,
name
=
"contractTerm"
)
private
String
contractTerm
;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
b1b8143f
...
...
@@ -335,6 +335,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
EmpDispatchAddVo
addVo
=
new
EmpDispatchAddVo
();
// 执行数据插入操作 组装
for
(
int
i
=
0
;
i
<
excelVOList
.
size
();
i
++)
{
empVo
=
null
;
excel
=
excelVOList
.
get
(
i
);
fundSet
=
fundHoldMap
.
get
(
excel
.
getProvidentHousehold
());
socialSet
=
socialHoldMap
.
get
(
excel
.
getSocialHousehold
());
...
...
@@ -439,6 +440,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
projectsMap
=
res
.
getData
().
getProjectsMap
();
}
for
(
int
i
=
0
;
i
<
excelVOList
.
size
();
i
++)
{
contract
=
null
;
social
=
null
;
project
=
null
;
fund
=
null
;
excel
=
excelVOList
.
get
(
i
);
if
(
Common
.
isNotNull
(
excelVOTemp
)
&&
Common
.
isNotNull
(
excelVOTemp
.
get
(
excel
.
getEmpIdcard
()))){
continue
;
...
...
@@ -819,8 +824,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
SysBaseSetInfo
fundSet
,
TDispatchImportVo
excel
,
TSocialFundInfo
socialFund
)
{
TDispatchInfo
dispatch
;
dispatch
=
new
TDispatchInfo
();
TDispatchInfo
dispatch
=
new
TDispatchInfo
();
// 初始化派单项
initAddHandleItem
(
excel
,
socialFund
,
dispatch
,
socialSet
);
dispatch
.
setOrganName
(
user
.
getDeptName
());
...
...
@@ -875,10 +879,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
dispatch
.
setEmpId
(
empVo
.
getId
());
dispatch
.
setEmpNo
(
empVo
.
getEmpNo
());
// 封装合同信息 如果有合同取值实际合同信息
dispatch
.
setContractStart
(
empVo
.
getContractStart
());
dispatch
.
setContractEnd
(
empVo
.
getContractEnd
());
dispatch
.
setContractTerm
(
empVo
.
getContractTerm
());
dispatch
.
setContractType
(
empVo
.
getContractType
());
if
(
Common
.
isNotNull
(
empVo
.
getContractStart
())){
dispatch
.
setContractStart
(
empVo
.
getContractStart
());
dispatch
.
setContractEnd
(
empVo
.
getContractEnd
());
dispatch
.
setContractTerm
(
empVo
.
getContractTerm
());
dispatch
.
setContractType
(
empVo
.
getContractType
());
}
dispatch
.
setFileProvince
(
empVo
.
getFileProvince
());
dispatch
.
setFileCity
(
empVo
.
getFileCity
());
dispatch
.
setFileTown
(
empVo
.
getFileTown
());
...
...
@@ -1005,6 +1011,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
fund
.
setPayPolicy
(
fundSet
.
getPayPolicy
());
fund
.
setLowerLimit
(
fundSet
.
getLowerLimit
());
fund
.
setUpperLimit
(
fundSet
.
getUpperLimit
());
fund
.
setInsuranceIsLatestCardinality
(
fundSet
.
getInsuranceIsLatestCardinality
());
if
(
Common
.
isNotNull
(
fundSet
.
getProvince
())){
fund
.
setFundProvince
(
Integer
.
toString
(
fundSet
.
getProvince
()));
}
...
...
@@ -1356,10 +1363,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
contract
.
setContractSubName
(
excel
.
getContractSubName
());
contract
.
setDeptNo
(
excel
.
getSettleDomainCode
());
contract
.
setPost
(
excel
.
getPost
());
contract
.
setSituation
(
excel
.
getContractType
()
);
contract
.
setSituation
(
"正常签订"
);
contract
.
setEmpIdcard
(
excel
.
getEmpIdcard
());
contract
.
setEmpName
(
excel
.
getEmpName
());
contract
.
setWorkingHours
(
excel
.
getWorkingHours
());
contract
.
setContractTerm
(
excel
.
getContractTerm
());
if
(
Common
.
isNotNull
(
excel
.
getSocialHousehold
())){
contract
.
setContractParty
(
excel
.
getSocialHousehold
());
}
...
...
@@ -2528,6 +2536,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
Date
now
=
new
Date
();
StringBuffer
temp
=
new
StringBuffer
();
for
(
TDispatchInfo
dis
:
disList
)
{
auditInfo
=
new
TAuditInfo
();
if
(
Common
.
isNotNull
(
socialFundMap
)){
sf
=
socialFundMap
.
get
(
dis
.
getEmpIdcard
());
}
...
...
@@ -2575,7 +2584,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
socialMapper
.
updateById
(
socialInfo
);
dis
.
setSocialHandleRemark
(
ServiceUtil
.
ifNullToEmpty
(
handleRemark
));
auditInfo
=
new
TAuditInfo
();
auditInfo
.
setType
(
CommonConstants
.
ONE_STRING
);
if
(
CommonConstants
.
ZERO_INT
==
flag
)
{
temp
.
setLength
(
CommonConstants
.
ZERO_INT
);
...
...
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