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

update:修改代办跳转到详情页

Browse Source
This commit is contained in:
sunzheng
2024-08-05 13:36:18 +08:00
parent f3afbe5310
commit 1258479f6f
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/service/impl/FeiShuDockingServiceImpl.java
+6 -9
View File
@@ -292,8 +292,8 @@ public class FeiShuDockingServiceImpl implements IFeiShuDockingService {
botApprovalMessageDto.setTemplateId("1008");
botApprovalMessageDto.setApprovalName(instanceDto.getTitle());
botApprovalMessageDto.setReceivedUserId(approvalsInstanceVo.getTask_list().get(0).getUser_id());
botApprovalMessageDto.setApplicantUserId(approvalsInstanceVo.getUser_id());
botApprovalMessageDto.setTitleUserId(approvalsInstanceVo.getUser_id());
botApprovalMessageDto.setApplicantUserId(instanceDto.getPromoterUserId());
botApprovalMessageDto.setTitleUserId(instanceDto.getPromoterUserId());
botApprovalMessageDto.setContent1(instanceDto.getTitle());
botApprovalMessageDto.setPcUrl(approvalsInstanceVo.getTask_list().get(0).getLinks().getPc_link());
botApprovalMessageDto.setMobileUrl(approvalsInstanceVo.getTask_list().get(0).getLinks().getMobile_link());
@@ -308,6 +308,7 @@ public class FeiShuDockingServiceImpl implements IFeiShuDockingService {
SysUser promoterUser = sysUserService.getById(promoterUserId);
if (!Objects.isNull(promoterUser) && StringUtils.isNotBlank(promoterUser.getFeishuId())) {
promoterUserId = promoterUser.getFeishuId();
instanceDto.setPromoterUserId(promoterUserId);
}
}
// 审核人的id(可能为多个),查出对应的飞书id
@@ -398,7 +399,7 @@ public class FeiShuDockingServiceImpl implements IFeiShuDockingService {
instanceLink.setMobile_link(instanceDto.getPromoterMobileLink());
approvalsInstanceVo.setLinks(instanceLink);
approvalsInstanceVo.setTitle("@i18n@1");
approvalsInstanceVo.setUser_id(promoterUserId); // 审批发起人的user_id
approvalsInstanceVo.setUser_id(""); // 审批发起人的user_id
approvalsInstanceVo.setStart_time(String.valueOf(instanceDto.getInstanceStartTime().getTime()));
approvalsInstanceVo.setEnd_time("0");
approvalsInstanceVo.setUpdate_time(String.valueOf(System.currentTimeMillis()));
@@ -740,14 +741,12 @@ public class FeiShuDockingServiceImpl implements IFeiShuDockingService {
// 审批事由
List<MessageSummary> messageSummaries = new ArrayList<>();
messageSummaries.add(new MessageSummary("@i18n@2"));
// messageSummaries.add(new MessageSummary("@i18n@3"));
messageContent.setSummaries(messageSummaries);
approvalsSendMessageVo.setContent(messageContent);
// approvalsSendMessageVo.setNote("@i18n@4");
// 行动区
List<MessageAction> actions = new ArrayList<>();
actions.add(new MessageAction("DETAIL",botApprovalMessageDto.getPcUrl(),botApprovalMessageDto.getMobileUrl(),
botApprovalMessageDto.getMobileUrl(),botApprovalMessageDto.getPcUrl()));
actions.add(new MessageAction("DETAIL",botApprovalMessageDto.getPcUrl(),botApprovalMessageDto.getPcUrl(),
botApprovalMessageDto.getPcUrl(),botApprovalMessageDto.getPcUrl()));
approvalsSendMessageVo.setActions(actions);
// 国际化文案
MessageI18nResources messageI18nResources = new MessageI18nResources();
@@ -756,8 +755,6 @@ public class FeiShuDockingServiceImpl implements IFeiShuDockingService {
HashMap<String, String> map = new HashMap<>();
map.put("@i18n@1", botApprovalMessageDto.getApprovalName());
map.put("@i18n@2", botApprovalMessageDto.getContent1());
// map.put("@i18n@3", "当前节点：" + botApprovalMessageDto.getContent2());
// map.put("@i18n@4", "来自oa");
messageI18nResources.setTexts(map);
List<MessageI18nResources> i18n_resources = new ArrayList<>();
i18n_resources.add(messageI18nResources);
laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendFeiShuServiceImpl.java
+1
View File
@@ -115,6 +115,7 @@ 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());
laws-single-startup/src/main/resources/application-dev-chery.yml
+7 -1
View File
@@ -591,10 +591,16 @@ feishu:
bot_send_message: ${feishu.base_url}/im/v1/messages
# 飞书根据预登录code获取用户信息
get_userinfo_by_code: ${feishu.base_url}/authen/v1/access_token
# 飞书发送审批 Bot消息
bot_send_approval_message: ${feishu.base_url}/approval/v1/message/send
# 飞书更新审批 Bot消息
update_send_approval_message: ${feishu.base_url}/approval/v1/message/update
# 使用Bot发送卡片消息
bot_send_card_message: ${feishu.base_url}/im/v1/messages?receive_id_type=user_id
# 飞书单点登录地址
sign_login_in: ${feishu.base_url}/authen/v1/index?redirect_uri={REDIRECT_URI}&app_id=${feishu.app_id}&state=feishu
# 飞书PC端待办地址
promoter_pc_link: ${feishu.redirect_prefix}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId}
# 飞书PC端发起流程地址
review_pc_link: ${feishu.redirect_prefix}/mobile{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId}
review_pc_link: ${feishu.redirect_prefix}{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId}
laws-single-startup/src/main/resources/application-dev.yml
+1 -1
View File
@@ -600,4 +600,4 @@ feishu:
# 飞书PC端待办地址
promoter_pc_link: ${feishu.redirect_prefix}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId}
# 飞书PC端发起流程地址
review_pc_link: ${feishu.redirect_prefix}/mobile{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId}
review_pc_link: ${feishu.redirect_prefix}{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId}