34 lines
3.7 KiB
Plaintext
34 lines
3.7 KiB
Plaintext
diff --git a/backend/src/main/java/com/writeoff/module/meeting/service/MeetingMaterialService.java b/backend/src/main/java/com/writeoff/module/meeting/service/MeetingMaterialService.java
|
|
index acb48e7..7b38b14 100644
|
|
--- a/backend/src/main/java/com/writeoff/module/meeting/service/MeetingMaterialService.java
|
|
+++ b/backend/src/main/java/com/writeoff/module/meeting/service/MeetingMaterialService.java
|
|
@@ -915,7 +915,7 @@ public class MeetingMaterialService {
|
|
return true;
|
|
}
|
|
String status = stringValue(issue.get("status")).toUpperCase(Locale.ROOT);
|
|
- return "CHANGED".equals(status) || "RESOLVED".equals(status);
|
|
+ return "CHANGED".equals(status) || "RESOLVED".equals(status) || "PENDING_CONFIRM".equals(status);
|
|
}
|
|
|
|
private String normalizeSupportedModuleCode(String moduleCode) {
|
|
@@ -2380,6 +2380,19 @@ public class MeetingMaterialService {
|
|
}
|
|
addAttachmentNodeFromSingleFile(index, "signInSheet", "绛惧埌琛?, root.get("signInSheet"));
|
|
addAttachmentNodeFromSingleFile(index, "themePhoto", "涓婚鐓х墖", root.get("themePhoto"));
|
|
+ Object videoObj = root.get("meetingVideo");
|
|
+ if (videoObj instanceof Map) {
|
|
+ Map<String, Object> videoMap = asObjectMapOrEmpty(videoObj);
|
|
+ String type = stringValue(videoMap.get("type"));
|
|
+ if ("link".equals(type)) {
|
|
+ String link = stringValue(videoMap.get("link"));
|
|
+ if (!link.isEmpty()) {
|
|
+ addFieldNode(index, "meetingVideo", "浼氳瑙嗛", "缃戠洏閾炬帴锛? + link);
|
|
+ }
|
|
+ } else {
|
|
+ addAttachmentNodeFromSingleFile(index, "meetingVideo", "浼氳瑙嗛", videoObj);
|
|
+ }
|
|
+ }
|
|
Object invitationObj = root.get("invitation");
|
|
if (invitationObj instanceof Collection) {
|
|
int idx = 1;
|