近一个月报修分类占比查询接口二次修改

工具箱二具数量查询接口及相关数据录入已更改---共享驿站
实体类更改---工具列对象 plat_property_tools

project-zcustom/src/main/java/com/project/zcustom/domain/property/PlatPropertyTools.java

@@ -40,59 +40,17 @@ public class PlatPropertyTools extends CustomBaseEntity {
     private String appOrg;
 
     /**
-     * 工具名称
+     * 健康自测
      */
-    @Excel(name = "工具名称")
-    @ApiModelProperty("工具名称")
-    private String toolsNameFirst;
+    @Excel(name = "健康自测")
+    @ApiModelProperty("健康自测")
+    private Long selfTest;
 
     /**
-     * 工具数量
+     * 远程问诊
      */
-    @Excel(name = "工具数量")
-    @ApiModelProperty("工具数量")
-    private Long toolsNumFirst;
-
-    /**
-     * 工具名称
-     */
-    @Excel(name = "工具名称")
-    @ApiModelProperty("工具名称")
-    private String toolsNameTwo;
-
-    /**
-     * 工具数量
-     */
-    @Excel(name = "工具数量")
-    @ApiModelProperty("工具数量")
-    private Long toolsNumTwo;
-
-    /**
-     * 工具名称
-     */
-    @Excel(name = "工具名称")
-    @ApiModelProperty("工具名称")
-    private String toolsNameThird;
-
-    /**
-     * 工具数量
-     */
-    @Excel(name = "工具数量")
-    @ApiModelProperty("工具数量")
-    private Long toolsNumThird;
-
-    /**
-     * 工具名称
-     */
-    @Excel(name = "工具名称")
-    @ApiModelProperty("工具名称")
-    private String toolsNameFour;
-
-    /**
-     * 工具数量
-     */
-    @Excel(name = "工具数量")
-    @ApiModelProperty("工具数量")
-    private Long toolsNumFour;
+    @Excel(name = "远程问诊")
+    @ApiModelProperty("远程问诊")
+    private Long consultation;
 
 }

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

@@ -321,9 +321,9 @@ public class PlatPostStationServiceImpl extends ServiceImpl<PlatPostStationMappe
      */
     @Override
     public List<Map<String, Object>> getPastMonthPieData(String appOrg){
-        String fieldString = "furniture,hotColdWater,accessControl,other,wall,electrical,elevator,fireControl,cleaning";
+        String fieldString = "furniture,hot_cold_water,access_control,other,wall,electrical,elevator,fire_control,cleaning";
         if(Objects.equals(appOrg,"0000")){
-            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";
+            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";
         }
         PlatPostStation platPostStation = this.getPlatPostStationByField("app_org", appOrg,fieldString);
         List<Long> valueList = StringUtils.getDefaultListLong(9);

project-zcustom/src/main/java/com/project/zcustom/service/property/impl/PlatPropertyServiceImpl.java

@@ -284,25 +284,9 @@ public class PlatPropertyServiceImpl extends ServiceImpl<PlatPropertyMapper, Pla
      * @param platPropertyTools
      */
     private void setPlatPropertyTools(Map<String, Object> mapField,PlatPropertyTools platPropertyTools){
-//        List<String> keyList = Arrays.asList("firstTool","firstToolNum","twotTool","twoToolNum","thirdTool","thirdToolNum","fourTool","fourToolNum");
-//
-//        StringUtils.setFieldValue(platPropertyTools,mapField,keyList,0, PlatPropertyTools::setToolsNameFirst,String.class);
-//        StringUtils.setFieldValue(platPropertyTools,mapField,keyList,1, PlatPropertyTools::setToolsNumFirst,Long.class);
-//        StringUtils.setFieldValue(platPropertyTools,mapField,keyList,2, PlatPropertyTools::setToolsNameTwo,String.class);
-//        StringUtils.setFieldValue(platPropertyTools,mapField,keyList,3, PlatPropertyTools::setToolsNumTwo,Long.class);
-//        StringUtils.setFieldValue(platPropertyTools,mapField,keyList,4, PlatPropertyTools::setToolsNameThird,String.class);
-//        StringUtils.setFieldValue(platPropertyTools,mapField,keyList,5, PlatPropertyTools::setToolsNumThird,Long.class);
-//        StringUtils.setFieldValue(platPropertyTools,mapField,keyList,6, PlatPropertyTools::setToolsNameFour,String.class);
-//        StringUtils.setFieldValue(platPropertyTools,mapField,keyList,7, PlatPropertyTools::setToolsNumFour,Long.class);
         List<String> keyList = Arrays.asList("selfTest","consultation");
-        platPropertyTools.setToolsNameFirst("健康自测");
-        StringUtils.setFieldValue(platPropertyTools,mapField,keyList,0, PlatPropertyTools::setToolsNumFirst,Long.class);
-        platPropertyTools.setToolsNameTwo("远程问诊");
-        StringUtils.setFieldValue(platPropertyTools,mapField,keyList,1, PlatPropertyTools::setToolsNumTwo,Long.class);
-        platPropertyTools.setToolsNameThird("");
-        platPropertyTools.setToolsNumThird(0L);
-        platPropertyTools.setToolsNameFour("");
-        platPropertyTools.setToolsNumFour(0L);
+        StringUtils.setFieldValue(platPropertyTools,mapField,keyList,0, PlatPropertyTools::setSelfTest,Long.class);
+        StringUtils.setFieldValue(platPropertyTools,mapField,keyList,1, PlatPropertyTools::setConsultation,Long.class);
     }
 
 

project-zcustom/src/main/java/com/project/zcustom/service/property/impl/PlatPropertyToolsServiceImpl.java

@@ -184,17 +184,16 @@ public class PlatPropertyToolsServiceImpl extends ServiceImpl<PlatPropertyToolsM
      */
     @Override
     public List<Map<String, Object>> getToolsChartsList(String appOrg){
-        String fieldString = "tools_name_first,tools_num_first,tools_name_two,tools_num_two";
+        String fieldString = "self_test,consultation";
         if(Objects.equals(appOrg,"0000")){
-            fieldString = "tools_name_first,sum(tools_num_first) as tools_num_first,tools_name_two,sum(tools_num_two) as tools_num_two";
+            fieldString = "sum(self_test) as self_test,sum(consultation) as consultation";
         }
         PlatPropertyTools toolsInfo = this.getPlatPropertyToolsByField("app_org", appOrg,fieldString);
         List<String> nameList = Arrays.asList("健康自测","远程问诊");
-//        List<String> colorList = Arrays.asList("#00ffff","#2f82fe","#7565ef","#fec72f");
         List<String> colorList = Arrays.asList("#00ffff","#2f82fe");
         List<Long> valueList = StringUtils.getDefaultListLong(2);
         if (StringUtils.isNotNull(toolsInfo)) {
-            valueList = Arrays.asList(toolsInfo.getToolsNumFirst(), toolsInfo.getToolsNumTwo());
+            valueList = Arrays.asList(toolsInfo.getSelfTest(), toolsInfo.getConsultation());
         }
         List<Map<String, Object>> tempList = new ArrayList<>();
         StringUtils.createdPieData(nameList, colorList, valueList, tempList);