统计接口

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/stat/IotReportFailureController.java

@@ -23,6 +23,8 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
 @Tag(name = "报表故障上报接口")
 @RestController
 @RequestMapping("/rq/report/failure")
@@ -61,7 +63,7 @@ public class IotReportFailureController {
     }
 
     @GetMapping("/page")
-    public CommonResult<List<IotFailureReportRespVO>> getFailureReportPage(@Valid IotFailureReportPageReqVO iotFailureReportPageReqVO) {
+    public CommonResult<PageResult<IotFailureReportRespVO>> getFailureReportPage(@Valid IotFailureReportPageReqVO iotFailureReportPageReqVO) {
         Set<Long> ids;
         String companyCode;
         if (Objects.isNull(iotFailureReportPageReqVO.getDeptId())){
@@ -80,6 +82,6 @@ public class IotReportFailureController {
             bean.setFailureNum(count);
             return bean;
         }).collect(Collectors.toList());
-        return CommonResult.success(collect);
+        return CommonResult.success(new PageResult<>(collect, iotFailureReportDOPageResult.getTotal()));
     }
 }

yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/static/IotInspectOrderDetailMapper.xml

@@ -142,17 +142,17 @@
 
 
     <select id="getExceptionDevicePage" resultType="cn.iocoder.yudao.module.pms.controller.admin.vo.IotDeviceSimple">
-        select b.device_code as deviceCode, b.device_name as deviceName, a.orderCount,a.dept_id as deptId, from (select device_id,count(distinct order_id) as orderCount from rq_iot_inspect_order_detail c
+        select b.device_code as deviceCode, b.device_name as deviceName, a.orderCount,a.dept_id as deptId from (select device_id,count(distinct order_id) as orderCount,dept_id from rq_iot_inspect_order_detail c
             <where>
                 c.if_normal = false and c.deleted=0
                 <if test="reqVO.createTime[0] != null">
-                    AND a.create_time &gt;= #{reqVO.createTime[0]}
+                    AND c.create_time &gt;= #{reqVO.createTime[0]}
                 </if>
                 <if test="reqVO.createTime.length > 1 and reqVO.createTime[1] != null">
-                    AND a.create_time &lt;= #{reqVO.createTime[1]}
+                    AND c.create_time &lt;= #{reqVO.createTime[1]}
                 </if>
                 <if test="reqVO.deptIds != null and reqVO.deptIds.size &gt; 0">
-                    AND a.dept_id IN
+                    AND c.dept_id IN
                     <foreach collection="reqVO.deptIds" index="index" item="key" open="(" separator="," close=")">
                         #{key}
                     </foreach>