Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
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
53fc3ca9
You need to sign in or sign up before continuing.
Commit
53fc3ca9
authored
Sep 14, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
结算主体ID
parent
bfd1b9de
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
26 additions
and
2 deletions
+26
-2
TCertRecordVo.java
...om/yifu/cloud/plus/v1/yifu/archives/vo/TCertRecordVo.java
+6
-1
TCertRecordServiceImpl.java
...v1/yifu/archives/service/impl/TCertRecordServiceImpl.java
+1
-0
InsuranceBatchParam.java
...cloud/plus/v1/yifu/insurances/vo/InsuranceBatchParam.java
+5
-0
InsuranceReplaceParam.java
...oud/plus/v1/yifu/insurances/vo/InsuranceReplaceParam.java
+6
-0
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+8
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TCertRecordVo.java
View file @
53fc3ca9
...
@@ -37,7 +37,12 @@ public class TCertRecordVo implements Serializable {
...
@@ -37,7 +37,12 @@ public class TCertRecordVo implements Serializable {
@ExcelAttribute
(
name
=
"员工身份证"
)
@ExcelAttribute
(
name
=
"员工身份证"
)
@Schema
(
description
=
"员工身份证"
)
@Schema
(
description
=
"员工身份证"
)
private
String
empIdcard
;
private
String
empIdcard
;
/**
* 项目id
*/
@ExcelAttribute
(
name
=
"项目id"
)
@Schema
(
description
=
"项目id"
)
private
String
deptId
;
/**
/**
* 项目名称
* 项目名称
*/
*/
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TCertRecordServiceImpl.java
View file @
53fc3ca9
...
@@ -92,6 +92,7 @@ public class TCertRecordServiceImpl extends ServiceImpl<TCertRecordMapper, TCert
...
@@ -92,6 +92,7 @@ public class TCertRecordServiceImpl extends ServiceImpl<TCertRecordMapper, TCert
vo
.
setPost
(
project
.
getPost
());
vo
.
setPost
(
project
.
getPost
());
vo
.
setProjectName
(
project
.
getDeptName
());
vo
.
setProjectName
(
project
.
getDeptName
());
vo
.
setProjectCode
(
project
.
getDeptNo
());
vo
.
setProjectCode
(
project
.
getDeptNo
());
vo
.
setDeptId
(
project
.
getDeptId
());
// 最新合同时间
// 最新合同时间
if
(
Common
.
isNotNull
(
last
)){
if
(
Common
.
isNotNull
(
last
)){
if
(
Common
.
isNotNull
(
last
.
getContractStart
())){
if
(
Common
.
isNotNull
(
last
.
getContractStart
())){
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceBatchParam.java
View file @
53fc3ca9
...
@@ -18,6 +18,11 @@ import java.time.LocalDate;
...
@@ -18,6 +18,11 @@ import java.time.LocalDate;
public
class
InsuranceBatchParam
implements
Serializable
{
public
class
InsuranceBatchParam
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
2689686777914935788L
;
private
static
final
long
serialVersionUID
=
-
2689686777914935788L
;
/**
* 项目id
*/
@Schema
(
description
=
"项目id"
)
private
String
deptId
;
/**
/**
* 项目编码
* 项目编码
*/
*/
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceReplaceParam.java
View file @
53fc3ca9
...
@@ -28,6 +28,12 @@ public class InsuranceReplaceParam implements Serializable {
...
@@ -28,6 +28,12 @@ public class InsuranceReplaceParam implements Serializable {
@Schema
(
description
=
"员工身份证号"
)
@Schema
(
description
=
"员工身份证号"
)
private
String
empIdcardNo
;
private
String
empIdcardNo
;
/**
* 项目id
*/
@Schema
(
description
=
"项目id"
)
private
String
deptId
;
/**
/**
* 项目编码
* 项目编码
*/
*/
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
53fc3ca9
...
@@ -351,8 +351,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -351,8 +351,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
List
<
InsuranceBatchParam
>
listSuccess
=
map
.
get
(
"listSuccess"
);
List
<
InsuranceBatchParam
>
listSuccess
=
map
.
get
(
"listSuccess"
);
List
<
TInsuranceDetail
>
detailList
=
new
ArrayList
<>();
List
<
TInsuranceDetail
>
detailList
=
new
ArrayList
<>();
if
(
CollectionUtils
.
isNotEmpty
(
listSuccess
)){
if
(
CollectionUtils
.
isNotEmpty
(
listSuccess
)){
TInsuranceDetail
detail
;
for
(
InsuranceBatchParam
success
:
listSuccess
)
{
for
(
InsuranceBatchParam
success
:
listSuccess
)
{
TInsuranceDetail
detail
=
new
TInsuranceDetail
();
detail
=
new
TInsuranceDetail
();
BeanCopyUtils
.
copyProperties
(
success
,
detail
);
BeanCopyUtils
.
copyProperties
(
success
,
detail
);
//购买类型,默认为「批增」
//购买类型,默认为「批增」
detail
.
setBuyType
(
CommonConstants
.
THREE_INT
);
detail
.
setBuyType
(
CommonConstants
.
THREE_INT
);
...
@@ -431,6 +432,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -431,6 +432,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
newDetail
.
setEmpName
(
success
.
getReplaceEmpName
());
newDetail
.
setEmpName
(
success
.
getReplaceEmpName
());
newDetail
.
setEmpIdcardNo
(
success
.
getReplaceEmpIdcardNo
());
newDetail
.
setEmpIdcardNo
(
success
.
getReplaceEmpIdcardNo
());
newDetail
.
setDeptNo
(
success
.
getReplaceDeptNo
());
newDetail
.
setDeptNo
(
success
.
getReplaceDeptNo
());
newDetail
.
setDeptId
(
success
.
getDeptId
());
//替换项目的结算方式
//替换项目的结算方式
newDetail
.
setSettleType
(
success
.
getSettleType
());
newDetail
.
setSettleType
(
success
.
getSettleType
());
newDetail
.
setPost
(
success
.
getPost
());
newDetail
.
setPost
(
success
.
getPost
());
...
@@ -927,6 +929,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -927,6 +929,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
detail
.
setHandledTime
(
LocalDateTime
.
now
());
detail
.
setHandledTime
(
LocalDateTime
.
now
());
detail
.
setUpdateBy
(
user
.
getId
());
detail
.
setUpdateBy
(
user
.
getId
());
detail
.
setUpdateTime
(
LocalDateTime
.
now
());
detail
.
setUpdateTime
(
LocalDateTime
.
now
());
if
(
Common
.
isNotNull
(
jsonObject
)){
detail
.
setDeptId
(
jsonObject
.
getId
());
}
detailList
.
add
(
detail
);
detailList
.
add
(
detail
);
}
}
}
}
...
@@ -2304,6 +2309,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -2304,6 +2309,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
else
{
}
else
{
param
.
setSettleType
(
Integer
.
parseInt
(
settleType
));
param
.
setSettleType
(
Integer
.
parseInt
(
settleType
));
}
}
param
.
setDeptId
(
projectSetInfoVo
.
getId
());
}
}
}
}
}
}
...
@@ -2685,6 +2691,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -2685,6 +2691,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
continue
;
continue
;
}
else
{
}
else
{
param
.
setSettleType
(
Integer
.
parseInt
(
settleType
));
param
.
setSettleType
(
Integer
.
parseInt
(
settleType
));
param
.
setDeptId
(
projectSetInfoVo
.
getId
());
}
}
}
}
}
}
...
...
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