diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java index ba4bdd0..af23bf1 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java @@ -26,6 +26,8 @@ import com.chinaweal.aiccs.aiccs.force.service.IXrForceDeregisterService; import com.chinaweal.aiccs.aiccs.force.service.IXrForceDeregisterSpeService; import com.chinaweal.aiccs.aiccs.force.service.IXrForceNoticeService; import com.chinaweal.aiccs.aiccs.inspect.service.TSWorkNoService; +import com.chinaweal.aiccs.aiccs.revoke.entity.BatchRevokePushRecord; +import com.chinaweal.aiccs.aiccs.revoke.service.BatchRevokePushRecordService; import com.chinaweal.aiccs.aiccs.revoke.service.CreateFileService; import com.chinaweal.aiccs.aiccs.seriousillegalPerson.common.emnu.AuthEnum; import com.chinaweal.aiccs.aiccs.system.entity.TRBaseCode; @@ -87,6 +89,8 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl> EXPIRY_MAP = new ExpiryMap<>(15 * 60); @@ -608,6 +612,28 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl directRevoke(@RequestBody @Validated DirectRevokeDto dto, HttpServletRequest request) { AICUser user = getLoginUser(request); @@ -1771,6 +1768,7 @@ public class TsbizrevlistController extends BaseController { if (queryDto == null) { queryDto = new UnrevokedEntQueryDto(); } + AssertUtils.isNotBlank(queryDto.getCaseid()); // 构建分页对象 Page page = new Page<>(query.getCurrent(), query.getSize()); @@ -1781,7 +1779,8 @@ public class TsbizrevlistController extends BaseController { // 排除已吊销的市场主体(通过子查询排除) wrapper.notExists("SELECT 1 FROM revokelist r WHERE r.PRIPID = e_baseinfo.PRIPID AND r.STATE = '1'"); - wrapper.exists("SELECT 1 FROM PENALTY_ENT_INFO p WHERE p.PRIPID = e_baseinfo.PRIPID AND p.FLG_DELETED != '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())); // 条件查询 if (StringUtils.isNotBlank(queryDto.getEntname())) { @@ -1815,5 +1814,64 @@ public class TsbizrevlistController extends BaseController { return RestResult.error(ResultCode.BUSINESS_LOGIC_ERROR, "查询失败:" + e.getMessage()); } } + + /** + * 案件信息分页查询 + * + * @param baseQuery 分页和筛选参数 + * @return + */ + @ApiOperation("案件信息分页查询") + @PostMapping("/getPenaltyCaseInfoPage") + public RestResult> getPenaltyCaseInfoPage(@RequestBody BaseQuery baseQuery) { + try { + AssertUtils.isNotNull(baseQuery); + + PenaltyCaseInfoQueryDTO queryDTO = baseQuery.getEntity(PenaltyCaseInfoQueryDTO.class); + + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + + if (queryDTO != null) { + // 案件名称 + if (StringUtils.isNotBlank(queryDTO.getCasename())) { + wrapper.like(PenaltyCaseInfo::getCasename, queryDTO.getCasename()); + } + + // 案由 + if (StringUtils.isNotBlank(queryDTO.getCaseintroduction())) { + wrapper.like(PenaltyCaseInfo::getCaseintroduction, queryDTO.getCaseintroduction()); + } + + // 违法行为 + if (StringUtils.isNotBlank(queryDTO.getIllegality())) { + wrapper.like(PenaltyCaseInfo::getIllegality, queryDTO.getIllegality()); + } + + // 处罚决定机关 + if (StringUtils.isNotBlank(queryDTO.getPenaltyorg())) { + wrapper.like(PenaltyCaseInfo::getPenaltyorg, queryDTO.getPenaltyorg()); + } + + // 处罚决定日期范围 + if (queryDTO.getPenaltydateStart() != null) { + wrapper.ge(PenaltyCaseInfo::getPenaltydate, queryDTO.getPenaltydateStart()); + } + if (queryDTO.getPenaltydateEnd() != null) { + wrapper.le(PenaltyCaseInfo::getPenaltydate, queryDTO.getPenaltydateEnd()); + } + } + + // 默认查询未删除的记录 + wrapper.eq(PenaltyCaseInfo::getFlgDeleted, "0"); + + // 按创建时间倒序 + wrapper.orderByDesc(PenaltyCaseInfo::getCreateTime); + + return RestResult.ok(penaltyCaseInfoService.page(new Page<>(baseQuery.getCurrent(), baseQuery.getSize()), wrapper)); + } catch (Exception e) { + log.error("查询案件信息列表失败", e); + return RestResult.error(ResultCode.BUSINESS_LOGIC_ERROR, "查询失败:" + e.getMessage()); + } + } } diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/revoke/entity/BatchRevokePushRecord.java b/src/main/java/com/chinaweal/aiccs/aiccs/revoke/entity/BatchRevokePushRecord.java index 17017ca..a475074 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/revoke/entity/BatchRevokePushRecord.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/revoke/entity/BatchRevokePushRecord.java @@ -13,11 +13,11 @@ import lombok.experimental.Accessors; /** *

- * 批量吊销推送记录表 + * 批量吊销/注销推送记录表 * 存储需要推送的批量吊销成功市场主体记录 *

* - * @author Lee + * @author lroyia * @since 2026-02-24 */ @Data @@ -148,6 +148,12 @@ public class BatchRevokePushRecord extends Model { @TableField("REMARK") private String remark; + /** + * 业务类型(0:批量吊销,1:强制注销) + */ + @TableField("BIZTYPE") + private String biztype; + @Override protected Serializable pkVal() { return this.id; 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 9370d85..a29176b 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 @@ -49,4 +49,10 @@ public class UnrevokedEntQueryDto implements Serializable { */ @ApiModelProperty(value = "登记机关") private String regorg; + + /** + * 案件id + */ + @ApiModelProperty(value = "案件id", required = true) + private String caseid; } diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/revoke/service/impl/TsbizrevlistServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/revoke/service/impl/TsbizrevlistServiceImpl.java index d81b5c4..1a498a8 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/revoke/service/impl/TsbizrevlistServiceImpl.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/revoke/service/impl/TsbizrevlistServiceImpl.java @@ -450,6 +450,7 @@ public class TsbizrevlistServiceImpl extends BaseServiceImpl