From c1fef33d83304b2bd06e2170d0bec52523c6abd4 Mon Sep 17 00:00:00 2001 From: lroyia Date: Tue, 24 Feb 2026 15:13:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=BC=BA=E5=88=B6=E6=B3=A8=E9=94=80?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E8=AE=B0=E5=BD=95=E5=88=9B=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/XrForceDeregisterSpeServiceImpl.java | 26 +++++++++++++++++++ .../revoke/entity/BatchRevokePushRecord.java | 10 +++++-- .../service/impl/TsbizrevlistServiceImpl.java | 1 + 3 files changed, 35 insertions(+), 2 deletions(-) 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 5ecb60f..9c431ed 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 - * 批量吊销推送记录表 + * 批量吊销/注销推送记录表 * 存储需要推送的批量吊销成功市场主体记录 *

* - * @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/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 Date: Wed, 25 Feb 2026 09:16:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aiccs/revoke/controller/TsbizrevlistController.java | 7 ------- 1 file changed, 7 deletions(-) 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 8737a50..ea6e44a 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 @@ -1721,13 +1721,6 @@ public class TsbizrevlistController extends BaseController { * @return 吊销结果（成功数量、失败数量、失败列表） */ @ApiOperation(value = "批量直接吊销市场主体（执法系统）", notes = "直接吊销市场主体，无需审核审批流程（执法系统）") - @ApiImplicitParams({ - @ApiImplicitParam(name = "pripids", value = "主体身份代码列表", required = true), - @ApiImplicitParam(name = "revokeReasonCode", value = "吊销原因代码(1-一年未年报实地查无，2-连续两年未年报，3-因实地查无列入经营异常名录两年以上)"), - @ApiImplicitParam(name = "revokeReasonDesc", value = "吊销原因描述"), - @ApiImplicitParam(name = "bizEntType", value = "企业类型(1-公司，2-个人独资企业)"), - @ApiImplicitParam(name = "remark", value = "备注") - }) @PostMapping("directRevoke") public RestResult directRevoke(@RequestBody @Validated DirectRevokeDto dto, HttpServletRequest request) { AICUser user = getLoginUser(request); From cb5cebaa4732dc8594fd3cac8517675bc4f47191 Mon Sep 17 00:00:00 2001 From: lroyia Date: Wed, 25 Feb 2026 10:23:52 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TsbizrevlistController.java | 67 ++++++++++++++++++- .../entity/dto/UnrevokedEntQueryDto.java | 6 ++ .../security/dto/PenaltyCaseInfoQueryDTO.java | 60 +++++++++++++++++ 3 files changed, 132 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/chinaweal/aiccs/aiccs/security/dto/PenaltyCaseInfoQueryDTO.java 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 ea6e44a..bac51fa 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 @@ -36,6 +36,8 @@ import com.chinaweal.aiccs.aiccs.revoke.Vo.TsbizrevlistExcelVo; import com.chinaweal.aiccs.aiccs.revoke.entity.*; import com.chinaweal.aiccs.aiccs.revoke.entity.dto.*; import com.chinaweal.aiccs.aiccs.revoke.service.*; +import com.chinaweal.aiccs.aiccs.security.dto.PenaltyCaseInfoQueryDTO; +import com.chinaweal.aiccs.aiccs.security.entity.PenaltyCaseInfo; import com.chinaweal.aiccs.aiccs.system.entity.TRBaseCode; import com.chinaweal.aiccs.aiccs.system.service.TRBaseCodeService; import com.chinaweal.aiccs.common.base.controller.BaseController; @@ -163,6 +165,8 @@ public class TsbizrevlistController extends BaseController { private OrgUM orgUM; @Autowired private RedisService redisService; + @Autowired + private com.chinaweal.aiccs.aiccs.security.service.IPenaltyCaseInfoService penaltyCaseInfoService; private static final String REDIS_KEY_ENABLE_PREFIX = "revoke:batch:enable:"; private static final String REDIS_KEY_DISABLE_PREFIX = "revoke:batch:disable:"; @@ -1764,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()); @@ -1774,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())) { @@ -1808,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/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/security/dto/PenaltyCaseInfoQueryDTO.java b/src/main/java/com/chinaweal/aiccs/aiccs/security/dto/PenaltyCaseInfoQueryDTO.java new file mode 100644 index 0000000..adb1f5b --- /dev/null +++ b/src/main/java/com/chinaweal/aiccs/aiccs/security/dto/PenaltyCaseInfoQueryDTO.java @@ -0,0 +1,60 @@ +package com.chinaweal.aiccs.aiccs.security.dto; + +import com.chinaweal.aiccs.common.util.DateUtils; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDate; + +/** + * 案件信息查询DTO + * @author lroyia + * @since 2026/2/25 + **/ +@Data +@ApiModel("案件信息查询DTO") +public class PenaltyCaseInfoQueryDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 案件名称 + */ + @ApiModelProperty("案件名称") + private String casename; + + /** + * 案由 + */ + @ApiModelProperty("案由") + private String caseintroduction; + + /** + * 违法行为 + */ + @ApiModelProperty("违法行为") + private String illegality; + + /** + * 处罚决定机关 + */ + @ApiModelProperty("处罚决定机关") + private String penaltyorg; + + /** + * 处罚决定日期-开始 + */ + @JsonFormat(pattern = DateUtils.DATE_DEFAULT_FORMAT, timezone = "GMT+8") + @ApiModelProperty("处罚决定日期-开始") + private LocalDate penaltydateStart; + + /** + * 处罚决定日期-结束 + */ + @JsonFormat(pattern = DateUtils.DATE_DEFAULT_FORMAT, timezone = "GMT+8") + @ApiModelProperty("处罚决定日期-结束") + private LocalDate penaltydateEnd; +} \ No newline at end of file