Commit 0fd656d8 authored by 刘林's avatar 刘林

fix(Statistics):液化气瓶数量计算

parent 39187397
......@@ -288,13 +288,15 @@ public class CylinderDPStatisticsServiceImpl {
private Map<String, Object> getCylinderMapCount(String orgCode, Map<String, Object> result) {
if (StringUtils.isNotEmpty(orgCode)) {
result.put("cylindersCount", this.countForCylinderNum(orgCode));
Long cylindersCount = this.countForCylinderNum(orgCode);
Long automotiveGasCount = this.countForCylinderNumForVehicleUsed(orgCode);
result.put("cylindersCount", cylindersCount);
result.put("stationCount", cylinderStatisticsMapper.countEnterpriseNumForCylinder(orgCode));
result.put("operatorCount", cylinderAreaDataMapper.getOpertorStatisticsDataByCity(Collections.singletonList(orgCode)));
// 液化气瓶 (个)
result.put("liquefiedGasCount", 0L);
result.put("liquefiedGasCount", cylindersCount - automotiveGasCount);
// 车用气瓶 (个)
result.put("automotiveGasCount", this.countForCylinderNumForVehicleUsed(orgCode));
result.put("automotiveGasCount", automotiveGasCount);
// 工业气瓶 (个)
result.put("industrialGasCount", 0L);
// 使用登记数量
......
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