From fa9d01b5b23fbfd99d82953cd43f03785eecf811 Mon Sep 17 00:00:00 2001
From: whychdw <49690745@qq.com>
Date: 星期二, 03 十二月 2019 13:40:12 +0800
Subject: [PATCH] Merge branch 'FBS9600' of http://whychdw@118.89.139.230:10101/r/FBS9600App.git into FBS9600
---
platforms/android/app/src/main/java/com/fgkj/impl/BattresdataImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/platforms/android/app/src/main/java/com/fgkj/impl/BattresdataImpl.java b/platforms/android/app/src/main/java/com/fgkj/impl/BattresdataImpl.java
index ded85df..804503c 100644
--- a/platforms/android/app/src/main/java/com/fgkj/impl/BattresdataImpl.java
+++ b/platforms/android/app/src/main/java/com/fgkj/impl/BattresdataImpl.java
@@ -108,7 +108,8 @@
Battresdata r=new Battresdata();
r.setNum(rs.getInt(rs.getColumnIndex("num")));
r.setBattGroupId(rs.getInt(rs.getColumnIndex("BattGroupId")));
- r.setTest_record_count(rs.getInt(rs.getColumnIndex("test_type")));
+ r.setTest_record_count(rs.getInt(rs.getColumnIndex("test_record_count")));
+ r.setTest_type(rs.getInt(rs.getColumnIndex("test_type")));
r.setTest_starttime(ActionUtil.sdf.parse(rs.getString(rs.getColumnIndex("test_starttime"))));
r.setGroup_vol(rs.getFloat(rs.getColumnIndex("group_vol")));
r.setTest_curr(rs.getFloat(rs.getColumnIndex("test_curr")));
--
Gitblit v1.9.1