Commit 9525c2f4 authored by zhengjiawei's avatar zhengjiawei

修改f_equipment_manage to f_fire_fighting_system

parent 288b2038
......@@ -21,30 +21,36 @@ public class StationMaintenServiceImp implements IStationMaintenService {
@Override
public void save(StationInfo stationInfo){
// 状态为启用(0)下只能修改换流站名称
if(stationInfo.getId() == 0){
StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append(stationInfo.getUseType());
stringBuilder.append(stationInfo.getRegionCode());
stringBuilder.append(stationInfo.getCode());
stationInfo.setStationCode(stringBuilder.toString());
}else{
StationInfo station = detail();
// 判断状态是否切换
if(!station.getStatus().equals(stationInfo.getStatus())){
StringBuilder stringBuilder = new StringBuilder();
if(StringUtils.isEmpty(stationInfo.getRegionCode())){
stringBuilder.append(station.getStationCode());
}else{
stringBuilder.append(stationInfo.getUseType());
stringBuilder.append(stationInfo.getRegionCode());
stringBuilder.append(stationInfo.getCode());
}
stationInfo.setStationCode(stringBuilder.toString());
}
}
// // 状态为启用(0)下只能修改换流站名称
// if(stationInfo.getId() == 0){
// StringBuilder stringBuilder = new StringBuilder();
// stringBuilder.append(stationInfo.getUseType());
// stringBuilder.append(stationInfo.getRegionCode());
// stringBuilder.append(stationInfo.getCode());
// stationInfo.setStationCode(stringBuilder.toString());
// }else{
// StationInfo station = detail();
// // 判断状态是否切换
// if(!station.getStatus().equals(stationInfo.getStatus())){
// StringBuilder stringBuilder = new StringBuilder();
//
// if(StringUtils.isEmpty(stationInfo.getRegionCode())){
// stringBuilder.append(station.getStationCode());
// }else{
// stringBuilder.append(stationInfo.getUseType());
// stringBuilder.append(stationInfo.getRegionCode());
// stringBuilder.append(stationInfo.getCode());
// }
//
// stationInfo.setStationCode(stringBuilder.toString());
// }
// }
//保存
iStationMaintenDao.save(stationInfo);
......
......@@ -49,7 +49,7 @@
left join wl_equipment_detail as det on sto.equipment_detail_id = det.id
left join wl_equipment as equ on det.equipment_id = equ.id
left join wl_equipment_category as cate on equ.category_id = cate.id
left join f_equipment_manage as manage on spe.system_id = manage.SEQUENCE_NBR
left join f_fire_fighting_system as manage on spe.system_id = manage.SEQUENCE_NBR
where sto.amount <![CDATA[>]]> 0
<if test="name != null and name!='null' ">
and det.name like CONCAT('%',#{name},'%' )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment