From 5f612ab2f67b2c6f6894c624a7780799526d566d Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 05 十一月 2026 20:20:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business_新高电力' into dev_business_新高电力
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java
index c62a5a3..d26fed6 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java
@@ -4,6 +4,9 @@
import cn.hutool.core.collection.ListUtil;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
+import cn.iocoder.yudao.module.mes.service.pro.feedback.dto.MesTaskParamSnapshot;
+import cn.iocoder.yudao.module.mes.service.pro.feedback.dto.MesFeedbackParamSnapshot;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -158,6 +161,17 @@
return success(new PageResult<>(buildFeedbackRespVOList(pageResult.getList()), pageResult.getTotal()));
}
+ @GetMapping("/param-config")
+ @Operation(summary = "鑾峰緱鐢熶骇浠诲姟鍐荤粨鐨勫弬鏁伴噰闆嗛厤缃�")
+ public CommonResult<Map<String, Object>> getParamConfig(@RequestParam("taskId") Long taskId) {
+ MesProTaskDO task = taskService.validateTaskExists(taskId);
+ Map<String, Object> result = new LinkedHashMap<>();
+ result.put("mode", task.getParamCollectMode() == null ? 0 : task.getParamCollectMode());
+ result.put("template", JsonUtils.parseObject(task.getParamTemplateSnapshot(), MesTaskParamSnapshot.class));
+ result.put("shared", JsonUtils.parseObject(task.getParamSharedSnapshot(), MesFeedbackParamSnapshot.class));
+ return success(result);
+ }
+
@GetMapping("/list-by-task")
@Operation(summary = "鎸変换鍔¤幏寰楁姤宸ュ巻鍙插垪琛�")
@Parameter(name = "taskId", description = "浠诲姟缂栧彿", required = true, example = "1024")
@@ -193,7 +207,7 @@
.remark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "鐢熶骇鎶ュ伐瀵煎叆妯℃澘.xls", "鐢熶骇鎶ュ伐鍒楄〃", MesProFeedbackImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "鐢熶骇鎶ュ伐瀵煎叆妯℃澘.xls", "鐢熶骇鎶ュ伐鍒楄〃", MesProFeedbackImportExcelVO.class, list);
}
@PostMapping("/import")
--
Gitblit v1.9.3