From 5a8f73a012f4c5362869792153065eda56b1c205 Mon Sep 17 00:00:00 2001 From: lroyia Date: Thu, 26 Feb 2026 16:52:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E5=B7=B2?= =?UTF-8?q?=E5=8A=9E=E7=9A=84=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TsbizrevlistController.java | 17 ++++++++++++++++- .../revoke/entity/dto/UnrevokedEntQueryDto.java | 6 ++++++ .../security/dto/PenaltyCaseInfoQueryDTO.java | 6 ++++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/revoke/controller/TsbizrevlistController.java b/src/main/java/com/chinaweal/aiccs/aiccs/revoke/controller/TsbizrevlistController.java index 5da997b..7d42a07 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/revoke/controller/TsbizrevlistController.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/revoke/controller/TsbizrevlistController.java @@ -42,6 +42,7 @@ import com.chinaweal.aiccs.aiccs.system.entity.TRBaseCode; import com.chinaweal.aiccs.aiccs.system.service.TRBaseCodeService; import com.chinaweal.aiccs.common.base.controller.BaseController; import com.chinaweal.aiccs.common.constant.BaseDataConstant; +import com.chinaweal.aiccs.common.constant.CommonConstants; import com.chinaweal.aiccs.common.constant.Constant; import com.chinaweal.aiccs.common.constant.IndustryConstant; import com.chinaweal.aiccs.common.util.ConstantsUtil; @@ -1777,8 +1778,13 @@ public class TsbizrevlistController extends BaseController { // 只查询开业状态的市场主体 wrapper.eq(EBaseinfo::getRegstate, "1"); + if (StringUtils.equals(queryDto.getIsDeal(), CommonConstants.TRUE_1)) { + wrapper.exists("SELECT 1 FROM revokelist r WHERE r.PRIPID = e_baseinfo.PRIPID"); + } else if (StringUtils.equals(queryDto.getIsDeal(), CommonConstants.FALSE_0)) { + wrapper.notExists("SELECT 1 FROM revokelist r WHERE r.PRIPID = e_baseinfo.PRIPID"); + } + // 排除已吊销的市场主体（通过子查询排除） - wrapper.notExists("SELECT 1 FROM revokelist r WHERE r.PRIPID = e_baseinfo.PRIPID AND r.STATE = '1'"); wrapper.exists(String.format("SELECT 1 FROM PENALTY_ENT_INFO p WHERE p.PRIPID = e_baseinfo.PRIPID" + " AND p.FLG_DELETED != '1' and p.CASEID = '%s'", queryDto.getCaseid())); @@ -1856,6 +1862,15 @@ public class TsbizrevlistController extends BaseController { wrapper.like(PenaltyCaseInfo::getPenaltyorg, queryDTO.getPenaltyorg()); } + // 是否已办 + if (StringUtils.equals(queryDTO.getIsDeal(), CommonConstants.TRUE_1)) { + wrapper.exists("select 1 from PENALTY_ENT_INFO pei where pei.CASEID = PENALTY_CASE_INFO.CASEID and pei.FLG_DELETED != '1' " + + " and exists(select 1 from REVOKELIST e where e.PRIPID = pei.PRIPID)"); + } else if (StringUtils.equals(queryDTO.getIsDeal(), CommonConstants.FALSE_0)) { + wrapper.notExists("select 1 from PENALTY_ENT_INFO pei where pei.CASEID = PENALTY_CASE_INFO.CASEID and pei.FLG_DELETED != '1' " + + " and exists(select 1 from REVOKELIST e where e.PRIPID = pei.PRIPID)"); + } + // 处罚决定日期范围 if (queryDTO.getPenaltydateStart() != null) { wrapper.ge(PenaltyCaseInfo::getPenaltydate, queryDTO.getPenaltydateStart()); diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/revoke/entity/dto/UnrevokedEntQueryDto.java b/src/main/java/com/chinaweal/aiccs/aiccs/revoke/entity/dto/UnrevokedEntQueryDto.java index a29176b..193311c 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/revoke/entity/dto/UnrevokedEntQueryDto.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/revoke/entity/dto/UnrevokedEntQueryDto.java @@ -55,4 +55,10 @@ public class UnrevokedEntQueryDto implements Serializable { */ @ApiModelProperty(value = "案件id", required = true) private String caseid; + + /** + * 是否已办（0否1是） + */ + @ApiModelProperty("是否已办（0否1是）") + private String isDeal; } diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/security/dto/PenaltyCaseInfoQueryDTO.java b/src/main/java/com/chinaweal/aiccs/aiccs/security/dto/PenaltyCaseInfoQueryDTO.java index 2b5eff4..cad07a4 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/security/dto/PenaltyCaseInfoQueryDTO.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/security/dto/PenaltyCaseInfoQueryDTO.java @@ -69,4 +69,10 @@ public class PenaltyCaseInfoQueryDTO implements Serializable { @JsonFormat(pattern = DateUtils.DATE_DEFAULT_FORMAT, timezone = "GMT+8") @ApiModelProperty("处罚决定日期-结束") private LocalDate penaltydateEnd; + + /** + * 是否已办（0否1是） + */ + @ApiModelProperty("是否已办（0否1是）") + private String isDeal; } \ No newline at end of file