From 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期六, 19 一月 2019 09:16:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/BattinfGroupFactory.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/BattinfGroupFactory.java b/gx_tieta/src/com/fgkj/dao/BattinfGroupFactory.java
index 87a204a..e1066eb 100644
--- a/gx_tieta/src/com/fgkj/dao/BattinfGroupFactory.java
+++ b/gx_tieta/src/com/fgkj/dao/BattinfGroupFactory.java
@@ -110,14 +110,25 @@
//鏌ヨ褰撳墠鏈�澶х殑鐢垫睜缁刬d
public static int searchMaxBattgroupId(){
int battgroupid=0;
- int BattgroupId_inf=(new Batt_rtstateDAOImpl()).searchMaxBattgroupId();//褰撳墠鍐呭瓨涓渶澶х殑鐢垫睜缁刬d
+ int BattgroupId_rtstate=(new Batt_rtstateDAOImpl()).searchMaxBattgroupId();//褰撳墠鍐呭瓨涓渶澶х殑鐢垫睜缁刬d
int BattgroupId_apply=(new Battinf_applyImpl()).searchMaxBattgroupId_apply();//褰撳墠鍐呭瓨涓渶澶х殑鐢垫睜缁刬d
+ int BattgroupId_inf=(new BattInfImpl()).searchMaxBattgroupId();//褰撳墠鍐呭瓨涓渶澶х殑鐢垫睜缁刬d
if(BattgroupId_inf>=BattgroupId_apply){
- battgroupid=BattgroupId_inf+1;
+ battgroupid=BattgroupId_inf;
+ if(battgroupid>=BattgroupId_rtstate) {
+ battgroupid=battgroupid;
+ }else {
+ battgroupid=BattgroupId_rtstate;
+ }
}else{
- battgroupid=BattgroupId_apply+1;
+ battgroupid=BattgroupId_apply;
+ if(battgroupid>=BattgroupId_rtstate) {
+ battgroupid=battgroupid;
+ }else {
+ battgroupid=BattgroupId_rtstate;
+ }
}
- return battgroupid;
+ return battgroupid+1;
}
//鏌ヨ褰撳墠鏈�澶х殑stationid
public static int searchStationId(){
--
Gitblit v1.9.1