From 0e46c7fd175e0103c74645fb01e53a7fc7a58208 Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Wed, 24 Mar 2021 09:51:30 +0800
Subject: [PATCH 1/2] 1

---
 .../src/main/java/com/bweb/controller/HighCouponController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighCouponController.java b/hai-bweb/src/main/java/com/bweb/controller/HighCouponController.java
index 0a19162d..51e544cd 100644
--- a/hai-bweb/src/main/java/com/bweb/controller/HighCouponController.java
+++ b/hai-bweb/src/main/java/com/bweb/controller/HighCouponController.java
@@ -243,7 +243,7 @@ public class HighCouponController {
             approve.setObjectType(ApproveType.UP_SHELF_APPROVE.getType());
             approve.setObjectId(id);
             approve.setObjectName(coupon.getCouponName());
-            approve.setApproveSerialNo(DateUtil.date2String(new Date(), "yyyyMMddHHmmss");
+            approve.setApproveSerialNo(DateUtil.date2String(new Date(), "yyyyMMddHHmmss"));
             approve.setStatus(1);
             approve.setCreateTime(new Date());
             approve.setUpdateTime(new Date());

From 431fc39e9bdaf138cf66d94fd9fee5f8691d2411 Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Wed, 24 Mar 2021 17:03:15 +0800
Subject: [PATCH 2/2] 1

---
 .../bweb/controller/HighApproveController.java   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighApproveController.java b/hai-bweb/src/main/java/com/bweb/controller/HighApproveController.java
index 0ba4b71a..8b2286bd 100644
--- a/hai-bweb/src/main/java/com/bweb/controller/HighApproveController.java
+++ b/hai-bweb/src/main/java/com/bweb/controller/HighApproveController.java
@@ -42,8 +42,8 @@ import java.util.Map;
  * @Date 2021/3/16
  **/
 @Controller
-@RequestMapping(value = "/coupon")
-@Api(value = "卡卷接口")
+@RequestMapping(value = "/audit")
+@Api(value = "审核接口")
 public class HighApproveController {
 
     private static Logger log = LoggerFactory.getLogger(HighApproveController.class);
@@ -99,7 +99,7 @@ public class HighApproveController {
         }
     }
 
-    @RequestMapping(value="/getApproveDetail",method = RequestMethod.POST)
+    @RequestMapping(value="/getApproveDetail",method = RequestMethod.GET)
     @ResponseBody
     @ApiOperation(value = "查询审批详情")
     public ResponseData getApproveDetail(@RequestParam(name = "approveId", required = true) Long approveId) {
@@ -113,7 +113,7 @@ public class HighApproveController {
             Map<String, Object> map = new HashMap<>();
             map.put("approve", approve);
 
-            if (approve.getObjectType() == ApproveType.UP_SHELF_APPROVE.getType()) {
+            if (approve.getObjectType().equals(ApproveType.UP_SHELF_APPROVE.getType())) {
                 map.put("object", highCouponService.getCouponById(approve.getObjectId()));
             }
 
@@ -125,7 +125,7 @@ public class HighApproveController {
         }
     }
 
-    @RequestMapping(value="/getApproveList",method = RequestMethod.POST)
+    @RequestMapping(value="/getApproveList",method = RequestMethod.GET)
     @ResponseBody
     @ApiOperation(value = "查询审批列表")
     public ResponseData getApproveList(@RequestParam(name = "approveSerialNo", required = false) String approveSerialNo,
@@ -138,9 +138,9 @@ public class HighApproveController {
 
             Map<String, Object> map = new HashMap<>();
             map.put("approveSerialNo", approveSerialNo);
-            map.put("objectType", approveSerialNo);
-            map.put("objectId", approveSerialNo);
-            map.put("objectName", approveSerialNo);
+            map.put("objectType", objectType);
+            map.put("objectId", objectId);
+            map.put("objectName", objectName);
 
             PageHelper.startPage(pageNum, pageSize);
             return ResponseMsgUtil.success(new PageInfo<>(highApproveService.getApproveList(map)));