From 60f5f3b5308195e51c53d9a2912052abcb7d7f51 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Thu, 10 Sep 2020 18:34:19 +0800 Subject: [PATCH] fix flow --- .../com/iformall/controller/WxCouponController.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java index 41660ac40..bd88b6928 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -145,9 +145,13 @@ public class WxCouponController extends BaseController { return hasFlow(EnumFlowKey.B_COUPON_MERCHANT_CREATE,getTenantInfo()); } - @ApiOperation("查询是否有审批流程") - @PostMapping("hasFlow") - public ResultData hasFlow() { + @ApiOperation("审批历史") + @GetMapping("flowHistory") + @ApiImplicitParams({ + @ApiImplicitParam(name = "couponId", value = "编号", dataType = "Long", paramType = "query", required = true)}) + public ResultData flowHistory(Long couponId) { + //wxFlowService.getModelBybusiness(wxFlowModel) + if (hasMerchantCouponFlow()) { return new ResultData(1); }else { @@ -173,7 +177,7 @@ public class WxCouponController extends BaseController { return new ResultData(Result.ERROR,EnumFlowKey.B_COUPON_MERCHANT_CREATE.getMessage()+"未配置审批流程"); } WxMerchantBUser buser = getUser(); - wxFlowService.start(generateFlowParams(EnumFlowKey.B_COUPON_MERCHANT_CREATE,EnumCouponAppType.PUT,wxCoupon,wxCoupon.getRemark(), buser.getPhone()), getBuserId(), buser.getName(), wxCoupon); + wxFlowService.start(generateFlowParams(EnumFlowKey.B_COUPON_MERCHANT_CREATE,EnumCouponAppType.PUT,coupon,wxCoupon.getRemark(), buser.getPhone()), getBuserId(), buser.getName(), coupon); return new ResultData(Result.SUCCESS,"提交审批成功"); }