From 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期六, 19 一月 2019 09:16:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/Process_surveyImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Process_surveyImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Process_surveyImpl.java
index 2e00e8a..abfe3dc 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Process_surveyImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Process_surveyImpl.java
@@ -3,6 +3,7 @@
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import com.fgkj.dao.BaseDAO;
@@ -69,7 +70,8 @@
process.setProcess_starttime(rs.getTimestamp("process_starttime"));
process.setServerName(rs.getString("serverName"));
process.setServerFlag(rs.getInt("serverFlag"));
- process.setNote(rs.getString("note"));
+ process.setNote(DAOHelper.sdf.format(new Date()));
+ process.setProcessName_CN(rs.getString("note"));
process.setOutTime(rs.getInt("outTime"));
list.add(process);
}
--
Gitblit v1.9.1