From 5d34bdd3c426bb2ca5f6627424ae67984f745603 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期三, 21 十月 2026 18:28:59 +0800
Subject: [PATCH] feat: 新增资产/用车/采购模块，完善课题、会员、财务与企微功能
---
yudao-module-wxcp/src/main/java/cn/iocoder/yudao/module/wxcp/controller/admin/activity/WxCpActivityController.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/yudao-module-wxcp/src/main/java/cn/iocoder/yudao/module/wxcp/controller/admin/activity/WxCpActivityController.java b/yudao-module-wxcp/src/main/java/cn/iocoder/yudao/module/wxcp/controller/admin/activity/WxCpActivityController.java
index 76e21ae..63ebdce 100644
--- a/yudao-module-wxcp/src/main/java/cn/iocoder/yudao/module/wxcp/controller/admin/activity/WxCpActivityController.java
+++ b/yudao-module-wxcp/src/main/java/cn/iocoder/yudao/module/wxcp/controller/admin/activity/WxCpActivityController.java
@@ -10,6 +10,7 @@
import cn.iocoder.yudao.module.wxcp.dal.dataobject.activity.WxCpActivityDO;
import cn.iocoder.yudao.module.wxcp.dal.dataobject.activity.WxCpActivitySignupDO;
import cn.iocoder.yudao.module.wxcp.enums.activity.WxCpActivityStatusEnum;
+import cn.iocoder.yudao.module.wxcp.enums.activity.WxCpActivityTypeEnum;
import cn.iocoder.yudao.module.wxcp.enums.activity.WxCpPushScopeEnum;
import cn.iocoder.yudao.module.wxcp.enums.activity.WxCpSignupStatusEnum;
import cn.iocoder.yudao.module.wxcp.service.activity.WxCpActivityService;
@@ -163,6 +164,9 @@
}
WxCpSignupStatusEnum status = WxCpSignupStatusEnum.valueOf(vo.getStatus());
vo.setStatusName(status != null ? status.getName() : null);
+ vo.setFieldValues(activityService.getSignupValues(vo.getId()).stream()
+ .map(value -> BeanUtils.toBean(value, WxCpSignupValueRespVO.class))
+ .toList());
});
return success(result);
}
@@ -215,16 +219,24 @@
/**
* 琛ラ綈鐘舵�佸悕銆佹帹閫佽寖鍥村悕涓庡皝闈㈤檮浠�
*
- * 灏侀潰涓嶈惤涓氬姟琛ㄥ瓧娈碉紝缁熶竴浠� system_storage_attachment 涓棿琛ㄨ锛�
- * 鍓嶇鍙� attachmentList[0].previewURL 灞曠ず銆�
+ * 灏侀潰/璇︽儏鍥句笉钀戒笟鍔¤〃瀛楁锛岀粺涓�浠� system_storage_attachment 涓棿琛ㄨ锛�
+ * 鍓嶇鍙� attachmentList[0].previewURL 灞曠ず灏侀潰锛宒etailAttachmentList 鍥炴樉璇︽儏鍥俱��
*/
private void fillActivityExtra(WxCpActivityRespVO vo) {
WxCpActivityStatusEnum status = WxCpActivityStatusEnum.valueOf(vo.getStatus());
vo.setStatusName(status != null ? status.getName() : null);
WxCpPushScopeEnum scope = WxCpPushScopeEnum.valueOf(vo.getPushScope());
vo.setPushScopeName(scope != null ? scope.getName() : null);
+ WxCpActivityTypeEnum type = WxCpActivityTypeEnum.valueOf(vo.getActivityType());
+ vo.setActivityTypeName(type != null ? type.getName() : null);
if (vo.getId() != null) {
vo.setAttachmentList(activityService.getActivityAttachments(vo.getId()));
+ vo.setDetailAttachmentList(activityService.getActivityDetailAttachments(vo.getId()));
+ vo.setImageAttachmentList(activityService.getActivityImageAttachments(vo.getId()));
+ vo.setFileAttachmentList(activityService.getActivityFileAttachments(vo.getId()));
+ vo.setFieldList(activityService.getActivityFields(vo.getId()).stream()
+ .map(field -> BeanUtils.toBean(field, WxCpActivityFieldRespVO.class))
+ .toList());
}
}
--
Gitblit v1.9.3