diff --git a/src/main/java/com/biutag/supervision/constants/AppConstants.java b/src/main/java/com/biutag/supervision/constants/AppConstants.java index 9c71c44..b146119 100644 --- a/src/main/java/com/biutag/supervision/constants/AppConstants.java +++ b/src/main/java/com/biutag/supervision/constants/AppConstants.java @@ -1,5 +1,8 @@ package com.biutag.supervision.constants; +import java.util.ArrayList; +import java.util.List; + public class AppConstants { public static final Integer TREE_ROOT_ID = 0; @@ -31,4 +34,8 @@ public class AppConstants { // 督审支队的单位id public static final String DSZD = "2785"; + + + public static final List CWLN = List.of("3651", "3799", "4170", "3994"); + } diff --git a/src/main/java/com/biutag/supervision/controller/warning/WarningController.java b/src/main/java/com/biutag/supervision/controller/warning/WarningController.java index b00da99..39cf53f 100644 --- a/src/main/java/com/biutag/supervision/controller/warning/WarningController.java +++ b/src/main/java/com/biutag/supervision/controller/warning/WarningController.java @@ -39,6 +39,8 @@ import java.util.List; import java.util.function.Function; import java.util.stream.Collectors; +import static com.biutag.supervision.constants.AppConstants.CWLN; + @RestController @RequiredArgsConstructor @RequestMapping("/warning") @@ -62,6 +64,9 @@ public class WarningController { .eq(StrUtil.isNotBlank(queryParam.getWarningState()),"p.warning_state",queryParam.getWarningState()) .eq("p.node",FlowStateEnum.End.getLabel()) .eq("p.delete_flag", DeleteStatusEnum.NO.getCode()); + if ("cwlnt".equals(queryParam.getSpecialArea())) { + wrapper.in("p.audit_unit_id", CWLN); + } if (StrUtil.isNotBlank(queryParam.getAuditUnitId())) { // 获取选择的审计单位及其所有子部门的ID wrapper.in("p.audit_unit_id", departService.getAllNodeIds(queryParam.getAuditUnitId())); diff --git a/src/main/java/com/biutag/supervision/pojo/param/Warning/WarningQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/Warning/WarningQueryParam.java index 43f093d..cbd5be7 100644 --- a/src/main/java/com/biutag/supervision/pojo/param/Warning/WarningQueryParam.java +++ b/src/main/java/com/biutag/supervision/pojo/param/Warning/WarningQueryParam.java @@ -3,6 +3,7 @@ package com.biutag.supervision.pojo.param.Warning; import com.baomidou.mybatisplus.annotation.TableField; import com.biutag.supervision.pojo.param.BasePage; import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -21,6 +22,9 @@ public class WarningQueryParam extends BasePage { private String auditUnitId; //预警监督状志 private String warningState; + + @Schema(description = "cwlnt: 长望浏宁") + private String specialArea; //发文日期 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") @JsonFormat(pattern = "yyyy-MM-dd HH:mm")