diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/dto/InstanceDto.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/dto/InstanceDto.java index c48e1332..ae2ac261 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/dto/InstanceDto.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/dto/InstanceDto.java @@ -71,4 +71,10 @@ public class InstanceDto { @ApiModelProperty("审批定义的类型") private Integer processType; + @ApiModelProperty("审批机器人消息的标题") + private String approvalBotTitle; + + @ApiModelProperty("审批机器人消息的内容") + private String approvalBotContent; + } diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/service/impl/FeiShuDockingServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/service/impl/FeiShuDockingServiceImpl.java index 153f4ee1..3a8f5e53 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/service/impl/FeiShuDockingServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/service/impl/FeiShuDockingServiceImpl.java @@ -290,11 +290,11 @@ public class FeiShuDockingServiceImpl implements IFeiShuDockingService { private BotApprovalMessageDto buildBotApprovalMessageDto(InstanceDto instanceDto, ApprovalsInstanceVo approvalsInstanceVo) { BotApprovalMessageDto botApprovalMessageDto = new BotApprovalMessageDto(); botApprovalMessageDto.setTemplateId("1008"); - botApprovalMessageDto.setApprovalName(instanceDto.getTitle()); + botApprovalMessageDto.setApprovalName(instanceDto.getApprovalBotTitle()); botApprovalMessageDto.setReceivedUserId(approvalsInstanceVo.getTask_list().get(0).getUser_id()); botApprovalMessageDto.setApplicantUserId(instanceDto.getPromoterUserId()); botApprovalMessageDto.setTitleUserId(instanceDto.getPromoterUserId()); - botApprovalMessageDto.setContent1(instanceDto.getTitle()); + botApprovalMessageDto.setContent1(instanceDto.getApprovalBotContent()); botApprovalMessageDto.setPcUrl(approvalsInstanceVo.getTask_list().get(0).getLinks().getPc_link()); botApprovalMessageDto.setMobileUrl(approvalsInstanceVo.getTask_list().get(0).getLinks().getMobile_link()); return botApprovalMessageDto; @@ -832,11 +832,9 @@ public class FeiShuDockingServiceImpl implements IFeiShuDockingService { // 构建字段数组 List fields = new ArrayList<>(); - fields.add(createField("申请人", applicant, true)); - fields.add(createField("", "", false)); // 空行 - fields.add(createField("时间", leaveTime, false)); - fields.add(createField("", "", false)); // 空行 - fields.add(createField("备注", remarks, true)); + fields.add(createField("", applicant, true)); +// fields.add(createField("", "", false)); // 空行 +// fields.add(createField("时间", leaveTime, false)); // 创建 div 标签元素 JSONObject divElement = new JSONObject(); @@ -850,7 +848,10 @@ public class FeiShuDockingServiceImpl implements IFeiShuDockingService { buttonText.put("content", "查看详情"); button.put("text", buttonText); button.put("type", "primary"); - button.put("url", url); + JSONObject jsonObject = new JSONObject(); + jsonObject.put("pc_url","https://www.baidu.com"); + jsonObject.put("url","https://www.weibo.com"); + button.put("multi_url",jsonObject); JSONObject actionElement = new JSONObject(); actionElement.put("tag", "action");