src/com/fgkj/dao/impl/BattresdataDAOImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/com/fgkj/services/Batt_MaintService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/com/fgkj/dao/impl/BattresdataDAOImpl.java
@@ -418,6 +418,28 @@ }); return list; } //查询设置为标准的 public List serchisStandard(Object obj) { Battresdata btd = (Battresdata) obj; String sql = "select * from db_batt_testdata.tb_battresdata_" + btd.getBattGroupId() + "" + " where isStandard=1"; return DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[] { }, new BattresdataDAOImpl()); } //查询最近的 public List serchCurrent(Object obj) { Battresdata btd = (Battresdata) obj; String sql = "select * from db_batt_testdata.tb_battresdata_"+ btd.getBattGroupId() + " " + " where test_starttime=(" + " SELECT DISTINCT test_starttime from db_batt_testdata.tb_battresdata_inf where BattGroupId=? order by test_starttime desc limit 1" + ")"; return DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[] {btd.getBattGroupId() }, new BattresdataDAOImpl()); } public boolean setStandard(Battresdata params) { String sql = "update db_batt_testdata.tb_battresdata_"+params.getBattGroupId()+ " set isStandard = 1 where num != 0 and test_starttime = ? ;"; src/com/fgkj/services/Batt_MaintService.java
@@ -11,6 +11,7 @@ import com.fgkj.dao.impl.Batt_maint_infImpl; import com.fgkj.dao.impl.Batt_param_lowImpl; import com.fgkj.dao.impl.BattinfThirdImpl; import com.fgkj.dao.impl.BattresdataDAOImpl; import com.fgkj.dto.AllModel; import com.fgkj.dto.BattInf; import com.fgkj.dto.Batt_Maint_Dealarm; @@ -138,6 +139,14 @@ Battresdata rdata = new Battresdata(); List<Batt_Maint_Dealarm> list =dao.serchByCondition(bmd); //添加内阻测试设置为标准值的那一笔,如果没有则拿最新的一笔 Battresdata btd=new Battresdata(); btd.setBattGroupId(bmd.getBinf().getBattGroupId()); List<Battresdata> listRes=new ArrayList<Battresdata>(); listRes=(new BattresdataDAOImpl()).serchisStandard(btd); if(listRes==null||listRes.size()<=0){ listRes=(new BattresdataDAOImpl()).serchCurrent(btd); } Batt_param_low lowCA=new Batt_param_low(); lowCA.setLow_type(2); @@ -171,6 +180,7 @@ model.setCode(1); model.setMsg("查询成功!"); model.setData(list); model.setData2(listRes); model.setLowCA(percentCA); model.setLowCH(percentCH); model.setLowRA(percentRA);