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
87f52fd9
Commit
87f52fd9
authored
Jun 25, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.12' into MVP1.7.12
parents
48dbcfe7
6467703f
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
0 deletions
+8
-0
DoJointInsuranceTask.java
...ud/plus/v1/yifu/insurances/util/DoJointInsuranceTask.java
+8
-0
No files found.
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/DoJointInsuranceTask.java
View file @
87f52fd9
...
...
@@ -748,6 +748,10 @@ public class DoJointInsuranceTask {
pushParam
.
setFd_3b16dfb32778f2
(
deptInfoVo
.
getFdId
());
pushParam
.
setFd_3b16dfb32778f2_text
(
deptInfoVo
.
getDeptNo
());
//实际结算月份DateUtil.parseDate(dateStringInsert(param.getSettleMonth()),"yyyy-MM")
//同倩倩确认结算月为空时,且结算方式不为全量未结算数据时,默认当月
if
(
Common
.
isEmpty
(
param
.
getSettleMonth
())
&&
!
"全量未结算数据"
.
equals
(
deptInfoVo
.
getInsurancesType
()))
{
param
.
setSettleMonth
(
LocalDateTimeUtils
.
formatTime
(
LocalDateTime
.
now
(),
DateUtil
.
DATETIME_YYYY_MM
));
}
if
(
"结算月本月数据"
.
equals
(
deptInfoVo
.
getInsurancesType
()))
{
pushParam
.
setFd_3af9d11088facc
(
DateUtil
.
parseDate
(
param
.
getSettleMonth
(),
DateUtil
.
DATETIME_YYYY_MM
));
}
else
if
(
"结算月上月数据"
.
equals
(
deptInfoVo
.
getInsurancesType
()))
{
...
...
@@ -820,6 +824,10 @@ public class DoJointInsuranceTask {
//商险更新赋值
public
void
initValueUpdate
(
EkpInsurancesInfo
info
,
EkpInsuranceDeptInfoVo
deptInfoVo
,
EkpInteractiveParam
param
)
throws
ParseException
{
//实际结算月份
//同倩倩确认结算月为空时,且结算方式不为全量未结算数据时,默认当月
if
(
Common
.
isEmpty
(
param
.
getSettleMonth
())
&&
!
"全量未结算数据"
.
equals
(
deptInfoVo
.
getInsurancesType
()))
{
param
.
setSettleMonth
(
LocalDateTimeUtils
.
formatTime
(
LocalDateTime
.
now
(),
DateUtil
.
DATETIME_YYYY_MM
));
}
info
.
setFd_3af9d11088facc
(!
"全量未结算数据"
.
equals
(
deptInfoVo
.
getInsurancesType
())
?
DateUtil
.
parseDate
(
param
.
getSettleMonth
(),
DateUtil
.
DATETIME_YYYY_MM
)
:
null
);
//是否全部结算
info
.
setFd_3b13b2ecc164aa
(
"全量未结算数据"
.
equals
(
deptInfoVo
.
getInsurancesType
())
?
"是"
:
"否"
);
...
...
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