回调测试完成

ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/operate/ApprovalCallbackOperate.java

@@ -140,7 +140,10 @@ public class ApprovalCallbackOperate extends LarkAbstract {
         Map<String, Object> result = new HashMap<>();
         Map<String, String> colRelation = request.getTableColRelationMap().getOrDefault(request.getTableRelationId(), new HashMap<>());
         for (Map.Entry<String, String> entry : colRelation.entrySet()) {
-            result.put(entry.getValue(), recursiveValue(bodyMap.get(entry.getValue()), entry.getKey()));
+            String[] split = entry.getValue().split("@");
+            String toColName = split[0];
+            String path = split[1];
+            result.put(entry.getValue(), recursiveValue(bodyMap.get(toColName), path));
         }
         return result;
     }
@@ -201,15 +204,15 @@ public class ApprovalCallbackOperate extends LarkAbstract {
         EventLog eventLog = null;
         if (StringUtils.isBlank(request.getErrorMessage())) {
             eventService.updateStatus(event.getId(), EventOperateStatus.SUCCESS.getCode(), event.getNumbers());
-            eventLog = new EventLog(event.getId(), request.getEventOperateType().getCode(), request.getMessage());
+            eventLog = new EventLog(event.getId(), request.getApproveName(), request.getMessage());
         } else {
             eventService.updateStatus(event.getId(), EventOperateStatus.PENDING.getCode(), event.getNumbers() + 1);
             if (request.getEventOperateType() != null) {
-                new EventLog(event.getId(), request.getEventOperateType().getCode(), request.getMessage(), request.getErrorCode(), request.getErrorMessage());
+                new EventLog(event.getId(), request.getApproveName(), request.getMessage(), request.getErrorCode(), request.getErrorMessage());
             }
         }
         if (eventLog != null) {
-            eventLog.setOperateInfo(request.getOperateType());
+            eventLog.setOperateInfo(request.getOperateInfo());
             eventLogService.insertEventLog(eventLog);
         }
     }