suntianwu 3 лет назад
Родитель
Сommit
a5191faf29

+ 2 - 2
src/main/java/com/care/bigscreen/entity/StStation.java

@@ -84,8 +84,8 @@ public class StStation implements Serializable {
     private Long threeLevelAmount;
 
     @ApiModelProperty(value = "安全管家总人数")
-    @TableField("safe_mgr_amount")
-    private Long safeMgrAmount;
+    @TableField("chamberlain_amount")
+    private Long chamberlainAmount;
 
     @ApiModelProperty(value = "累计服务总人次")
     @TableField("serve_amount")

+ 1 - 1
src/main/java/com/care/bigscreen/vo/BigScreenStatisticsVO.java

@@ -61,7 +61,7 @@ public class BigScreenStatisticsVO {
     private Long threeLevelAmount;
 
     @ApiModelProperty(value = "安全管家总人数")
-    private Long safeMgrAmount;
+    private Long chamberlainAmount;
 
     @ApiModelProperty(value = "平均每人服务用户数")
     private BigDecimal serveAmountAvg;

+ 2 - 2
src/main/resources/mybatis/bigscreen/StStationMapper.xml

@@ -19,8 +19,8 @@
         sum(one_level_amount) oneLevelAmount,
         sum(two_level_amount) twoLevelAmount,
         sum(three_level_amount) threeLevelAmount,
-        sum(safe_mgr_amount) safeMgrAmount,
-        convert(sum(older_amount)/sum(safe_mgr_amount),decimal(20,2)) serveAmountAvg,
+        sum(chamberlain_amount) chamberlainAmount,
+        convert(sum(older_amount)/sum(chamberlain_amount),decimal(20,2)) serveAmountAvg,
         sum(serve_amount) serveAmount,
         sum(device_amount) deviceAmount,
         convert(sum(indoor_online_amount)/(sum(indoor_online_amount) + sum(indoor_offline_amount)),decimal(20,2)) indoorOnlineRate,