From 761af9d5f2c97914ec8a1845e97778c183abcb9e Mon Sep 17 00:00:00 2001 From: cc_caijp <1049976610@qq.com> Date: Tue, 13 Jan 2026 10:46:53 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=B8=82=E5=9C=BA=E4=B8=BB=E4=BD=93=E6=92=A4?= =?UTF-8?q?=E9=94=80=E9=99=A4=E5=90=8D=E5=85=AC=E5=91=8A=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EntBaseExpelledInfoController.java | 8 ++++++++ .../service/IExpelledApplyInfoService.java | 7 +++++++ .../impl/ExpelledApplyInfoServiceImpl.java | 15 +++++++++++++++ 3 files changed, 30 insertions(+) diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/expelled/controller/EntBaseExpelledInfoController.java b/src/main/java/com/chinaweal/aiccs/aiccs/expelled/controller/EntBaseExpelledInfoController.java index c03f702..316f766 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/expelled/controller/EntBaseExpelledInfoController.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/expelled/controller/EntBaseExpelledInfoController.java @@ -2,6 +2,7 @@ package com.chinaweal.aiccs.aiccs.expelled.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaweal.aiccs.aiccs.expelled.entity.EntBaseExpelledInfo; +import com.chinaweal.aiccs.aiccs.expelled.entity.ExpelledApplyInfo; import com.chinaweal.aiccs.aiccs.expelled.entity.ExpelledBizInfo; import com.chinaweal.aiccs.aiccs.expelled.service.IEntBaseExpelledInfoService; import com.chinaweal.aiccs.aiccs.expelled.service.IExpelledAuditInfoService; @@ -204,4 +205,11 @@ public class EntBaseExpelledInfoController extends BaseController { public RestResult nextRevokeBiz(@RequestBody RemoveApproveInfo removeApproveInfo, HttpServletRequest request) { return expelledApplyInfoService.nextRevokeBiz(removeApproveInfo, request); } + + @ApiOperation(value = "22.分页查询撤销除名公告管理", position = 22) + @PostMapping("/revoke/listAnnouncement") + public RestResult> listRevokeAnnouncement(@RequestBody BaseQuery query) { + IPage data = expelledApplyInfoService.listRevokeAnnouncement(query); + return RestResult.ok(data); + } } diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/expelled/service/IExpelledApplyInfoService.java b/src/main/java/com/chinaweal/aiccs/aiccs/expelled/service/IExpelledApplyInfoService.java index bbb865c..145164c 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/expelled/service/IExpelledApplyInfoService.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/expelled/service/IExpelledApplyInfoService.java @@ -1,5 +1,6 @@ package com.chinaweal.aiccs.aiccs.expelled.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.chinaweal.aiccs.aiccs.auditing.entity.TSOpinion; import com.chinaweal.aiccs.aiccs.business.entity.TSTaskList; @@ -7,6 +8,7 @@ import com.chinaweal.aiccs.aiccs.expelled.entity.ExpelledApplyInfo; import com.chinaweal.aiccs.aiccs.expelled.vo.AuditInfoVo; import com.chinaweal.aiccs.aiccs.expelled.vo.RemoveApproveInfo; import com.chinaweal.aicorg.model.AICUser; +import com.chinaweal.youfool.framework.springboot.base.query.BaseQuery; import com.chinaweal.youfool.framework.springboot.rest.RestResult; import javax.servlet.http.HttpServletRequest; @@ -72,4 +74,9 @@ public interface IExpelledApplyInfoService extends IService { TSTaskList startApplyBizAccept(AICUser user, TSTaskList tsTaskList, ExpelledApplyInfo applyInfo); TSTaskList saveApplyAuditProcess(AICUser user, TSTaskList tsTaskList, ExpelledApplyInfo applyInfo, TSOpinion opinion, String nextNodeId, String[] nextPerformerIds, String[] nextPerformerNames); + + /** + * 分页查询撤销除名公告管理 + */ + IPage listRevokeAnnouncement(BaseQuery query); } diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/expelled/service/impl/ExpelledApplyInfoServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/expelled/service/impl/ExpelledApplyInfoServiceImpl.java index 386f033..f3674de 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/expelled/service/impl/ExpelledApplyInfoServiceImpl.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/expelled/service/impl/ExpelledApplyInfoServiceImpl.java @@ -1,6 +1,9 @@ package com.chinaweal.aiccs.aiccs.expelled.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.chinaweal.aiccs.aiccs.auditing.entity.TSOpinion; import com.chinaweal.aiccs.aiccs.auditing.service.TSOpinionService; @@ -24,6 +27,7 @@ import com.chinaweal.aiccs.common.util.HandleWorkFlowUtil; import com.chinaweal.aiccs.common.util.WorkFlowUtil; import com.chinaweal.aiccs.utils.BeanUtil; import com.chinaweal.aicorg.model.AICUser; +import com.chinaweal.youfool.framework.springboot.base.query.BaseQuery; import com.chinaweal.youfool.framework.springboot.exception.custom.BusinessException; import com.chinaweal.youfool.framework.springboot.rest.RestResult; import com.chinaweal.youfool.framework.springboot.rest.ResultCode; @@ -679,4 +683,15 @@ public class ExpelledApplyInfoServiceImpl extends ServiceImpl listRevokeAnnouncement(BaseQuery query) { + ExpelledApplyInfo entity = query.getEntity(ExpelledApplyInfo.class); + Page page = query.getPage(); + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() + .like(StringUtils.isNotBlank(entity.getEntName()), ExpelledApplyInfo::getEntName, entity.getEntName()) + .eq(StringUtils.isNotBlank(entity.getUscc()), ExpelledApplyInfo::getUscc, entity.getUscc()) + .in(ExpelledApplyInfo::getState, "92", "93"); + return page(page, wrapper); + } }