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 10:45:21 +08:00
parent ee560147bc
commit f8e896d0f4
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/dto/InstanceDto.java
+3
View File
@@ -11,6 +11,9 @@ public class InstanceDto {
@ApiModelProperty("发起人的id") @ApiModelProperty("发起人的id")
private String promoterUserId; private String promoterUserId;
@ApiModelProperty("发起人的用户名")
private String promoterUseName;
@ApiModelProperty("审核人的ids,可能为多个,逗号分割") @ApiModelProperty("审核人的ids,可能为多个,逗号分割")
private String reviewedIds; private String reviewedIds;
laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/service/impl/FeiShuDockingServiceImpl.java
+17 -13
View File
@@ -17,7 +17,9 @@ import com.jero.common.util.oConvertUtils;
import com.jero.modules.activiti.entity.ProcessApprovalRecord; import com.jero.modules.activiti.entity.ProcessApprovalRecord;
import com.jero.modules.activiti.service.ProcessApprovalRecordService; import com.jero.modules.activiti.service.ProcessApprovalRecordService;
import com.jero.modules.docking.feishu.common.Constant; import com.jero.modules.docking.feishu.common.Constant;
import com.jero.modules.docking.feishu.controller.FeishuBotService;
import com.jero.modules.docking.feishu.dto.BotApprovalMessageDto; import com.jero.modules.docking.feishu.dto.BotApprovalMessageDto;
import com.jero.modules.docking.feishu.dto.BotCardMessageDto;
import com.jero.modules.docking.feishu.dto.BotMessageDto; import com.jero.modules.docking.feishu.dto.BotMessageDto;
import com.jero.modules.docking.feishu.dto.InstanceDto; import com.jero.modules.docking.feishu.dto.InstanceDto;
import com.jero.modules.docking.feishu.service.IFeiShuDockingService; import com.jero.modules.docking.feishu.service.IFeiShuDockingService;
@@ -299,7 +301,7 @@ public class FeiShuDockingServiceImpl implements IFeiShuDockingService {
return botApprovalMessageDto; return botApprovalMessageDto;
} }
private ApprovalsInstanceVo buildApprovalsInstanceVo(InstanceDto instanceDto) throws Exception { private ApprovalsInstanceVo buildApprovalsInstanceVo(InstanceDto instanceDto) {
// 转换userId为飞书Id // 转换userId为飞书Id
// 发起人的id // 发起人的id
String promoterUserId = instanceDto.getPromoterUserId(); String promoterUserId = instanceDto.getPromoterUserId();
@@ -368,16 +370,16 @@ public class FeiShuDockingServiceImpl implements IFeiShuDockingService {
} }
}).collect(Collectors.toList()); }).collect(Collectors.toList());
} }
// 发起人对应的pc的跳转地址 // // 发起人对应的pc的跳转地址
String promoterPcLink = URLEncoder.encode(instanceDto.getPromoterPcLink(), "UTF-8"); // String promoterPcLink = URLEncoder.encode(instanceDto.getPromoterPcLink(), "UTF-8");
if (StringUtils.isNotBlank(promoterPcLink)) { // if (StringUtils.isNotBlank(promoterPcLink)) {
promoterPcLink = url.replace("{REDIRECT_URI}", promoterPcLink); // promoterPcLink = url.replace("{REDIRECT_URI}", promoterPcLink);
} // }
// 发起人移动端的跳转地址 // // 发起人移动端的跳转地址
String promoterMobileLink = URLEncoder.encode(instanceDto.getPromoterMobileLink(), "UTF-8"); // String promoterMobileLink = URLEncoder.encode(instanceDto.getPromoterMobileLink(), "UTF-8");
if (StringUtils.isNotBlank(promoterMobileLink)) { // if (StringUtils.isNotBlank(promoterMobileLink)) {
promoterMobileLink = url.replace("{REDIRECT_URI}", promoterMobileLink); // promoterMobileLink = url.replace("{REDIRECT_URI}", promoterMobileLink);
} // }
// 审批定义的code // 审批定义的code
Integer processType = instanceDto.getProcessType(); Integer processType = instanceDto.getProcessType();
// 拿到这个流程的名称 // 拿到这个流程的名称
@@ -389,11 +391,12 @@ public class FeiShuDockingServiceImpl implements IFeiShuDockingService {
// 发起人相关的信息 // 发起人相关的信息
ApprovalsInstanceVo approvalsInstanceVo = new ApprovalsInstanceVo(); ApprovalsInstanceVo approvalsInstanceVo = new ApprovalsInstanceVo();
approvalsInstanceVo.setApproval_code(approvalDefinition); approvalsInstanceVo.setApproval_code(approvalDefinition);
approvalsInstanceVo.setUser_name(instanceDto.getPromoterUseName());
approvalsInstanceVo.setStatus(instanceDto.getInstanceStatus()); approvalsInstanceVo.setStatus(instanceDto.getInstanceStatus());
approvalsInstanceVo.setInstance_id(instanceDto.getProcessInstanceId()); approvalsInstanceVo.setInstance_id(instanceDto.getProcessInstanceId());
InstanceLink instanceLink = new InstanceLink(); InstanceLink instanceLink = new InstanceLink();
instanceLink.setPc_link(promoterPcLink); instanceLink.setPc_link(instanceDto.getPromoterPcLink());
instanceLink.setMobile_link(promoterMobileLink); instanceLink.setMobile_link(instanceDto.getPromoterMobileLink());
approvalsInstanceVo.setLinks(instanceLink); approvalsInstanceVo.setLinks(instanceLink);
approvalsInstanceVo.setTitle("@i18n@1"); approvalsInstanceVo.setTitle("@i18n@1");
approvalsInstanceVo.setUser_id(promoterUserId); // 审批发起人的user_id approvalsInstanceVo.setUser_id(promoterUserId); // 审批发起人的user_id
@@ -777,4 +780,5 @@ public class FeiShuDockingServiceImpl implements IFeiShuDockingService {
HttpEntity<ApprovalsUpdateMessageVo> entity = new HttpEntity<>(approvalsUpdateMessageVo, headers); HttpEntity<ApprovalsUpdateMessageVo> entity = new HttpEntity<>(approvalsUpdateMessageVo, headers);
restTemplate.exchange(url, HttpMethod.POST, entity, String.class); restTemplate.exchange(url, HttpMethod.POST, entity, String.class);
} }
} }