修改飞书推送待办
This commit is contained in:
+30
-16
@@ -1,15 +1,14 @@
|
||||
package com.jero.modules.docking.hiwork.service.impl;
|
||||
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
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.exception.JeroBootException;
|
||||
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;
|
||||
import com.jero.modules.activiti.enums.CommitFlagEnum;
|
||||
import com.jero.modules.activiti.enums.ProcessTypeEnum;
|
||||
import com.jero.modules.activiti.service.ProcessAllService;
|
||||
import com.jero.modules.activiti.service.ProcessApprovalRecordService;
|
||||
import com.jero.modules.activiti.service.ProcessNodeService;
|
||||
@@ -26,14 +25,13 @@ import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* @Author: liao
|
||||
*
|
||||
* @Date: 2023/10/13 14:23
|
||||
* @Description: 待办
|
||||
* @Description: 飞书推送待办
|
||||
*/
|
||||
@Slf4j
|
||||
@Service
|
||||
@@ -57,10 +55,6 @@ public class SendFeiShuServiceImpl implements ISendFeiShuService {
|
||||
private String promoterPcLink;
|
||||
@Value("${feishu.review_pc_link}")
|
||||
private String reviewPcLink;
|
||||
@Value("${feishu.promoter_mobile_link}")
|
||||
private String promoterMobileLink;
|
||||
@Value("${feishu.review_mobile_link}")
|
||||
private String reviewMobileLink;
|
||||
|
||||
/**
|
||||
* @Author: liao
|
||||
@@ -121,7 +115,10 @@ public class SendFeiShuServiceImpl implements ISendFeiShuService {
|
||||
String transferTaskId = processApprovalRecord.getTransferTaskId();
|
||||
String taskId = processApprovalRecord.getTaskId();
|
||||
InstanceDto instanceDto = new InstanceDto();
|
||||
instanceDto.setPromoterUserId(processAll.getCreateUserId());
|
||||
SysUser sysUserCreate = sysUserService.getById(processAll.getCreateUserId());
|
||||
if(!Objects.isNull(sysUserCreate)){
|
||||
instanceDto.setPromoterUseName(sysUserCreate.getRealname());
|
||||
}
|
||||
instanceDto.setReviewedIds(userId);
|
||||
SysUser sysUser = sysUserService.getById(userId);
|
||||
String date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(processAll.getCreateTime());
|
||||
@@ -146,13 +143,30 @@ public class SendFeiShuServiceImpl implements ISendFeiShuService {
|
||||
CommitFlagEnum.PASS.getValue()) ? "APPROVED" : "REJECTED";
|
||||
break;
|
||||
}
|
||||
|
||||
String projectId = "";
|
||||
if (StrUtil.isNotBlank(processAll.getProjectId())){
|
||||
projectId = processAll.getProjectId();
|
||||
}
|
||||
instanceDto.setInstanceStatus(instanceStatus);
|
||||
instanceDto.setTaskStatus(status);
|
||||
instanceDto.setPromoterPcLink(promoterPcLink);
|
||||
instanceDto.setReviewPcLink(reviewPcLink);
|
||||
instanceDto.setPromoterMobileLink(promoterMobileLink);
|
||||
instanceDto.setReviewMobileLink(reviewMobileLink);
|
||||
String url = promoterPcLink
|
||||
.replace("{projectId}",projectId)
|
||||
.replace("{taskName}",processApprovalRecord.getTaskName())
|
||||
.replace("{taskId}", StringUtils.isBlank(transferTaskId) ? taskId : transferTaskId)
|
||||
.replace("{processInstanceId}",processApprovalRecord.getProcessInstanceId())
|
||||
.replace("{nodeId}",processApprovalRecord.getNodeId());
|
||||
// 跳转链接
|
||||
String businessLink = Objects.requireNonNull(ProcessTypeEnum.getFontReturnUrlPc(processAll.getPrcType())) + url;
|
||||
instanceDto.setPromoterPcLink(businessLink);
|
||||
// APP跳转链接
|
||||
String appUrl = reviewPcLink
|
||||
.replace("{projectId}",projectId)
|
||||
.replace("{taskName}",processApprovalRecord.getTaskName())
|
||||
.replace("{taskId}", StringUtils.isBlank(transferTaskId) ? taskId : transferTaskId)
|
||||
.replace("{processInstanceId}",processApprovalRecord.getProcessInstanceId())
|
||||
.replace("{nodeId}",processApprovalRecord.getNodeId());
|
||||
String appBusinessLink = appUrl.replace("{url}", Objects.requireNonNull(ProcessTypeEnum.getFontReturnUrlPc(processAll.getPrcType())));
|
||||
instanceDto.setReviewPcLink(appBusinessLink);
|
||||
feiShuDockingService.synchronizeApprovalInstance(instanceDto);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user