From d5f446da1b638fe1024c35f9732e72c12d71f1f8 Mon Sep 17 00:00:00 2001
From: baiXiao8813 <516776535@qq.com>
Date: 星期二, 27 七月 2021 14:14:37 +0800
Subject: [PATCH] 立库日入库、出库导出列顺序调整
---
src/main/java/com/zy/common/service/erp/ErpSqlServer.java | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/common/service/erp/ErpSqlServer.java b/src/main/java/com/zy/common/service/erp/ErpSqlServer.java
index 24b89da..f419226 100644
--- a/src/main/java/com/zy/common/service/erp/ErpSqlServer.java
+++ b/src/main/java/com/zy/common/service/erp/ErpSqlServer.java
@@ -5,6 +5,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
import java.sql.*;
import java.util.ArrayList;
import java.util.HashMap;
@@ -61,11 +65,13 @@
/********************************* 鏍稿績灞� *********************************/
/*****************************************************************************/
+
private List<Map<String, Object>> executeQuery(String sql) {
try {
Connection conn = getConn();
pstm = conn.prepareStatement(sql);
rs = pstm.executeQuery();
+// List<Map<String, Object>> maps = convertList(rs);
return convertList(rs);
} catch (Exception e) {
e.printStackTrace();
@@ -130,13 +136,31 @@
e.printStackTrace();
}
}
-// if (conn != null) {
-// try {
-// conn.close();
-// } catch (SQLException e) {
-// e.printStackTrace();
-// }
-// }
+ if (conn != null) {
+ try {
+ conn.close();
+ conn = null;
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ /**
+ * 娣辨嫹璐�
+ */
+ public ArrayList deepClone(List list) throws Exception {
+ // 搴忓垪鍖�
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ ObjectOutputStream oos = new ObjectOutputStream(bos);
+
+ oos.writeObject(list);
+
+ // 鍙嶅簭鍒楀寲
+ ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
+ ObjectInputStream ois = new ObjectInputStream(bis);
+
+ return (ArrayList) ois.readObject();
}
}
--
Gitblit v1.9.1