diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java index d5dfee682..6116698c2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java @@ -12,6 +12,7 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxFlowModel; import com.iformall.domain.po.WxPropertyContract; import com.iformall.domain.po.WxRentContract; +import com.iformall.domain.vo.WxRentPropertyContractVo; import com.iformall.enums.EnumContractOperationType; import com.iformall.enums.EnumFlowContractType; import com.iformall.enums.EnumFlowKey; @@ -48,6 +49,22 @@ public class WxContractBaseController extends BaseController{ return map; } + protected boolean rentPropertyHasWorkFlow(WxRentPropertyContractVo rpvo) { + WxFlowModel wxFlowModel = new WxFlowModel(); + if (rpvo.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) { + wxFlowModel.setFlowType(EnumFlowContractType.WHOLE_SHOP.getCode()); + }else if (rpvo.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) { + wxFlowModel.setFlowType(EnumFlowContractType.WHOLE_POINT.getCode()); + } + wxFlowModel.updateTenantInfo(rpvo); + List flows = wxFlowService.getModelBybusiness(wxFlowModel); + if (null != flows && flows.size() > 0) { + return true; + } + return false; + + } + protected boolean rentContractHasWorkFlow(WxRentContract wxRentContract) { WxFlowModel wxFlowModel = new WxFlowModel(); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java index bbcebeea6..c8eb9e245 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java @@ -39,7 +39,17 @@ public class WxRentPropertyContractController extends WxContractBaseController { wxRentPropertyContractVo = new WxRentPropertyContractVo(); } wxRentPropertyContractVo.updateTenantInfo(getTenantInfo()); - final PageInfo page = wxRentPropertyContractService.listContractVo(wxRentPropertyContractVo, pageNum, pageSize); + PageInfo page = wxRentPropertyContractService.listContractVo(wxRentPropertyContractVo, pageNum, pageSize); + if (null != page && null != page.getList()) { + for (WxRentPropertyContractVo wrc: page.getList()) { + if(rentPropertyHasWorkFlow(wrc)) { + wrc.setFlowHas(1); + }else { + wrc.setFlowHas(0); + } + } + } + return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java index ddccc227a..a4ee35a22 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java @@ -1,5 +1,6 @@ package com.iformall.domain.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -80,5 +81,8 @@ public class WxRentPropertyContractVo extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "联营扣点-时间范围 1年2月3周期", name = "busDiscountTime") private Integer busDiscountTime; + + @io.swagger.annotations.ApiModelProperty(value = "是否有工作流 1:有 0:无", name = "flowHas") + private Integer flowHas; } diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index ea85c90ae..8a0d3835e 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -516,6 +516,8 @@ + + @@ -540,7 +542,7 @@