运营概况统计

device-api-service/src/main/java/com/xy/mapper/mapper/DeviceSimMapper.xml

@@ -189,13 +189,31 @@
 				join device_sysinfo ds on(di.device_id = ds.device_id)
         join device_sim dsim on(ds.sim_iccid = dsim.id)
         where
-        di.merc_id = #{query.mercId} and dsim.timeout >= #{query.begin1} and dsim.timeout <= #{query.end1}) as beTimeoutCout,
+          dsim.timeout >= #{query.begin1} and dsim.timeout <= #{query.end1}
+        <if test="query.mercId != null">
+         and   di.merc_id = #{query.mercId}
+        </if>
+        ) as beTimeoutCout,
         (select count(*)
         from device_info di
 				join device_sysinfo ds on(di.device_id = ds.device_id)
         join device_sim dsim on(ds.sim_iccid = dsim.id)
         where
-        di.merc_id = #{query.mercId} and dsim.timeout &lt;= #{query.end2}) as timeoutCout
+        dsim.timeout &lt;= #{query.end2}
+        <if test="query.mercId != null">
+           and  di.merc_id = #{query.mercId}
+        </if>
+        ) as timeoutCout,
+        (select count(*)
+        from device_info di
+        join device_sysinfo ds on(di.device_id = ds.device_id)
+        join device_sim dsim on(ds.sim_iccid = dsim.id)
+        <where>
+            <if test="query.mercId != null">
+                and   di.merc_id = #{query.mercId}
+            </if>
+        </where>
+        ) as totalNum
         from dual
     </select>
 </mapper>

device-api/src/main/java/com/xy/dto/DeviceSimDto.java

@@ -157,7 +157,7 @@ public class DeviceSimDto {
     @Accessors(chain = true)
     public static class DeviceSimTimeoutCount {
 
-        @NotNull(message = "mercId不能为空")
+
         @ApiModelProperty(value = "商户id")
         private Long mercId;
 
@@ -180,6 +180,9 @@ public class DeviceSimDto {
 
         @ApiModelProperty(value = "欠费条数")
         private Integer timeoutCout;
+
+        @ApiModelProperty(value = "总数")
+        private Integer totalNum;
     }
 
     @Data