nm-project
/
aiccs-api
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

撤销吊销接口

This commit is contained in:
黎润豪 2026-04-08 09:06:50 +08:00
parent df2c3f5947
commit 4d1cfa397c
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/chinaweal/aiccs/aiccs/force/cancel/controller/CancelRevokeController.java
View File

@ -116,10 +116,10 @@ public class CancelRevokeController extends BaseController {
*/
@ApiOperation("启动流程下一步")
@PostMapping("/next")
public RestResult<CancelRevokeApprovalNextVO> approvalNext(
public RestResult<CancelRevokeApproveResultVO> approvalNext(
@RequestBody CancelRevokeApproveDTO approveDTO,
HttpServletRequest request) {
CancelRevokeApprovalNextVO result = cancelRevokeService.approvalNext(approveDTO, request);
CancelRevokeApproveResultVO result = cancelRevokeService.approve(approveDTO, request);
return RestResult.ok(result);
}

20
src/main/java/com/chinaweal/aiccs/aiccs/force/cancel/service/impl/CancelRevokeServiceImpl.java
View File

@ -30,6 +30,7 @@ import com.chinaweal.aiccs.org.service.AicorgService;
import com.chinaweal.aiccs.org.service.TUsersService;
import com.chinaweal.aicorg.model.AICUser;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -46,11 +47,6 @@ import java.util.*;
@Service
public class CancelRevokeServiceImpl extends BaseController implements ICancelRevokeService {
/**
* 撤销吊销业务类型
*/
private static final String BIZ_TYPE_CANCEL_REVOKE = "cancelrevoke";
@Autowired
private CancelRevokeMapper cancelRevokeMapper;
@ -134,17 +130,19 @@ public class CancelRevokeServiceImpl extends BaseController implements ICancelRe
// 创建任务列表对象
TSTaskList taskList = new TSTaskList();
taskList.setBizseqid(cancelRevoke.getBizSeq());
taskList.setBustype(BIZ_TYPE_CANCEL_REVOKE);
taskList.setBustype(BaseDataConstant.BIZ_TYPE_CANCEL_REVOKE);
taskList.setBusname(cancelRevoke.getEntname());
taskList.setBusstatus(BaseDataConstant.BUSINESS_STATUS_TRANSACT);
// 使用TSTaskListService的startWorkFlow方法启动工作流
String workflowid = taskListService.startWorkFlow(taskList, user, FlowUtil.SERIOUS_ILLEGAL_REM_WORKFLOW);
String tasklistid = taskListService.startWorkFlow(taskList, user, FlowUtil.SERIOUS_ILLEGAL_REM_WORKFLOW);
// 更新业务表的流程ID
String workflowid = taskList.getWorkflowid();
CancelRevoke updateEntity = new CancelRevoke();
updateEntity.setBizId(cancelRevoke.getBizId());
updateEntity.setWorkflowid(workflowid);
updateEntity.setTasklistid(tasklistid);
cancelRevokeMapper.update(updateEntity);
// 获取最新的任务信息
@ -180,7 +178,7 @@ public class CancelRevokeServiceImpl extends BaseController implements ICancelRe
// 获取工作流信息
List<TSTaskList> taskLists = taskListService.selectByBizSeqID(cancelRevoke.getBizSeq());
if (taskLists != null && !taskLists.isEmpty()) {
if (CollectionUtils.isNotEmpty(taskLists)) {
TSTaskList taskList = taskLists.get(0);
vo.setTasklistid(taskList.getTasklistid());
vo.setBizseqid(taskList.getBizseqid());
@ -193,14 +191,16 @@ public class CancelRevokeServiceImpl extends BaseController implements ICancelRe
// 获取下一节点和意见信息
if (StringUtils.isNotBlank(taskList.getWorkflowid())) {
String opinionType = null;
if (StringUtils.notEquals(taskList.getBusstatus(), "2")) {
List<SequenceFlowModel> nextSequenceFlowList = workFlowService.findNextSequenceFlowList(taskList.getWorkflowid());
vo.setNextSequenceFlowList(nextSequenceFlowList);
TSTwfProcessNode currentNode = workFlowService.findCurrentNode(taskList.getWorkflowid());
String opinionType = null;
if (currentNode != null) {
opinionType = BaseDataConstant.getOpinionTypeByWorkFlowNode(currentNode.getCurrentnode());
}
}
if (opinionType == null) {
opinionType = "1";
}
@ -492,7 +492,7 @@ public class CancelRevokeServiceImpl extends BaseController implements ICancelRe
// 获取当前用户的待办任务
LambdaQueryWrapper<TSTaskList> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TSTaskList::getSignuserid, user.getPrimaryKey())
.eq(TSTaskList::getBustype, BIZ_TYPE_CANCEL_REVOKE)
.eq(TSTaskList::getBustype, BaseDataConstant.BIZ_TYPE_CANCEL_REVOKE)
.eq(TSTaskList::getBusstatus, BaseDataConstant.BUSINESS_STATUS_TRANSACT);
Page<TSTaskList> page = new Page<>(pageNum, pageSize);
com.baomidou.mybatisplus.core.metadata.IPage<TSTaskList> pageResult = taskListService.page(page, wrapper);

1
src/main/java/com/chinaweal/aiccs/common/constant/BaseDataConstant.java
View File

@ -123,6 +123,7 @@ public class BaseDataConstant {
public static final String CANCEL_REGISTRATIONZX = "87"; // 撤销注销案件
public static final String CANCEL_EASYENTRYZX = "88"; // 撤销注销录入结果
public static final String CANCEL_REVOKEZX = "89"; // 撤销撤销注销案件
public static final String BIZ_TYPE_CANCEL_REVOKE = "90"; // 撤销注销
public static final String BUSINESS_TYPE_REVOKEABN = "21";//撤销列入经营异常名录