From 807286982fd415661cdc1b164d00b4822e5b2516 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.33>
Date: 星期四, 11 十月 2018 14:21:09 +0800
Subject: [PATCH] 配组修改
---
gx_tieta/src/com/fgkj/dao/impl/BatttestdatastopDAOImpl.java | 1 -
gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java | 6 ++++--
gx_tieta/src/com/fgkj/dto/Batttestdatastop.java | 10 +---------
gx_tieta/src/com/fgkj/services/BattInfServices.java | 2 +-
4 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BatttestdatastopDAOImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BatttestdatastopDAOImpl.java
index 2bb1a5c..95ea981 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BatttestdatastopDAOImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BatttestdatastopDAOImpl.java
@@ -478,7 +478,6 @@
for(int i=0;i<list.size();i++){
Batttestdatastop sdata=list.get(i);
sdata.setNote(binf.getBattProducer());
- sdata.setStationid(binf.getStationId());
for (int j = 0; j < listr.size(); j++) {
BattInf_Rebuild brinf=(BattInf_Rebuild) listr.get(j);
if(sdata.getMon_num()==brinf.getOld_monum()&&sdata.getBattGroupId()==brinf.getOld_battgroupid()){
diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java
index fda58af..6ccb984 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java
@@ -5,6 +5,7 @@
import com.fgkj.dao.BaseDAO;
import com.fgkj.dao.CallBack;
+import com.fgkj.dto.ram.Bts_station_state;
public class Bts_station_stateImpl implements BaseDAO,CallBack{
@@ -32,9 +33,10 @@
// TODO Auto-generated method stub
return null;
}
- //
+ //鏌ヨ鏈烘埧瀹炴椂鐘舵��
public List serchByCondition(Object obj) {
- // TODO Auto-generated method stub
+ Bts_station_state bs=(Bts_station_state) obj;
+ String sql="";
return null;
}
diff --git a/gx_tieta/src/com/fgkj/dto/Batttestdatastop.java b/gx_tieta/src/com/fgkj/dto/Batttestdatastop.java
index 49f26c0..2cd0157 100644
--- a/gx_tieta/src/com/fgkj/dto/Batttestdatastop.java
+++ b/gx_tieta/src/com/fgkj/dto/Batttestdatastop.java
@@ -26,7 +26,6 @@
private Float mon_max;
private float percent;
private String note;
- private String stationid;
public Batttestdatastop() {
}
@@ -208,13 +207,6 @@
this.note = note;
}
- public String getStationid() {
- return stationid;
- }
-
- public void setStationid(String stationid) {
- this.stationid = stationid;
- }
@Override
public String toString() {
@@ -229,7 +221,7 @@
+ ", mon_vol=" + mon_vol + ", lowC=" + lowC + ", lowV=" + lowV
+ ", mon_avg=" + mon_avg + ", mon_min=" + mon_min
+ ", mon_max=" + mon_max + ", percent=" + percent + ", note="
- + note + ", stationid=" + stationid + "]";
+ + note + "]";
}
diff --git a/gx_tieta/src/com/fgkj/services/BattInfServices.java b/gx_tieta/src/com/fgkj/services/BattInfServices.java
index 3c6ac12..348533d 100644
--- a/gx_tieta/src/com/fgkj/services/BattInfServices.java
+++ b/gx_tieta/src/com/fgkj/services/BattInfServices.java
@@ -830,7 +830,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,6 +874,7 @@
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);
--
Gitblit v1.9.1