查询接口及相关数据录入已更改---近一个月报修分类占比

实体类更改---物业服务对象 plat_post_station

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

@@ -75,73 +75,66 @@ public class PlatPostStation extends CustomBaseEntity {
     private Long questionnairesNum;
 
     /**
-     * 近一个月报修分类占比--消防
+     * 近一个月报修分类占比--办公家具报修
      */
-    @Excel(name = "近一个月报修分类占比--消防")
-    @ApiModelProperty("近一个月报修分类占比--消防")
-    private Long fireControlNum;
+    @Excel(name = "近一个月报修分类占比--办公家具报修")
+    @ApiModelProperty("近一个月报修分类占比--办公家具报修")
+    private Long furniture;
 
     /**
-     * 近一个月报修分类占比--电梯
+     * 近一个月报修分类占比--冷热水故障
      */
-    @Excel(name = "近一个月报修分类占比--电梯")
-    @ApiModelProperty("近一个月报修分类占比--电梯")
-    private Long elevatorNum;
+    @Excel(name = "近一个月报修分类占比--冷热水故障")
+    @ApiModelProperty("近一个月报修分类占比--冷热水故障")
+    private Long hotColdWater;
 
     /**
-     * 近一个月报修分类占比--照明灯具
+     * 近一个月报修分类占比--门禁故障
      */
-    @Excel(name = "近一个月报修分类占比--照明灯具")
-    @ApiModelProperty("近一个月报修分类占比--照明灯具")
-    private Long lampNum;
+    @Excel(name = "近一个月报修分类占比--门禁故障")
+    @ApiModelProperty("近一个月报修分类占比--门禁故障")
+    private Long accessControl;
 
     /**
-     * 近一个月报修分类占比--安防
+     * 近一个月报修分类占比--其他报修故障
      */
-    @Excel(name = "近一个月报修分类占比--安防")
-    @ApiModelProperty("近一个月报修分类占比--安防")
-    private Long securityNum;
+    @Excel(name = "近一个月报修分类占比--其他报修故障")
+    @ApiModelProperty("近一个月报修分类占比--其他报修故障")
+    private Long other;
 
     /**
-     * 近一个月报修分类占比--卫生间
+     * 近一个月报修分类占比--墙类/地类报修
      */
-    @Excel(name = "近一个月报修分类占比--卫生间")
-    @ApiModelProperty("近一个月报修分类占比--卫生间")
-    private Long toiletNum;
+    @Excel(name = "近一个月报修分类占比--墙类/地类报修")
+    @ApiModelProperty("近一个月报修分类占比--墙类/地类报修")
+    private Long wall;
 
     /**
-     * 近一个月报修分类占比--公区
+     * 近一个月报修分类占比--电气故障报修
      */
-    @Excel(name = "近一个月报修分类占比--公区")
-    @ApiModelProperty("近一个月报修分类占比--公区")
-    private Long areaNum;
+    @Excel(name = "近一个月报修分类占比--电气故障报修")
+    @ApiModelProperty("近一个月报修分类占比--电气故障报修")
+    private Long electrical;
 
     /**
-     * 近一个月报修分类占比--空调
+     * 近一个月报修分类占比--电梯故障
      */
-    @Excel(name = "近一个月报修分类占比--空调")
-    @ApiModelProperty("近一个月报修分类占比--空调")
-    private Long conditionerNum;
+    @Excel(name = "近一个月报修分类占比--电梯故障")
+    @ApiModelProperty("近一个月报修分类占比--电梯故障")
+    private Long elevator;
 
     /**
-     * 近一个月报修分类占比--其它维修
+     * 近一个月报修分类占比--消防设施设备故障
      */
-    @Excel(name = "近一个月报修分类占比--其它维修")
-    @ApiModelProperty("近一个月报修分类占比--其它维修")
-    private Long repairsNum;
+    @Excel(name = "近一个月报修分类占比--消防设施设备故障")
+    @ApiModelProperty("近一个月报修分类占比--消防设施设备故障")
+    private Long fireControl;
 
     /**
-     * 近一个月报修分类占比--会议保障
+     * 近一个月报修分类占比--保洁服务
      */
-    @Excel(name = "近一个月报修分类占比--会议保障")
-    @ApiModelProperty("近一个月报修分类占比--会议保障")
-    private Long meetingNum;
-
-    /**
-     * 近一个月报修分类占比--办公室
-     */
-    @Excel(name = "近一个月报修分类占比--办公室")
-    @ApiModelProperty("近一个月报修分类占比--办公室")
-    private Long officeNum;
+    @Excel(name = "近一个月报修分类占比--保洁服务")
+    @ApiModelProperty("近一个月报修分类占比--保洁服务")
+    private Long cleaning;
 
 }

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

