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
e7bccde8
Commit
e7bccde8
authored
Sep 06, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.6.9' into MVP1.6.9
parents
6828011b
daac17b6
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
IcbcTransactionFlowQueryServiceImpl.java
...ekp/service/impl/IcbcTransactionFlowQueryServiceImpl.java
+3
-3
TInsuranceWarnMapper.xml
...main/resources/mapper/insurances/TInsuranceWarnMapper.xml
+3
-3
No files found.
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/IcbcTransactionFlowQueryServiceImpl.java
View file @
e7bccde8
...
...
@@ -197,7 +197,8 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
String
fSeqNo
=
"AHWX"
+
System
.
currentTimeMillis
();
bizContent
.
setfSeqno
(
fSeqNo
);
bizContent
.
setAccountNo
(
"1302010109024596014"
);
bizContent
.
setBeginDate
(
DateUtil
.
getThisDay
());
bizContent
.
setBeginDate
(
DateUtil
.
addDay
(-
1
).
replace
(
"-"
,
""
));
bizContent
.
setEndDate
(
DateUtil
.
addDay
(-
1
).
replace
(
"-"
,
""
));
bizContent
.
setDrcrf
(
"2"
);
request
.
setServiceUrl
(
icbcConfigProperties
.
getServerUrl
());
request
.
setBizContent
(
bizContent
);
...
...
@@ -439,8 +440,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
pushParam
.
setFd_receiveMoney
(
String
.
valueOf
(
entry
.
getCreditAmount
()/
100.0
));
pushParam
.
setFd_daReal
(
DateUtil
.
parseDate
(
entry
.
getBusiDate
()
+
" "
+
entry
.
getBusiTime
().
replace
(
"."
,
":"
),
DateUtil
.
DATETIME_PATTERN_MINUTE
));
pushParam
.
setFd_daTime
(
DateUtil
.
parseDate
(
entry
.
getBusiDate
()
+
" "
+
entry
.
getBusiTime
().
replace
(
"."
,
":"
),
DateUtil
.
DATETIME_PATTERN_MINUTE
));
pushParam
.
setFd_daTime
(
DateUtil
.
getCurrentDateTime
());
pushParam
.
setFd_onlySequence
(
entry
.
getOnlySequence
());
}
}
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceWarnMapper.xml
View file @
e7bccde8
...
...
@@ -92,11 +92,11 @@
WHERE
a.id IN (
SELECT
h
.id
l
.id
FROM
(
SELECT
b.
ID
,
b.
EMP_IDCARD_NO
,
max( b.POLICY_END ) endTime
FROM
t_insurance_detail b
...
...
@@ -119,7 +119,7 @@
b.INSURANCE_COMPANY_NAME,
b.INSURANCE_TYPE_NAME
) h
INNER JOIN t_insurance_detail l ON h.
id = l.id
INNER JOIN t_insurance_detail l ON h.
EMP_IDCARD_NO = l.EMP_IDCARD_NO
AND h.endTime = l.POLICY_END
WHERE
l.EXPIRE_IGNORE_FLAG = '1'
...
...
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