From aa890874f3f6ee7e88134493dc29705bc6fd89a3 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.25>
Date: 星期一, 22 十月 2018 16:24:27 +0800
Subject: [PATCH] 修改
---
gx_tieta/src/com/fgkj/services/BattInfServices.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/services/BattInfServices.java b/gx_tieta/src/com/fgkj/services/BattInfServices.java
index 3c6ac12..ff30955 100644
--- a/gx_tieta/src/com/fgkj/services/BattInfServices.java
+++ b/gx_tieta/src/com/fgkj/services/BattInfServices.java
@@ -152,6 +152,20 @@
}
return model;
}
+ //鏍规嵁缁存姢鍖哄拰鏈烘埧鍚嶇О鏌ヨ鐢垫睜缁勪俊鎭�
+ public ServiceModel searchInform1(Object obj) {
+ List<BattInf> list=((BattInfImpl)dao).searchInform1(obj);
+ if (list != null && list.size() > 0) {
+ model.setCode(1);
+ model.setData(list);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ }
+ else{
+ model.setCode(0);
+ model.setMsg("鏌ヨ澶辫触!");
+ }
+ return model;
+ }
public ServiceModel searchAll() {
List list = dao.searchAll();
@@ -830,7 +844,6 @@
Batttestdatastop sdata=new Batttestdatastop();
sdata.setBattGroupId(binf.getBattGroupId());
sdata.setNote(binf.getBattProducer());
- sdata.setStationid(binf.getStationId());
sdata.setMon_num(j+1);
for (int z = 0; z < listr.size(); z++) {
BattInf_Rebuild brinf=(BattInf_Rebuild) listr.get(z);
@@ -875,11 +888,16 @@
b.setBattGroupName(binf.getBattGroupName());
b.setMonVolStd(binf.getMonVolStd());
b.setMonCapStd(binf.getMonCapStd());
+ b.setStationId(binf.getStationId());
b.setMonNum(j+1);
for (int z = 0; z < listr.size(); z++) {
BattInf_Rebuild brinf=(BattInf_Rebuild) listr.get(z);
if((j+1)==brinf.getNew_monum()&&b.getBattGroupId()==brinf.getNew_battgroupid()){
b.setBattProducer(brinf.getOld_battproducer());
+ b.setNum(1);
+ }
+ if((j+1)==brinf.getOld_monum()&&b.getBattGroupId()==brinf.getOld_battgroupid()){
+ b.setNum(0);
}
}
list_b.add(b);
--
Gitblit v1.9.1