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
548c8d40
Commit
548c8d40
authored
Aug 24, 2023
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.5.7-划转,减项的可划转
parent
bdccabfe
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
TEmployeeProject.java
.../cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java
+2
-1
TEmpChangeInfoServiceImpl.java
...yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java
+2
-2
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java
View file @
548c8d40
...
@@ -312,8 +312,9 @@ public class TEmployeeProject extends BaseEntity {
...
@@ -312,8 +312,9 @@ public class TEmployeeProject extends BaseEntity {
/**
/**
* 公积金状态(字典)
* 公积金状态(字典)
* 0无公积金;1处理中;2正常;3已派减
*/
*/
@Schema
(
description
=
"公积金状态(字典): 0
无公积金 1 处理中 2.部分购买 3.正常 4.
已派减"
)
@Schema
(
description
=
"公积金状态(字典): 0
无公积金;1处理中;2正常;3
已派减"
)
private
Integer
fundStatus
;
private
Integer
fundStatus
;
/**
/**
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java
View file @
548c8d40
...
@@ -545,13 +545,13 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
...
@@ -545,13 +545,13 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
}
else
{
}
else
{
if
(
Common
.
isEmpty
(
newEmpProject
.
getFundStatus
())
if
(
Common
.
isEmpty
(
newEmpProject
.
getFundStatus
())
||
CommonConstants
.
ZERO_INT
==
newEmpProject
.
getFundStatus
()
||
CommonConstants
.
ZERO_INT
==
newEmpProject
.
getFundStatus
()
||
CommonConstants
.
FOUR
_INT
==
newEmpProject
.
getFundStatus
()){
||
CommonConstants
.
THREE
_INT
==
newEmpProject
.
getFundStatus
()){
newEmpProject
.
setFundStatus
(
oldEmpProject
.
getFundStatus
());
newEmpProject
.
setFundStatus
(
oldEmpProject
.
getFundStatus
());
updatesf
.
setFlag
(
CommonConstants
.
ONE_STRING
);
updatesf
.
setFlag
(
CommonConstants
.
ONE_STRING
);
socialDaprUtils
.
updateSocialAndFoundInfo
(
updatesf
);
socialDaprUtils
.
updateSocialAndFoundInfo
(
updatesf
);
oldEmpProject
.
setFundStatus
(
CommonConstants
.
ZERO_INT
);
oldEmpProject
.
setFundStatus
(
CommonConstants
.
ZERO_INT
);
resStr
.
append
(
"公积金划转成功! <br>"
);
resStr
.
append
(
"公积金划转成功! <br>"
);
}
else
{
}
else
{
resStr
.
append
(
"目标项目档案存在公积金数据,公积金划转失败! <br>"
);
resStr
.
append
(
"目标项目档案存在公积金数据,公积金划转失败! <br>"
);
}
}
}
}
...
...
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