diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/LawsUnifiedTodoLogServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/LawsUnifiedTodoLogServiceImpl.java index c64c0f12..7b3565ee 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/LawsUnifiedTodoLogServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/LawsUnifiedTodoLogServiceImpl.java @@ -11,6 +11,9 @@ import com.jero.common.api.PushWorkflowIntegrationAPI; import com.jero.common.api.dto.message.UnifiedTodoVO; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.docking.feishu.dto.BotMessageDto; +import com.jero.modules.docking.feishu.dto.InstanceDto; +import com.jero.modules.docking.feishu.service.IFeiShuDockingService; import com.jero.modules.docking.hiwork.entity.LawsUnifiedTodoLog; import com.jero.modules.docking.hiwork.mapper.LawsUnifiedTodoLogMapper; import com.jero.modules.docking.hiwork.service.LawsUnifiedTodoLogService; @@ -32,6 +35,8 @@ public class LawsUnifiedTodoLogServiceImpl extends ServiceImpl> getPage(LawsUnifiedTodoLog lawsUnifiedTodoLog, Integer pageNo, @@ -73,10 +78,17 @@ public class LawsUnifiedTodoLogServiceImpl extends ServiceImpl - List unifiedTodoVOList = JSON.parseObject(jsonStr, new TypeReference>() {}); - pushWorkflowIntegrationAPI.sendTodoTask(unifiedTodoVOList); - + Integer messageType = lawsUnifiedTodoLogObj.getMessageType(); + if (messageType == 1) { // 重发OA + List unifiedTodoVOList = JSON.parseObject(jsonStr, new TypeReference>() {}); + pushWorkflowIntegrationAPI.sendTodoTask(unifiedTodoVOList); + }else if (messageType == 2) { // 重发飞书-待办 + InstanceDto instanceDto = JSON.parseObject(jsonStr, InstanceDto.class); + feiShuDockingService.synchronizeApprovalInstance(instanceDto); + }else { // 重发飞书-消息 + BotMessageDto botMessageDto = JSON.parseObject(jsonStr, BotMessageDto.class); + feiShuDockingService.sendHrefMessageByBot(botMessageDto); + } LambdaUpdateWrapper queryLawsUnifiedTodoLog = new LambdaUpdateWrapper<>(); queryLawsUnifiedTodoLog.eq(LawsUnifiedTodoLog::getId,lawsUnifiedTodoLog.getId()); queryLawsUnifiedTodoLog.set(LawsUnifiedTodoLog::getState,1);