feat: report by area

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmReportController.java

@@ -9,11 +9,14 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qunzhixinxi.hnqz.admin.api.constant.CacheConstants;
+import com.qunzhixinxi.hnqz.admin.api.constant.UpmsType;
 import com.qunzhixinxi.hnqz.admin.api.dto.WmReportDto;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysAreaEntity;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackage;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTask;
 import com.qunzhixinxi.hnqz.admin.api.dto.ReportTaskListPageDTO;
 import com.qunzhixinxi.hnqz.admin.api.vo.WmTaskVO;
+import com.qunzhixinxi.hnqz.admin.service.SysAreaEntityService;
 import com.qunzhixinxi.hnqz.admin.service.SysEnterpriseAreaService;
 import com.qunzhixinxi.hnqz.admin.service.SysUserAreaService;
 import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
@@ -61,6 +64,7 @@ public class WmReportController {
     private final WmTaskService wmTaskService;
     private final WmTaskTypeService wmTaskTypeService;
     private final SysUserAreaService userAreaService;
+    private final SysAreaEntityService areaEntityService;
     private final SysEnterpriseAreaService enterpriseAreaService;
     private final RedisTemplate redisTemplate;
 
@@ -201,7 +205,13 @@ public class WmReportController {
         if (CollUtil.isEmpty(areaIds)) {
             deptIds = Collections.emptyList();
         } else {
-            deptIds = enterpriseAreaService.listAreaEnts(areaIds).stream().mapToInt(Long::intValue).boxed().sorted().collect(Collectors.toList());
+
+            List<Long> collect = areaEntityService.list(Wrappers.<SysAreaEntity>lambdaQuery()
+                    .in(SysAreaEntity::getAreaId, areaIds)
+                    .eq(SysAreaEntity::getAreaType, UpmsType.AreaType.DISTRICT)
+                    .orderByAsc(SysAreaEntity::getAreaId)).stream().mapToLong(SysAreaEntity::getAreaId).boxed().collect(Collectors.toList());
+
+            deptIds = enterpriseAreaService.listAreaEnts(collect).stream().mapToInt(Long::intValue).boxed().sorted().collect(Collectors.toList());
         }