Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
| | |
|---|
| | | " from db_battinf.tb_battinf " +
|
|---|
| | | " left outer join (select * from db_battinf.tb_battinf_rebuild where tb_battinf_rebuild.rebuild_clear_type=1 ) as battinf_re " +
|
|---|
| | | " on BattGroupId=battinf_re.new_battgroupid or BattGroupId=battinf_re.old_battgroupid " +
|
|---|
| | | " where stationname2 like ? stationname5 like ? ";
|
|---|
| | | " where stationname2 like ? and stationname5 like ? ";
|
|---|
| | | //用户管理
|
|---|
| | | String userSql=" and StationId in(" +
|
|---|
| | | " select distinct db_user.tb_user_battgroup_baojigroup_battgroup.StationId from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id and db_user.tb_user_battgroup_baojigroup_usr.uId=?" +
|
|---|
