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
242c52b5
Commit
242c52b5
authored
Dec 06, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop'
parents
e3cfbf34
5244df1b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
9 deletions
+8
-9
TSettleDomainServiceImpl.java
.../yifu/archives/service/impl/TSettleDomainServiceImpl.java
+0
-1
DoJointInsuranceTask.java
...ud/plus/v1/yifu/insurances/util/DoJointInsuranceTask.java
+8
-8
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TSettleDomainServiceImpl.java
View file @
242c52b5
...
...
@@ -217,7 +217,6 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
// 处理服务团队数据权限 2022-09-19 fxj
initServerTeamPermission
(
domain
);
domain
.
setDeleteFlag
(
CommonConstants
.
ZERO_STRING
);
log
.
error
(
JSON
.
toJSONString
(
vo
));
if
(
Common
.
isNotNull
(
tSettleDomainInfo
))
{
baseMapper
.
updateById
(
domain
);
}
else
{
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/DoJointInsuranceTask.java
View file @
242c52b5
...
...
@@ -220,7 +220,7 @@ public class DoJointInsuranceTask {
List
<
EkpInsuranceViewVo
>
viewVoList
;
TInsuranceDetail
detail
;
viewVoList
=
ekpSettleService
.
selectViewBySettleNo
(
vo
.
getSettleNo
(),
vo
.
getPayFlag
());
if
(!
viewVoList
.
isEmpty
())
{
if
(
viewVoList
!=
null
&&
!
viewVoList
.
isEmpty
())
{
String
insuranceId
;
for
(
EkpInsuranceViewVo
viewVo
:
viewVoList
)
{
//获取所有的明细id
...
...
@@ -273,7 +273,7 @@ public class DoJointInsuranceTask {
}
else
{
viewVo
=
ekpSettleService
.
selectFundViewBySettleNo
(
vo
.
getSettleNo
(),
vo
.
getPayFlag
());
}
if
(!
viewVo
.
isEmpty
())
{
if
(
viewVo
!=
null
&&
!
viewVo
.
isEmpty
())
{
viewVo
.
forEach
(
e
->
e
.
setPayFlag
(
vo
.
getPayFlag
()));
R
<
Boolean
>
flag
=
socialDaprUtils
.
updateSocialSettleStatus
(
viewVo
);
if
(
Common
.
isEmpty
(
flag
)
||
Boolean
.
TRUE
.
equals
(!
flag
.
getData
()))
{
...
...
@@ -311,7 +311,7 @@ public class DoJointInsuranceTask {
}
else
{
viewVo
=
ekpSettleService
.
selectFIncomelViewBySettleNo
(
vo
.
getSettleNo
());
}
if
(!
viewVo
.
isEmpty
())
{
if
(
viewVo
!=
null
&&
!
viewVo
.
isEmpty
())
{
R
<
Boolean
>
flag
=
socialDaprUtils
.
updateIncomeSettleStatus
(
viewVo
);
if
(
Common
.
isEmpty
(
flag
)
||
Boolean
.
TRUE
.
equals
(!
flag
.
getData
()))
{
TUpdateStatusError
error
=
new
TUpdateStatusError
();
...
...
@@ -357,7 +357,7 @@ public class DoJointInsuranceTask {
error
.
setTypeFlag
(
CommonConstants
.
FIVE_STRING
);
//根据结算单号获取明细id和结算状态
viewVo
=
ekpSettleService
.
selectSalarylViewBySettleNo
(
vo
.
getSettleNo
(),
vo
.
getPayFlag
());
if
(!
viewVo
.
isEmpty
())
{
if
(
viewVo
!=
null
&&
!
viewVo
.
isEmpty
())
{
viewVo
.
forEach
(
e
->
e
.
setPayFlag
(
vo
.
getPayFlag
()));
R
<
Boolean
>
flag
=
salaryDaprUtil
.
updateSalarySettleStatus
(
viewVo
);
if
(
Common
.
isEmpty
(
flag
)
||
Boolean
.
TRUE
.
equals
(!
flag
.
getData
()))
{
...
...
@@ -390,7 +390,7 @@ public class DoJointInsuranceTask {
List
<
EkpInsuranceViewVo
>
viewVoList
;
TInsuranceDetail
detail
;
viewVoList
=
ekpSettleService
.
selectViewBySettleNo
(
error
.
getSettleNo
(),
error
.
getSettleType
());
if
(!
viewVoList
.
isEmpty
())
{
if
(
viewVoList
!=
null
&&
!
viewVoList
.
isEmpty
())
{
String
insuranceId
;
for
(
EkpInsuranceViewVo
viewVo
:
viewVoList
)
{
//获取所有的明细id
...
...
@@ -437,7 +437,7 @@ public class DoJointInsuranceTask {
}
else
{
viewVo
=
ekpSettleService
.
selectFundViewBySettleNo
(
error
.
getSettleNo
(),
error
.
getSettleType
());
}
if
(!
viewVo
.
isEmpty
())
{
if
(
viewVo
!=
null
&&
!
viewVo
.
isEmpty
())
{
viewVo
.
forEach
(
e
->
e
.
setPayFlag
(
error
.
getSettleType
()));
R
<
Boolean
>
flag
=
socialDaprUtils
.
updateSocialSettleStatus
(
viewVo
);
if
(!
Common
.
isEmpty
(
flag
)
||
Boolean
.
TRUE
.
equals
(
flag
.
getData
()))
{
...
...
@@ -461,7 +461,7 @@ public class DoJointInsuranceTask {
}
else
{
viewVo
=
ekpSettleService
.
selectFIncomelViewBySettleNo
(
error
.
getSettleNo
());
}
if
(!
viewVo
.
isEmpty
())
{
if
(
viewVo
!=
null
&&
!
viewVo
.
isEmpty
())
{
R
<
Boolean
>
flag
=
socialDaprUtils
.
updateIncomeSettleStatus
(
viewVo
);
if
(!
Common
.
isEmpty
(
flag
)
||
Boolean
.
TRUE
.
equals
(
flag
.
getData
()))
{
error
.
setStatus
(
CommonConstants
.
ONE_INT
);
...
...
@@ -479,7 +479,7 @@ public class DoJointInsuranceTask {
try
{
//根据结算单号获取明细id和结算状态
viewVo
=
ekpSettleService
.
selectSalarylViewBySettleNo
(
error
.
getSettleNo
(),
error
.
getSettleType
());
if
(!
viewVo
.
isEmpty
())
{
if
(
viewVo
!=
null
&&
!
viewVo
.
isEmpty
())
{
viewVo
.
forEach
(
e
->
e
.
setPayFlag
(
error
.
getSettleType
()));
R
<
Boolean
>
flag
=
salaryDaprUtil
.
updateSalarySettleStatus
(
viewVo
);
if
(!
Common
.
isEmpty
(
flag
)
&&
Boolean
.
TRUE
.
equals
(
flag
.
getData
()))
{
...
...
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