Merge branch 'dev' of http://139.159.177.244:3000/hurui/hai-server into dev

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")
+@RequestMapping(value = "/audit")
-@Api(value = "卡卷接口")
+@Api(value = "审核接口")
 public class HighApproveController {
 
     private static Logger log = LoggerFactory.getLogger(HighApproveController.class);
@@ -100,7 +100,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) {
@@ -114,7 +114,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()));
             }
 
@@ -126,7 +126,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,
@@ -139,9 +139,9 @@ public class HighApproveController {
 
             Map<String, Object> map = new HashMap<>();
             map.put("approveSerialNo", approveSerialNo);
-            map.put("objectType", approveSerialNo);
+            map.put("objectType", objectType);
-            map.put("objectId", approveSerialNo);
+            map.put("objectId", objectId);
-            map.put("objectName", approveSerialNo);
+            map.put("objectName", objectName);
 
             PageHelper.startPage(pageNum, pageSize);
             return ResponseMsgUtil.success(new PageInfo<>(highApproveService.getApproveList(map)));