@@ -194,11 +194,13 @@ public class PlatPostStationServiceImpl extends ServiceImpl<PlatPostStationMappe
         try {
             if(StringUtils.isNotNull(platPostStation)){
                 this.setPlatPostStation(mapField,platPostStation);
+                // 更新数据
                 this.updateById(platPostStation);
             }else{
                 platPostStation = new PlatPostStation();
                 this.setPlatPostStation(mapField,platPostStation);
                 platPostStation.setAppOrg(appOrg);
+                // 添加数据
                 this.save(platPostStation);
             }
             this.addStationChart(appOrg,mapField);
@@ -213,28 +215,28 @@ public class PlatPostStationServiceImpl extends ServiceImpl<PlatPostStationMappe
     private void setPlatPostStation(Map<String, Object> mapField, PlatPostStation platPostStation){
        List<String> keyList = Arrays.asList("faultWarranty",
                "dispatched","suggested","repairOrders",
-               "questionnaires","fireControl","elevator","lamp",
-               "security","toilet","area","conditioner","repairs","meeting","office");
+               "questionnaires","furniture","hotColdWater","accessControl",
+               "other","wall","electrical","elevator","fireControl","cleaning");
         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);
         StringUtils.setFieldValue(platPostStation,mapField,keyList,3, PlatPostStation::setRepairOrdersNum,Long.class);
         StringUtils.setFieldValue(platPostStation,mapField,keyList,4, PlatPostStation::setQuestionnairesNum,Long.class);
-        StringUtils.setFieldValue(platPostStation,mapField,keyList,5, PlatPostStation::setFireControlNum,Long.class);
-        StringUtils.setFieldValue(platPostStation,mapField,keyList,6, PlatPostStation::setElevatorNum,Long.class);
-        StringUtils.setFieldValue(platPostStation,mapField,keyList,7, PlatPostStation::setLampNum,Long.class);
-        StringUtils.setFieldValue(platPostStation,mapField,keyList,8, PlatPostStation::setSecurityNum,Long.class);
-        StringUtils.setFieldValue(platPostStation,mapField,keyList,9, PlatPostStation::setToiletNum,Long.class);
-        StringUtils.setFieldValue(platPostStation,mapField,keyList,10, PlatPostStation::setAreaNum,Long.class);
-        StringUtils.setFieldValue(platPostStation,mapField,keyList,11, PlatPostStation::setConditionerNum,Long.class);
-        StringUtils.setFieldValue(platPostStation,mapField,keyList,12, PlatPostStation::setRepairsNum,Long.class);
-        StringUtils.setFieldValue(platPostStation,mapField,keyList,13, PlatPostStation::setMeetingNum,Long.class);
-        StringUtils.setFieldValue(platPostStation,mapField,keyList,14, PlatPostStation::setOfficeNum,Long.class);
+        StringUtils.setFieldValue(platPostStation,mapField,keyList,5, PlatPostStation::setFurniture,Long.class);
+        StringUtils.setFieldValue(platPostStation,mapField,keyList,6, PlatPostStation::setHotColdWater,Long.class);
+        StringUtils.setFieldValue(platPostStation,mapField,keyList,7, PlatPostStation::setAccessControl,Long.class);
+        StringUtils.setFieldValue(platPostStation,mapField,keyList,8, PlatPostStation::setOther,Long.class);
+        StringUtils.setFieldValue(platPostStation,mapField,keyList,9, PlatPostStation::setWall,Long.class);
+        StringUtils.setFieldValue(platPostStation,mapField,keyList,10, PlatPostStation::setElectrical,Long.class);
+        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);
     }
 
     /**
      * 处理表格数据
      * 物业服务 近六个月报修分类占比
+     * 依次存入各个月的各种报修的数据
      * @param appOrg
      * @param mapField
      */
