|
|
|
@ -54,7 +54,8 @@ public class MeterReadingsHisServiceImpl implements IMeterReadingsHisService { |
|
|
|
"热水热泵系统用水总合计:", |
|
|
|
"热水热泵系统用水总合计:", |
|
|
|
"水、电费用总合计(水/电价预估单价,单价需以实际缴费为准):", |
|
|
|
"水、电费用总合计(水/电价预估单价,单价需以实际缴费为准):", |
|
|
|
"中央空调制冷量(kw)", |
|
|
|
"中央空调制冷量(kw)", |
|
|
|
"蒸汽流量(吨)" |
|
|
|
"蒸汽流量(吨)", |
|
|
|
|
|
|
|
"采暖系统制热量(kw)" |
|
|
|
); |
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
private final List<String> mtTypeList = List.of( |
|
|
|
private final List<String> mtTypeList = List.of( |
|
|
|
@ -77,10 +78,14 @@ public class MeterReadingsHisServiceImpl implements IMeterReadingsHisService { |
|
|
|
"电表", |
|
|
|
"电表", |
|
|
|
"电表", |
|
|
|
"电表", |
|
|
|
"电表", |
|
|
|
"电表", |
|
|
|
|
|
|
|
"电表", |
|
|
|
|
|
|
|
"电表", |
|
|
|
|
|
|
|
"水表", |
|
|
|
"水表", |
|
|
|
"水表", |
|
|
|
"水表", |
|
|
|
"水表", |
|
|
|
"总合计", |
|
|
|
"总合计", |
|
|
|
"流量计量表", |
|
|
|
"流量计量表", |
|
|
|
|
|
|
|
"流量计量表", |
|
|
|
"流量计量表" |
|
|
|
"流量计量表" |
|
|
|
); |
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
@ -147,7 +152,7 @@ public class MeterReadingsHisServiceImpl implements IMeterReadingsHisService { |
|
|
|
reportMeterReadingsHis.setMtType("电表"); |
|
|
|
reportMeterReadingsHis.setMtType("电表"); |
|
|
|
} else if (reportMeterReadingsHis.getMtType().contains("水表")) { |
|
|
|
} else if (reportMeterReadingsHis.getMtType().contains("水表")) { |
|
|
|
reportMeterReadingsHis.setMtType("水表"); |
|
|
|
reportMeterReadingsHis.setMtType("水表"); |
|
|
|
} else if (reportMeterReadingsHis.getMtType().contains("冷量计")) { |
|
|
|
} else if (reportMeterReadingsHis.getMtType().contains("冷量计") || reportMeterReadingsHis.getMtType().contains("锅炉")) { |
|
|
|
reportMeterReadingsHis.setMtType("流量计量表"); |
|
|
|
reportMeterReadingsHis.setMtType("流量计量表"); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|