From 372ec3db64295a1dd8f7a9cf41812b1a73dee0b6 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Tue, 1 Sep 2020 09:28:43 +0800 Subject: [PATCH] fix contract --- .../contract/WxContractBaseController.java | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) 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 dcd84a800..bc33018d0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java @@ -51,13 +51,23 @@ public class WxContractBaseController extends BaseController{ return map; } + /** + * 租金+物业 跟着租金一起走 + * @param rpvo + * @return + */ protected boolean rentPropertyHasWorkFlow(WxRentPropertyContractVo rpvo) { WxFlowModel wxFlowModel = new WxFlowModel(); - if (rpvo.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) { - wxFlowModel.setFlowType(EnumFlowKey.NNEW_RENT_CONTRACT.getCode()); - }else if (rpvo.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) { - wxFlowModel.setFlowType(EnumFlowKey.NEW_RENT_POINT_CONTRACT.getCode()); - } +// if (rpvo.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) { +// wxFlowModel.setFlowType(EnumFlowKey.NNEW_RENT_CONTRACT.getCode()); +// }else if (rpvo.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) { +// wxFlowModel.setFlowType(EnumFlowKey.NEW_RENT_POINT_CONTRACT.getCode()); +// } + if (rpvo.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) { + wxFlowModel.setFlowType(EnumFlowKey.NNEW_RENT_CONTRACT.getCode()); + }else if (rpvo.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) { + wxFlowModel.setFlowType(EnumFlowKey.NEW_RENT_POINT_CONTRACT.getCode()); + } wxFlowModel.updateTenantInfo(rpvo); List flows = wxFlowService.getModelBybusiness(wxFlowModel); if (null != flows && flows.size() > 0) {