微调
This commit is contained in:
@@ -750,7 +750,7 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
|
|||||||
for (DataGroupTemplateVO dataGroupTemplate : dataGroupTemplates) {
|
for (DataGroupTemplateVO dataGroupTemplate : dataGroupTemplates) {
|
||||||
EnergyTemplateVO energyTemplate = energyTemplateMap.get(dataGroupTemplate.getId());
|
EnergyTemplateVO energyTemplate = energyTemplateMap.get(dataGroupTemplate.getId());
|
||||||
if (energyTemplate != null && energyTemplate.getUnit() != null) {
|
if (energyTemplate != null && energyTemplate.getUnit() != null) {
|
||||||
if (changePower(dataGroupTemplate.getName()) && Objects.equals(type,"Primary")) {
|
if (changePower(dataGroupTemplate.getName())) {
|
||||||
dataGroupTemplate.setName(dataGroupTemplate.getName() + "(k" + energyTemplate.getUnit() + ")");
|
dataGroupTemplate.setName(dataGroupTemplate.getName() + "(k" + energyTemplate.getUnit() + ")");
|
||||||
} else {
|
} else {
|
||||||
dataGroupTemplate.setName(dataGroupTemplate.getName() + "(" + energyTemplate.getUnit() + ")");
|
dataGroupTemplate.setName(dataGroupTemplate.getName() + "(" + energyTemplate.getUnit() + ")");
|
||||||
|
|||||||
Reference in New Issue
Block a user