|
|
@ -42,8 +42,8 @@ import java.util.Map; |
|
|
|
* @Date 2021/3/16 |
|
|
|
* @Date 2021/3/16 |
|
|
|
**/ |
|
|
|
**/ |
|
|
|
@Controller |
|
|
|
@Controller |
|
|
|
@RequestMapping(value = "/coupon") |
|
|
|
@RequestMapping(value = "/audit") |
|
|
|
@Api(value = "卡卷接口") |
|
|
|
@Api(value = "审核接口") |
|
|
|
public class HighApproveController { |
|
|
|
public class HighApproveController { |
|
|
|
|
|
|
|
|
|
|
|
private static Logger log = LoggerFactory.getLogger(HighApproveController.class); |
|
|
|
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 |
|
|
|
@ResponseBody |
|
|
|
@ApiOperation(value = "查询审批详情") |
|
|
|
@ApiOperation(value = "查询审批详情") |
|
|
|
public ResponseData getApproveDetail(@RequestParam(name = "approveId", required = true) Long approveId) { |
|
|
|
public ResponseData getApproveDetail(@RequestParam(name = "approveId", required = true) Long approveId) { |
|
|
@ -113,7 +113,7 @@ public class HighApproveController { |
|
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
|
map.put("approve", approve); |
|
|
|
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())); |
|
|
|
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 |
|
|
|
@ResponseBody |
|
|
|
@ApiOperation(value = "查询审批列表") |
|
|
|
@ApiOperation(value = "查询审批列表") |
|
|
|
public ResponseData getApproveList(@RequestParam(name = "approveSerialNo", required = false) String approveSerialNo, |
|
|
|
public ResponseData getApproveList(@RequestParam(name = "approveSerialNo", required = false) String approveSerialNo, |
|
|
@ -138,9 +138,9 @@ public class HighApproveController { |
|
|
|
|
|
|
|
|
|
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
|
map.put("approveSerialNo", approveSerialNo); |
|
|
|
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); |
|
|
|
PageHelper.startPage(pageNum, pageSize); |
|
|
|
return ResponseMsgUtil.success(new PageInfo<>(highApproveService.getApproveList(map))); |
|
|
|
return ResponseMsgUtil.success(new PageInfo<>(highApproveService.getApproveList(map))); |
|
|
|