Commit e7bccde8 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.6.9' into MVP1.6.9

parents 6828011b daac17b6
...@@ -197,7 +197,8 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -197,7 +197,8 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
String fSeqNo = "AHWX" + System.currentTimeMillis(); String fSeqNo = "AHWX" + System.currentTimeMillis();
bizContent.setfSeqno(fSeqNo); bizContent.setfSeqno(fSeqNo);
bizContent.setAccountNo("1302010109024596014"); bizContent.setAccountNo("1302010109024596014");
bizContent.setBeginDate(DateUtil.getThisDay()); bizContent.setBeginDate(DateUtil.addDay(-1).replace("-",""));
bizContent.setEndDate(DateUtil.addDay(-1).replace("-",""));
bizContent.setDrcrf("2"); bizContent.setDrcrf("2");
request.setServiceUrl(icbcConfigProperties.getServerUrl()); request.setServiceUrl(icbcConfigProperties.getServerUrl());
request.setBizContent(bizContent); request.setBizContent(bizContent);
...@@ -439,8 +440,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -439,8 +440,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
pushParam.setFd_receiveMoney(String.valueOf(entry.getCreditAmount()/100.0)); pushParam.setFd_receiveMoney(String.valueOf(entry.getCreditAmount()/100.0));
pushParam.setFd_daReal(DateUtil.parseDate(entry.getBusiDate() + " " pushParam.setFd_daReal(DateUtil.parseDate(entry.getBusiDate() + " "
+ entry.getBusiTime().replace(".",":"),DateUtil.DATETIME_PATTERN_MINUTE)); + entry.getBusiTime().replace(".",":"),DateUtil.DATETIME_PATTERN_MINUTE));
pushParam.setFd_daTime(DateUtil.parseDate(entry.getBusiDate() + " " pushParam.setFd_daTime(DateUtil.getCurrentDateTime());
+ entry.getBusiTime().replace(".",":"),DateUtil.DATETIME_PATTERN_MINUTE));
pushParam.setFd_onlySequence(entry.getOnlySequence()); pushParam.setFd_onlySequence(entry.getOnlySequence());
} }
} }
...@@ -92,11 +92,11 @@ ...@@ -92,11 +92,11 @@
WHERE WHERE
a.id IN ( a.id IN (
SELECT SELECT
h.id l.id
FROM FROM
( (
SELECT SELECT
b.ID, b.EMP_IDCARD_NO,
max( b.POLICY_END ) endTime max( b.POLICY_END ) endTime
FROM FROM
t_insurance_detail b t_insurance_detail b
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
b.INSURANCE_COMPANY_NAME, b.INSURANCE_COMPANY_NAME,
b.INSURANCE_TYPE_NAME b.INSURANCE_TYPE_NAME
) h ) 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 AND h.endTime = l.POLICY_END
WHERE WHERE
l.EXPIRE_IGNORE_FLAG = '1' l.EXPIRE_IGNORE_FLAG = '1'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment