统计接口

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

@@ -49,6 +49,7 @@ public class IotReportFailureController {
             Long loginUserDeptId = SecurityFrameworkUtils.getLoginUserDeptId();
             companyCode = deptUtil.getCompanyCode(loginUserDeptId);
             ids = deptUtil.getDeptIds(companyCode);
+            ids.add(loginUserDeptId);
         } else {
             ids = deptService.getChildDeptIdListFromCache(iotFailureReportPageReqVO.getDeptId());
             ids.add(iotFailureReportPageReqVO.getDeptId());
@@ -59,7 +60,9 @@ public class IotReportFailureController {
         Long trans = iotFailureReportMapper.selectCountByTimeAndStatus(iotFailureReportPageReqVO, ids);
         iotFailureReportPageReqVO.setStatus("finished");
         Long finished = iotFailureReportMapper.selectCountByTimeAndStatus(iotFailureReportPageReqVO, ids);
-        return CommonResult.success(ImmutableMap.of("reporting", reporting, "trans", trans, "finished", finished));
+        iotFailureReportPageReqVO.setStatus("close");
+        Long close = iotFailureReportMapper.selectCountByTimeAndStatus(iotFailureReportPageReqVO, ids);
+        return CommonResult.success(ImmutableMap.of("reporting", reporting, "trans", trans, "finished", finished,"close", close));
     }
 
     @GetMapping("/page")

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

@@ -71,6 +71,16 @@ public class IotReportOrderController {
     @Operation(summary = "各工单状态数量统计")
     @GetMapping("/number")
     public CommonResult<ImmutableMap> getOrderStat(@Valid IotMaintainPageReqVO pageReqVO) {
+        Set<Long> ids;
+        if (Objects.isNull(pageReqVO.getDeptId())){
+            Long loginUserDeptId = SecurityFrameworkUtils.getLoginUserDeptId();
+            String companyCode = deptUtil.getCompanyCode(loginUserDeptId);
+            ids = deptUtil.getDeptIds(companyCode);
+        } else {
+            ids = deptService.getChildDeptIdListFromCache(pageReqVO.getDeptId());
+            ids.add(pageReqVO.getDeptId());
+        }
+        pageReqVO.setDeptIds(ids);
         List<AllOrderResp> maintains = iotMaintainMapper.selectStatusNumber(pageReqVO);
         List<AllOrderResp> inspects = iotInspectOrderMapper.selectStatusNumber(pageReqVO);
         List<AllOrderResp> operations = iotOpeationFillMapper.selectStatusNumber(pageReqVO);