1.市场主体撤销除名公告管理功能

This commit is contained in:
cc_caijp 2026-01-13 10:46:53 +08:00
parent c9d6a1986e
commit 761af9d5f2
3 changed files with 30 additions and 0 deletions

View File

@ -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<IPage<ExpelledApplyInfo>> listRevokeAnnouncement(@RequestBody BaseQuery<ExpelledApplyInfo> query) {
IPage<ExpelledApplyInfo> data = expelledApplyInfoService.listRevokeAnnouncement(query);
return RestResult.ok(data);
}
}

View File

@ -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<ExpelledApplyInfo> {
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<ExpelledApplyInfo> listRevokeAnnouncement(BaseQuery<ExpelledApplyInfo> query);
}

View File

@ -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<ExpelledApplyInfoM
}
return tsTaskList;
}
@Override
public IPage<ExpelledApplyInfo> listRevokeAnnouncement(BaseQuery<ExpelledApplyInfo> query) {
ExpelledApplyInfo entity = query.getEntity(ExpelledApplyInfo.class);
Page<ExpelledApplyInfo> page = query.getPage();
LambdaQueryWrapper<ExpelledApplyInfo> wrapper = Wrappers.<ExpelledApplyInfo>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);
}
}