From a4066e2393247519328d0d7b0896724cda64bab4 Mon Sep 17 00:00:00 2001 From: whyclj <1525436766@qq.com> Date: 星期二, 08 一月 2019 15:27:58 +0800 Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw --- gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java index 761496a..a88ed4e 100644 --- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java +++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java @@ -4605,7 +4605,7 @@ String sql=" select distinct(tb_battinf.StationId),StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,FBSDeviceId," + "FBSDeviceName,count(FBSDeviceId) as batt_num" + ",MonCount,monVolStd,monResStd,MonSerStd,Load_curr,DisCurrMax,montmpstd,floatVolLevel,offlineVolLevel,battFloatCurrent" - + ",GROUP_CONCAT(tb_battinf.MonCapStd) as moncapstds " + + ",GROUP_CONCAT(tb_battinf.MonCapStd order by groupIndexInFBSDevice separator '/' ) as moncapstds " + ",db_ram_db.tb_fbs9100_state.dev_version" + ",web_site.tb_batt_endurance.real_cap_group1 ,web_site.tb_batt_endurance.real_cap_group2,web_site.tb_batt_endurance.real_cap_group3,web_site.tb_batt_endurance.real_cap_group4 " + " from db_battinf.tb_battinf,db_ram_db.tb_fbs9100_state,web_site.tb_batt_endurance " -- Gitblit v1.9.1