diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java index c2e7cbc85..8139bdd32 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java @@ -105,7 +105,6 @@ public class WxFlowAbleController extends BaseController { return new ResultData(pageInfo); } - /** * 审批历史 */ diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java index bd86e526f..e7f6444a3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java @@ -61,6 +61,9 @@ public class WxFlowRecord implements Serializable { @Transient private Integer taskType; + //coupon 操作类型 + @Transient + private Integer approvalType; public WxFlowRecord(){} public WxFlowRecord(Long businessId){ @@ -74,4 +77,9 @@ public class WxFlowRecord implements Serializable { this.businessId = businessId; this.tenantId = tenantId; } + public WxFlowRecord(Long businessId,String tenantId,Integer approvalType){ + this.businessId = businessId; + this.tenantId = tenantId; + this.approvalType = approvalType; + } } diff --git a/mallinkService/src/main/java/com/iformall/service/WxFlowService.java b/mallinkService/src/main/java/com/iformall/service/WxFlowService.java index 04a9a44e5..9bae8b461 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxFlowService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxFlowService.java @@ -49,9 +49,6 @@ public interface WxFlowService { */ ResultData applyHistory(Long businessId,String tenantId); - - ResultData applyHistoryForCoupon(Long couponId,String tenantId); - /** * 审批 * @param params diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index f47fd8683..57aed2b56 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -549,7 +549,18 @@ public class WxFlowServiceImpl implements WxFlowService { @Override public ResultData applyHistory(Long businessId,String tenantId) { - List result = wxFlowRecordService.findList(new WxFlowRecord(businessId,tenantId)); + List result; + WxCoupon query = new WxCoupon(); + query.setTenantId(tenantId); + query.setId(businessId); + List couponList = wxCouponMapper.findCouponList(query); + if(CollectionUtils.isNotEmpty(couponList)) { + WxCoupon coupon = couponList.get(0); + result = wxFlowRecordService.findList(new WxFlowRecord(businessId,tenantId,coupon.getApprovalType())); + }else{ + result = wxFlowRecordService.findList(new WxFlowRecord(businessId,tenantId)); + } + if(CollectionUtils.isNotEmpty(result)){ String processInstanceId = result.get(0).getProcessInstanceId(); List mallUserInfoList = getUserByProcessInstanceId(processInstanceId); @@ -570,13 +581,6 @@ public class WxFlowServiceImpl implements WxFlowService { return new ResultData(result); } - @Override - public ResultData applyHistoryForCoupon(Long couponId, String tenantId) { - - - return null; - } - @Override public ResultData getTaskStatusList(Long businessId, String tenantId) { List resultList = wxFlowRecordService.findList(new WxFlowRecord(businessId,tenantId)); diff --git a/mallinkService/src/main/resources/mapper/WxFlowRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxFlowRecordMapper.xml index 6ea8aceb8..03a7e65c1 100644 --- a/mallinkService/src/main/resources/mapper/WxFlowRecordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFlowRecordMapper.xml @@ -57,6 +57,9 @@ #{idItem} + + and json_extract(variables,'$.approvalType') = #{approvalType} + order by create_date desc