zgty/zt-dsc
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'base-version/main' into test

Browse Source 
# Conflicts:
#	zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/api/task/BpmProcessInstanceApiImpl.java
#	zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/auth/AdminAuthServiceImpl.java
This commit is contained in:
chenbowen
2025-09-28 00:40:55 +08:00
parent 6e3f6d8105 47f777d89c
commit ecd4e6a020
26 changed files with 1382 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/api/task/BpmProcessInstanceApiImpl.java
View File

File diff suppressed because it is too large Load Diff

67
zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/convert/task/BpmProcessInstanceDTOConvert.java Normal file
View File

@@ -0,0 +1,67 @@
package com.zt.plat.module.bpm.convert.task;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.util.object.BeanUtils;
import com.zt.plat.module.bpm.api.task.dto.*;
import com.zt.plat.module.bpm.controller.admin.task.vo.instance.*;
import com.zt.plat.module.bpm.controller.admin.base.user.UserSimpleBaseVO;
import com.zt.plat.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO;
import com.zt.plat.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.Named;
import org.mapstruct.factory.Mappers;
import java.util.List;
/**
* 流程实例 DTO 转换器
*
* @author ZT
*/
@Mapper
public interface BpmProcessInstanceDTOConvert {
BpmProcessInstanceDTOConvert INSTANCE = Mappers.getMapper(BpmProcessInstanceDTOConvert.class);
// VO to DTO
BpmProcessInstancePageReqDTO convert(BpmProcessInstancePageReqVO bean);
BpmProcessInstanceCancelReqDTO convert(BpmProcessInstanceCancelReqVO bean);
BpmApprovalDetailReqDTO convert(BpmApprovalDetailReqVO bean);
// DTO to VO
BpmProcessInstancePageReqVO convertVO(BpmProcessInstancePageReqDTO bean);
BpmProcessInstanceCancelReqVO convertVO(BpmProcessInstanceCancelReqDTO bean);
BpmApprovalDetailReqVO convertVO(BpmApprovalDetailReqDTO bean);
PageResult<BpmProcessInstanceRespDTO> convertPage(PageResult<BpmProcessInstanceRespVO> pageResult);
BpmProcessInstanceRespDTO convert(BpmProcessInstanceRespVO bean);
BpmApprovalDetailRespDTO convert(BpmApprovalDetailRespVO bean);
BpmProcessInstanceBpmnModelViewRespDTO convert(BpmProcessInstanceBpmnModelViewRespVO bean);
List<BpmApprovalDetailRespDTO.ActivityNode> convertActivityNodes(List<BpmApprovalDetailRespVO.ActivityNode> nodes);
// 内部类转换
BpmProcessInstanceRespDTO.Task convert(BpmProcessInstanceRespVO.Task task);
BpmApprovalDetailRespDTO.ActivityNode convert(BpmApprovalDetailRespVO.ActivityNode node);
BpmApprovalDetailRespDTO.ActivityNodeTask convert(BpmApprovalDetailRespVO.ActivityNodeTask task);
// 用户信息转换
UserSimpleDTO convertUser(UserSimpleBaseVO user);
BpmProcessDefinitionRespDTO convert(BpmProcessDefinitionRespVO definition);
@Mapping(target = "childNode", source = "childNode", qualifiedByName = "mapChildNode")
BpmSimpleModelNodeDTO convert(BpmSimpleModelNodeVO simpleModel);
/**
* 将BpmSimpleModelNodeVO的childNode转换为List<BpmSimpleModelNodeDTO>
*/
@Named("mapChildNode")
default List<BpmSimpleModelNodeDTO> mapChildNode(BpmSimpleModelNodeVO childNode) {
if (childNode == null) {
return null;
}
return List.of(convert(childNode));
}
}