From 54ae34b91644b02c422b41197ae6ce33f4e3ca57 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 29 十月 2019 13:56:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractServiceImpl.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractServiceImpl.java
index 3eebc58..08c392f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractServiceImpl.java
@@ -1164,15 +1164,14 @@
String billno = redPackRecord.getBillno();
if (!StringUtil.isNullOrEmpty(billno)) {
- updeteRecord.setBillno(billno.replace("`", ""));
+ updeteRecord.setBillno(billno.replace("`", "").replace("'", ""));
}
String detailno = redPackRecord.getDetailno();
if (!StringUtil.isNullOrEmpty(detailno)) {
- updeteRecord.setDetailno(detailno.replace("`", ""));
+ updeteRecord.setDetailno(detailno.replace("`", "").replace("'", ""));
}
-
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm");
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
String rcvTime = redPackRecord.getRcvTime();
if (!StringUtil.isNullOrEmpty(rcvTime)) {
try {
--
Gitblit v1.8.0