From 276571374e8f0e2be2bdcfc5e8ea4a39af1599bc Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 01 八月 2023 09:42:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponExamineController.java | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponExamineController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponExamineController.java
index 059366b..a7a7e02 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponExamineController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponExamineController.java
@@ -35,7 +35,7 @@
*/
@RequestMapping("")
public String index(Model model) {
- return PREFIX + "TCouponExamine.html";
+ return PREFIX + "TCouponExamineList.html";
}
@@ -54,15 +54,7 @@
ofSearch.setDistributionMethod(distributionMethod);
ofSearch.setUserPopulation(userPopulation);
ofSearch.setAuditStatus(auditStatus);
- List<Map<String, Object>> couponExamineListOfSearch = client.getCouponExamineListOfSearch(ofSearch);
- if (couponExamineListOfSearch.size() > 0){
- for (Map<String, Object> examineListOfSearch : couponExamineListOfSearch) {
- examineListOfSearch.put("province","");
- examineListOfSearch.put("city","");
- examineListOfSearch.put("account","");
- }
- }
- return couponExamineListOfSearch;
+ return client.getCouponExamineListOfSearch(ofSearch);
}
/**
@@ -70,9 +62,13 @@
*/
@RequestMapping(value = "/couponOfDetail/{id}")
@ResponseBody
- public Object detailOfCoupon(@PathVariable Integer id){
- Map<String,Object> couponMap = client.queryCouponExamineDetail(id);
- return null;// TODO: 2023/7/31
+ public String detailOfCoupon(@PathVariable Integer id, Model model){
+ Map<String, Object> stringObjectMap = client.queryCouponExamineDetail(id);
+ model.addAllAttributes(stringObjectMap);
+ return PREFIX + "TCouponExamineInfo.html";
}
+
+
+
}
--
Gitblit v1.7.1