hdw
2018-11-20 db53916414e35580e8f39bc8f7dd1897f8200eda
Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
1个文件已修改
4 ■■■■ 已修改文件
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -1133,7 +1133,7 @@
        });
        return list;
    }
    //实时历史机历卡
    public List serchByBattgroupId(Object obj){
        BattInf binf=(BattInf)obj;
        String sql="select * from db_battinf.tb_battinf where battgroupid=?";
@@ -1234,7 +1234,7 @@
                      batt.setSignalId(rs.getString("SignalId"));
                      
                      batt.setCInterFaceId(Integer.parseInt(rs.getString("CInterFaceId")));
                      batt.setInstall_user(rs.getString("install_user"));
                      batt.setSignalName(rs.getString("SignalName"));
                      int BattGuarantDayCount=rs.getInt("BattGuarantDayCount")-ActionUtil.daysBetween(rs.getDate("BattInUseDate"), new Date());//剩余保修天数
                      batt.setBattGuarantDayCount(BattGuarantDayCount);