Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git ...

D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore

2019-01-18 864e4772eea5e0a589b6f6797d0695a3b3dd225e

 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);

               }