近一周车流量统计接口及相关实体类PlatPostStation更改---物业服务postStation

project-zcustom/src/main/java/com/project/zcustom/domain/post/PlatPostStation.java

@@ -137,4 +137,11 @@ public class PlatPostStation extends CustomBaseEntity {
     @ApiModelProperty("近一个月报修分类占比--保洁服务")
     private Long cleaning;
 
+    /**
+     * 近一个月报修分类占比--空调故障
+     */
+    @Excel(name = "近一个月报修分类占比--空调故障")
+    @ApiModelProperty("近一个月报修分类占比--空调故障")
+    private Long airConditioning;
+
 }

project-zcustom/src/main/java/com/project/zcustom/service/post/impl/PlatPostStationServiceImpl.java

@@ -216,7 +216,7 @@ public class PlatPostStationServiceImpl extends ServiceImpl<PlatPostStationMappe
        List<String> keyList = Arrays.asList("faultWarranty",
                "dispatched","suggested","repairOrders",
                "questionnaires","furniture","hotColdWater","accessControl",
-               "other","wall","electrical","elevator","fireControl","cleaning");
+               "other","wall","electrical","elevator","fireControl","cleaning","airConditioning");
         StringUtils.setFieldValue(platPostStation,mapField,keyList,0, PlatPostStation::setFaultWarrantyNum,Long.class);
         StringUtils.setFieldValue(platPostStation,mapField,keyList,1, PlatPostStation::setDispatchedNum,Long.class);
         StringUtils.setFieldValue(platPostStation,mapField,keyList,2, PlatPostStation::setSuggestedNum,Long.class);
@@ -231,6 +231,7 @@ public class PlatPostStationServiceImpl extends ServiceImpl<PlatPostStationMappe
         StringUtils.setFieldValue(platPostStation,mapField,keyList,11, PlatPostStation::setElevator,Long.class);
         StringUtils.setFieldValue(platPostStation,mapField,keyList,12, PlatPostStation::setFireControl,Long.class);
         StringUtils.setFieldValue(platPostStation,mapField,keyList,13, PlatPostStation::setCleaning,Long.class);
+        StringUtils.setFieldValue(platPostStation,mapField,keyList,14, PlatPostStation::setAirConditioning,Long.class);
     }
 
     /**
@@ -321,17 +322,17 @@ public class PlatPostStationServiceImpl extends ServiceImpl<PlatPostStationMappe
      */
     @Override
     public List<Map<String, Object>> getPastMonthPieData(String appOrg){
-        String fieldString = "furniture,hot_cold_water,access_control,other,wall,electrical,elevator,fire_control,cleaning";
+        String fieldString = "furniture,hot_cold_water,access_control,other,wall,electrical,elevator,fire_control,cleaning,air_conditioning";
         if(Objects.equals(appOrg,"0000")){
-            fieldString = "sum(furniture) as furniture,sum(hot_cold_water) as hot_cold_water,sum(access_control) as access_control,sum(other) as other,sum(wall) as wall,sum(electrical) as electrical,sum(elevator) as elevator,sum(fire_control) as fire_control,sum(cleaning) as cleaning";
+            fieldString = "sum(furniture) as furniture,sum(hot_cold_water) as hot_cold_water,sum(access_control) as access_control,sum(other) as other,sum(wall) as wall,sum(electrical) as electrical,sum(elevator) as elevator,sum(fire_control) as fire_control,sum(cleaning) as cleaning,sum(air_conditioning) as airConditioning";
         }
         PlatPostStation platPostStation = this.getPlatPostStationByField("app_org", appOrg,fieldString);
-        List<Long> valueList = StringUtils.getDefaultListLong(9);
+        List<Long> valueList = StringUtils.getDefaultListLong(10);
         if(StringUtils.isNotNull(platPostStation)){
-            valueList = Arrays.asList(platPostStation.getFurniture(), platPostStation.getHotColdWater(), platPostStation.getAccessControl(), platPostStation.getOther(), platPostStation.getWall(), platPostStation.getElectrical(), platPostStation.getElevator(), platPostStation.getFireControl(), platPostStation.getCleaning());
+            valueList = Arrays.asList(platPostStation.getFurniture(), platPostStation.getHotColdWater(), platPostStation.getAccessControl(), platPostStation.getOther(), platPostStation.getWall(), platPostStation.getElectrical(), platPostStation.getElevator(), platPostStation.getFireControl(), platPostStation.getCleaning(), platPostStation.getAirConditioning());
         }
-        List<String> xList = Arrays.asList("办公家具报修", "冷热水故障", "门禁故障", "其他报修故障", "墙类/地类报修", "电气故障报修", "电梯故障", "消防设施设备故障", "保洁服务");
-        List<String> colorList = Arrays.asList("#ff9d00", "#2f82fe", "#12db62", "#7565ef", "#079966", "#4e2ffe", "#00f6ec", "#ff7300", "#002aff");
+        List<String> xList = Arrays.asList("办公家具报修", "冷热水故障", "门禁故障", "其他报修故障", "墙类/地类报修", "电气故障报修", "电梯故障", "消防设施设备故障", "保洁服务", "空调故障");
+        List<String> colorList = Arrays.asList("#ff9d00", "#2f82fe", "#12db62", "#7565ef", "#079966", "#4e2ffe", "#00f6ec", "#ff7300", "#002aff", "#002eff");
         List<Map<String, Object>> tempList = new ArrayList<>();
         StringUtils.createdPieData(xList,colorList,valueList,tempList);
         return tempList;