界面显示调整
This commit is contained in:
@@ -150,6 +150,9 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
|
|||||||
for (EnergyTemplateVO item : list) {
|
for (EnergyTemplateVO item : list) {
|
||||||
EnergyTemplateVO vo = new EnergyTemplateVO();
|
EnergyTemplateVO vo = new EnergyTemplateVO();
|
||||||
BeanUtils.copyProperties(item,vo);
|
BeanUtils.copyProperties(item,vo);
|
||||||
|
if (vo.getAnotherName().contains("A相") || vo.getAnotherName().contains("B相") || vo.getAnotherName().contains("C相")) {
|
||||||
|
vo.setAnotherName(vo.getAnotherName().substring(0,2));
|
||||||
|
}
|
||||||
EleEpdPqd eleEpdPqd = eventTypeMap.get(item.getDataId());
|
EleEpdPqd eleEpdPqd = eventTypeMap.get(item.getDataId());
|
||||||
vo.setClassId(eleEpdPqd.getClassId());
|
vo.setClassId(eleEpdPqd.getClassId());
|
||||||
vo.setUnit(eleEpdPqd.getUnit());
|
vo.setUnit(eleEpdPqd.getUnit());
|
||||||
@@ -719,6 +722,7 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
|
|||||||
if (energyTemplate != null && energyTemplate.getUnit() != null) {
|
if (energyTemplate != null && energyTemplate.getUnit() != null) {
|
||||||
dataGroupTemplate.setName(dataGroupTemplate.getName() + "(" + energyTemplate.getUnit() + ")");
|
dataGroupTemplate.setName(dataGroupTemplate.getName() + "(" + energyTemplate.getUnit() + ")");
|
||||||
}
|
}
|
||||||
|
dataGroupTemplate.setName(dataGroupTemplate.getName().replace("序列",""));;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user