首页大屏地图数据

src/main/java/com/biutag/supervision/pojo/param/DataPetitionComplaintQueryParam.java

@@ -1,5 +1,6 @@
 package com.biutag.supervision.pojo.param;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -7,6 +8,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
 
 @Setter
 @Getter
@@ -36,6 +38,14 @@ public class DataPetitionComplaintQueryParam extends BasePage {
     // 被投诉机构
     private String departId;
 
+    @Schema(description = "被投诉二级机构单位集合")
+    private Set<String> secondDepartIds;
+
+    @Schema(description = "被投诉三级机构单位集合")
+    private Set<String> thirdDepartIds;
+
+
+
     // 初重信访
     private String initialPetition;
 

src/main/java/com/biutag/supervision/repository/dataPetitionComplaint/DataPetitionComplaintResourceService.java

@@ -1,5 +1,6 @@
 package com.biutag.supervision.repository.dataPetitionComplaint;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -29,8 +30,8 @@ public class DataPetitionComplaintResourceService {
         LambdaQueryWrapper<DataPetitionComplaint> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(StrUtil.isNotBlank(param.getOriginId()), DataPetitionComplaint::getOriginId, param.getOriginId());
         wrapper.between(ObjectUtil.isNotNull(param.getCreateTime()), DataPetitionComplaint::getCreateTime, param.getCreateTime().get(0), param.getCreateTime().get(1));
-
-
+        wrapper.in(CollectionUtil.isNotEmpty(param.getSecondDepartIds()), DataPetitionComplaint::getSecondDepartId, param.getSecondDepartIds());
+        wrapper.in(CollectionUtil.isNotEmpty(param.getThirdDepartIds()), DataPetitionComplaint::getThirdDepartId, param.getThirdDepartIds());
         if (wrapper.getExpression() == null || wrapper.getExpression().getSqlSegment().isEmpty()) {
             return Collections.emptyList();
         }

src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java

@@ -150,6 +150,7 @@ public class DatavServiceImpl implements DatavService {
 
             DataPetitionComplaintQueryParam dataPetitionComplaintQueryParam = new DataPetitionComplaintQueryParam();
             dataPetitionComplaintQueryParam.setCreateTime(dates);
+            dataPetitionComplaintQueryParam.setSecondDepartIds(Collections.singleton(departDto.getParentId()));
             List<DataPetitionComplaint> dataPetitionComplaints =  dataPetitionComplaintResourceService.query(dataPetitionComplaintQueryParam);
             // 国家信访
             long countryMail = dataPetitionComplaints.stream().filter(one -> "22".equals(one.getProblemSourcesCode())).count();