From 51e7ebffeec98f76fcc8c5c33a4b4f526c50a309 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 06 十二月 2018 16:28:12 +0800
Subject: [PATCH] 后台修改图标

---
 gx_tieta/src/com/fgkj/dao/impl/Fbsdev_Statechange_infImpl.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dao/impl/Fbsdev_Statechange_infImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Fbsdev_Statechange_infImpl.java
index f2c3ea2..bf8a5b3 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Fbsdev_Statechange_infImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Fbsdev_Statechange_infImpl.java
@@ -83,13 +83,14 @@
 								state_inf.setDev_id(rs.getInt("dev_id"));
 								state_inf.setRec_time(rs.getTimestamp("rec_time"));
 								state_inf.setLast_stat(rs.getInt("last_stat"));
-								state_inf.setLast_stat_name(BattTestData.getFbsdev_Statechange(rs.getInt("last_stat")));
+								state_inf.setLast_stat_name(BattTestData.getFbsdev_Statechange(rs.getInt("eve_type"),rs.getInt("last_stat")));
 								state_inf.setNow_stat(rs.getInt("now_stat"));
-								state_inf.setNow_stat_name(BattTestData.getFbsdev_Statechange(rs.getInt("now_stat")));
+								state_inf.setNow_stat_name(BattTestData.getFbsdev_Statechange(rs.getInt("eve_type"),rs.getInt("now_stat")));
 								state_inf.setState_change_reason(rs.getInt("state_change_reason"));
 								state_inf.setState_change_reason_name(BattTestData.getStopType(BattTestData.TEST_LOADER_FBS9100S, rs.getInt("state_change_reason")));
 								state_inf.setDev_alarm(rs.getInt("dev_alarm"));
 								state_inf.setEve_type(rs.getInt("eve_type"));
+								state_inf.setEve_type_name(BattTestData.getEve_type_name(rs.getInt("eve_type")));
 								state_inf.setModule_num(rs.getInt("module_num"));
 								state_inf.setNote(rs.getString("stationName"));
 								list.add(state_inf);

--
Gitblit v1.9.1