From 2e61529d8489ef46e9ee298007eb2ed57a215e3f Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 21 Apr 2021 08:43:17 +0800
Subject: [PATCH] 1.反馈查询接口
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java
index 4d2b93c..6295273 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java
@@ -40,10 +40,7 @@
import javax.validation.Valid;
import java.io.File;
import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
/**
* 控制器
@@ -232,8 +229,14 @@
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
response.setHeader("Access-Control-Allow-Credentials","true");
+ Map<String, Object> maps = new HashMap<String, Object>();
+ List<Map<String, Object>> lists = new ArrayList<>();
List<FeedbackVO> feedbackVOS = feedbackService.selectFeedEdit(jid);
- return R.data(feedbackVOS);
+ List<Map<String, Object>> map = feedbackService.selectWjEdit(jid);
+ maps.put("List",feedbackVOS);
+ maps.put("wj",map);
+ lists.add(maps);
+ return R.data(lists);
}
}
--
Gitblit v1.9.3