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
a64f9384
Commit
a64f9384
authored
Jun 02, 2023
by
wangzb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feature-wzb :bug修复
parent
b689e6a6
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+4
-2
application-dev.yml
...al/yifu-social-biz/src/main/resources/application-dev.yml
+1
-2
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
a64f9384
...
...
@@ -1245,7 +1245,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
TSocialFundInfo
sf
=
new
TSocialFundInfo
();
sf
.
setEmpIdcard
(
insert
.
getEmpIdcard
());
sf
.
setSettleDomain
(
insert
.
getSettleDomain
());
if
(!
CommonConstants
.
ONE_STRING
.
equals
(
insert
.
getSituation
())
&&
!
CommonConstants
.
TWO_STRING
.
equals
(
insert
.
getSituation
())
&&
!
CommonConstants
.
THREE_STRING
.
equals
(
insert
.
getSituation
())
&&!
CommonConstants
.
FOUR_STRING
.
equals
(
insert
.
getSituation
()))
{
if
(!(
"合同未到期重新签订"
).
equals
(
insert
.
getSituation
())&&!(
"正常续签"
).
equals
(
insert
.
getSituation
())
&&!(
"离职再入职"
).
equals
(
insert
.
getSituation
())
&&!(
"商务合同更改"
).
equals
(
insert
.
getSituation
()))
{
R
<
Integer
>
socialFundR
=
HttpDaprUtil
.
invokeMethodPost
(
socialProperties
.
getAppUrl
(),
socialProperties
.
getAppId
()
,
"/tsocialfundinfo/inner/selectSocialFoundByContract"
,
sf
,
Integer
.
class
,
SecurityConstants
.
FROM_IN
);
if
(
socialFundR
!=
null
&&
socialFundR
.
getData
()
!=
null
&&
socialFundR
.
getData
()
>
0
)
{
...
...
@@ -1254,6 +1255,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
}
}
}
}
...
...
yifu-social/yifu-social-biz/src/main/resources/application-dev.yml
View file @
a64f9384
...
...
@@ -50,4 +50,3 @@ spring:
redis
:
host
:
127.0.0.1
port
:
6379
\ No newline at end of file
password
:
'
@yf_2017'
\ No newline at end of file
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