QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改oa转办流程

Browse Source
This commit is contained in:
梁琦涛
2024-08-08 14:33:04 +08:00
parent 67ac9e640a
commit 7524127c2b
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendFeiShuServiceImpl.java
+8
View File
@@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.common.api.dto.message.UnifiedTodoVO;
import com.jero.common.constant.CommonConstant;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.modules.activiti.entity.ProcessAll;
import com.jero.modules.activiti.entity.ProcessApprovalRecord;
import com.jero.modules.activiti.entity.ProcessNode;
@@ -17,6 +18,7 @@ import com.jero.modules.docking.feishu.service.IFeiShuDockingService;
import com.jero.modules.docking.hiwork.service.ISendFeiShuService;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.service.ISysUserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
@@ -47,6 +49,8 @@ public class SendFeiShuServiceImpl implements ISendFeiShuService {
private IFeiShuDockingService feiShuDockingService;
@Resource
private ProcessNodeService processNodeService;
@Resource
private ISysBaseAPI sysBaseAPI;
@Value("${feishu.isSendStatus}")
private boolean isSendStatus;
@@ -129,6 +133,10 @@ public class SendFeiShuServiceImpl implements ISendFeiShuService {
instanceDto.setProcessInstanceId(processApprovalRecord.getProcessInstanceId());
instanceDto.setTaskIds(StringUtils.isBlank(transferTaskId) ? taskId : transferTaskId);
String prcType = sysBaseAPI.translateDict("prc_type",String.valueOf(processAll.getPrcType()));
instanceDto.setApprovalBotTitle(prcType);
instanceDto.setApprovalBotContent(processApprovalRecord.getTaskName());
// PENDING： 审批中 APPROVED： 审批流程结束，结果为同意 REJECTED： 审批流程结束，结果为拒绝
// CANCELED： 审批发起人撤回 DELETED： 审批被删除 HIDDEN： 状态隐藏(不显示状态) TERMINATED：审批终止
instanceDto.setInstanceStartTime(processAll.getReceivedTaskTime());
laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/UnifiedTodoServiceImpl.java
+4 -4
View File
@@ -96,7 +96,8 @@ public class UnifiedTodoServiceImpl implements PushWorkflowIntegrationAPI {
}
boolean successFlag = true;
if (CollectionUtils.isEmpty(unifiedTodoVOList)) {
throw new JeroBootException(ResultCommon.EMPTY_COMMON, "unifiedTodoVOList");
return;
// throw new JeroBootException(ResultCommon.EMPTY_COMMON, "unifiedTodoVOList");
}
String newDate = DateUtil.formatDateTime(new Date());
for (UnifiedTodoVO unifiedTodoVO : unifiedTodoVOList) {
@@ -233,11 +234,10 @@ public class UnifiedTodoServiceImpl implements PushWorkflowIntegrationAPI {
if (StrUtil.isNotBlank(processAll.getProjectId())){
projectId = processAll.getProjectId();
}
String transferTaskId = processApprovalRecord.getTransferTaskId();
String url = hiworkFontUrl
.replace("{projectId}",projectId)
.replace("{taskName}",processApprovalRecord.getTaskName())
.replace("{taskId}", StringUtils.isBlank(transferTaskId) ? taskId : transferTaskId)
.replace("{taskId}", taskId)
.replace("{processInstanceId}",processApprovalRecord.getProcessInstanceId())
.replace("{nodeId}",processApprovalRecord.getNodeId());
// 跳转链接
@@ -248,7 +248,7 @@ public class UnifiedTodoServiceImpl implements PushWorkflowIntegrationAPI {
String appUrl = hiworkFontAppUrl
.replace("{projectId}",projectId)
.replace("{taskName}",processApprovalRecord.getTaskName())
.replace("{taskId}", StringUtils.isBlank(transferTaskId) ? taskId : transferTaskId)
.replace("{taskId}", taskId)
.replace("{processInstanceId}",processApprovalRecord.getProcessInstanceId())
.replace("{nodeId}",processApprovalRecord.getNodeId());
String appBusinessLink = appUrl.replace("{url}", Objects.requireNonNull(ProcessTypeEnum.getFontReturnUrlPc(processAll.getPrcType())));