@@ -272,6 +274,7 @@ public class PlatPostStationServiceImpl extends ServiceImpl<PlatPostStationMappe
             platPostStationChart.setOfNum(Long.parseLong(ofList.get(keyAppendList.get(i)).toString()));
             chartList.add(platPostStationChart);
         }
+        // 添加数据
         iPlatPostStationChartService.saveBatch(chartList);
     }
 
@@ -318,17 +321,17 @@ public class PlatPostStationServiceImpl extends ServiceImpl<PlatPostStationMappe
      */
     @Override
     public List<Map<String, Object>> getPastMonthPieData(String appOrg){
-        String fieldString = "fire_control_num,elevator_num,lamp_num,security_num,toilet_num,area_num,conditioner_num,repairs_num,meeting_num,office_num";
+        String fieldString = "furniture,hotColdWater,accessControl,other,wall,electrical,elevator,fireControl,cleaning";
         if(Objects.equals(appOrg,"0000")){
-            fieldString = "sum(fire_control_num) as fire_control_num,sum(elevator_num) as elevator_num,sum(lamp_num) as lamp_num,sum(security_num) as security_num,sum(toilet_num) as toilet_num,sum(area_num) as area_num,sum(conditioner_num) as conditioner_num,sum(repairs_num) as repairs_num,sum(meeting_num) as meeting_num,sum(office_num) as office_num";
+            fieldString = "sum(furniture) as furniture,sum(hotColdWater) as hotColdWater,sum(accessControl) as accessControl,sum(other) as other,sum(wall) as wall,sum(electrical) as electrical,sum(elevator) as elevator,sum(fireControl) as fireControl,sum(cleaning) as cleaning";
         }
         PlatPostStation platPostStation = this.getPlatPostStationByField("app_org", appOrg,fieldString);
-        List<Long> valueList = StringUtils.getDefaultListLong(10);
+        List<Long> valueList = StringUtils.getDefaultListLong(9);
         if(StringUtils.isNotNull(platPostStation)){
-            valueList = Arrays.asList(platPostStation.getFireControlNum(), platPostStation.getElevatorNum(), platPostStation.getLampNum(), platPostStation.getSecurityNum(), platPostStation.getToiletNum(), platPostStation.getAreaNum(), platPostStation.getConditionerNum(), platPostStation.getRepairsNum(), platPostStation.getMeetingNum(), platPostStation.getOfficeNum());
+            valueList = Arrays.asList(platPostStation.getFurniture(), platPostStation.getHotColdWater(), platPostStation.getAccessControl(), platPostStation.getOther(), platPostStation.getWall(), platPostStation.getElectrical(), platPostStation.getElevator(), platPostStation.getFireControl(), platPostStation.getCleaning());
         }
-        List<String> xList = Arrays.asList("消防", "电梯", "照明灯具", "安防", "卫生间", "公区", "空调", "其它维修", "会议保障", "办公室");
-        List<String> colorList = Arrays.asList("#ff9d00", "#2f82fe", "#12db62", "#7565ef", "#079966", "#4e2ffe", "#00f6ec", "#ff7300", "#002aff", "#e1ff00");
+        List<String> xList = Arrays.asList("办公家具报修", "冷热水故障", "门禁故障", "其他报修故障", "墙类/地类报修", "电气故障报修", "电梯故障", "消防设施设备故障", "保洁服务");
+        List<String> colorList = Arrays.asList("#ff9d00", "#2f82fe", "#12db62", "#7565ef", "#079966", "#4e2ffe", "#00f6ec", "#ff7300", "#002aff");
         List<Map<String, Object>> tempList = new ArrayList<>();
         StringUtils.createdPieData(xList,colorList,valueList,tempList);
         return tempList;