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
117f5a2a
Commit
117f5a2a
authored
Jul 03, 2023
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化修改
parent
2d0526d0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
TPreDispatchInfo.java
...fu/cloud/plus/v1/yifu/social/entity/TPreDispatchInfo.java
+1
-1
TPreDispatchReduceVo.java
...fu/cloud/plus/v1/yifu/social/vo/TPreDispatchReduceVo.java
+1
-1
TPreDispatchInfoServiceImpl.java
...yifu/social/service/impl/TPreDispatchInfoServiceImpl.java
+5
-0
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPreDispatchInfo.java
View file @
117f5a2a
...
@@ -552,7 +552,7 @@ public class TPreDispatchInfo extends BaseEntity {
...
@@ -552,7 +552,7 @@ public class TPreDispatchInfo extends BaseEntity {
/**
/**
* 0 是 1 否
* 0 是 1 否
*/
*/
@ExcelAttribute
(
name
=
"是否同步终止合同、减项、减档"
,
maxLength
=
1
,
readConverterExp
=
"是=0,否=1"
)
@ExcelAttribute
(
name
=
"是否同步终止合同、减项、减档"
,
maxLength
=
1
)
@Schema
(
description
=
"是否同步终止合同、减项、减档"
,
name
=
"changeContractAndEmployee"
)
@Schema
(
description
=
"是否同步终止合同、减项、减档"
,
name
=
"changeContractAndEmployee"
)
@ExcelProperty
(
"是否同步终止合同、减项、减档"
)
@ExcelProperty
(
"是否同步终止合同、减项、减档"
)
private
String
changeContractAndEmployee
;
private
String
changeContractAndEmployee
;
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPreDispatchReduceVo.java
View file @
117f5a2a
...
@@ -701,7 +701,7 @@ public class TPreDispatchReduceVo {
...
@@ -701,7 +701,7 @@ public class TPreDispatchReduceVo {
/**
/**
* 0 是 1 否
* 0 是 1 否
*/
*/
@ExcelAttribute
(
name
=
"是否同步终止合同、减项、减档"
,
maxLength
=
1
,
readConverterExp
=
"是=0,否=1"
)
@ExcelAttribute
(
name
=
"是否同步终止合同、减项、减档"
,
maxLength
=
1
)
@Schema
(
description
=
"是否同步终止合同、减项、减档"
,
name
=
"changeContractAndEmployee"
)
@Schema
(
description
=
"是否同步终止合同、减项、减档"
,
name
=
"changeContractAndEmployee"
)
@ExcelProperty
(
"是否同步终止合同、减项、减档"
)
@ExcelProperty
(
"是否同步终止合同、减项、减档"
)
private
String
changeContractAndEmployee
;
private
String
changeContractAndEmployee
;
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPreDispatchInfoServiceImpl.java
View file @
117f5a2a
...
@@ -935,6 +935,11 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
...
@@ -935,6 +935,11 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
for
(
TPreDispatchReduceVo
info:
list
){
for
(
TPreDispatchReduceVo
info:
list
){
TPreDispatchInfo
preInfo
=
new
TPreDispatchInfo
();
TPreDispatchInfo
preInfo
=
new
TPreDispatchInfo
();
BeanUtils
.
copyProperties
(
info
,
preInfo
);
BeanUtils
.
copyProperties
(
info
,
preInfo
);
if
(
Common
.
isNotNull
(
info
.
getChangeContractAndEmployee
())
&&
"是"
.
equals
(
info
.
getChangeContractAndEmployee
()))
{
preInfo
.
setChangeContractAndEmployee
(
CommonConstants
.
ZERO_STRING
);
}
else
{
preInfo
.
setChangeContractAndEmployee
(
CommonConstants
.
ONE_STRING
);
}
listInfo
.
add
(
preInfo
);
listInfo
.
add
(
preInfo
);
}
}
}
}
...
...
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