From 14497ea1d406d89de4ea8c3ef0c42a693cde47da Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Tue, 1 Sep 2020 09:55:15 +0800 Subject: [PATCH] fix contract --- .../contract/WxContractBaseController.java | 79 ++++++++++--------- .../java/com/iformall/enums/EnumFlowKey.java | 8 +- 2 files changed, 46 insertions(+), 41 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 bc33018d0..40631feba 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java @@ -51,11 +51,7 @@ 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()) { @@ -63,11 +59,11 @@ public class WxContractBaseController extends BaseController{ // }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.NEW_RENT_CONTRACT.getCode()); + }else if (rpvo.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) { + wxFlowModel.setFlowType(EnumFlowKey.NEW_SHOP_CONTRACT.getCode()); + } wxFlowModel.updateTenantInfo(rpvo); List flows = wxFlowService.getModelBybusiness(wxFlowModel); if (null != flows && flows.size() > 0) { @@ -79,20 +75,24 @@ public class WxContractBaseController extends BaseController{ protected boolean rentContractHasWorkFlow(WxRentContract wxRentContract) { WxFlowModel wxFlowModel = new WxFlowModel(); - - if(wxRentContract.getOperationType().intValue() == EnumContractOperationType.PART.getCode().intValue()) { - if (wxRentContract.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) { - wxFlowModel.setFlowType(EnumFlowKey.NEW_RENT_CONTRACT.getCode()); - }else if (wxRentContract.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) { - wxFlowModel.setFlowType(EnumFlowKey.NEW_SHOP_CONTRACT.getCode()); - } - }else { - if (wxRentContract.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) { - wxFlowModel.setFlowType(EnumFlowKey.NNEW_RENT_CONTRACT.getCode()); - }else if (wxRentContract.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) { - wxFlowModel.setFlowType(EnumFlowKey.NEW_RENT_POINT_CONTRACT.getCode()); - } - } + if (wxRentContract.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) { + wxFlowModel.setFlowType(EnumFlowKey.NEW_RENT_CONTRACT.getCode()); + }else if (wxRentContract.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) { + wxFlowModel.setFlowType(EnumFlowKey.NEW_SHOP_CONTRACT.getCode()); + } +// if(wxRentContract.getOperationType().intValue() == EnumContractOperationType.PART.getCode().intValue()) { +// if (wxRentContract.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) { +// wxFlowModel.setFlowType(EnumFlowKey.NEW_RENT_CONTRACT.getCode()); +// }else if (wxRentContract.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) { +// wxFlowModel.setFlowType(EnumFlowKey.NEW_SHOP_CONTRACT.getCode()); +// } +// }else { +// if (wxRentContract.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) { +// wxFlowModel.setFlowType(EnumFlowKey.NNEW_RENT_CONTRACT.getCode()); +// }else if (wxRentContract.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) { +// wxFlowModel.setFlowType(EnumFlowKey.NEW_RENT_POINT_CONTRACT.getCode()); +// } +// } wxFlowModel.updateTenantInfo(wxRentContract); List flows = wxFlowService.getModelBybusiness(wxFlowModel); if (null != flows && flows.size() > 0) { @@ -103,19 +103,24 @@ public class WxContractBaseController extends BaseController{ protected boolean propertyContractHasWorkFlow(WxPropertyContract wxPropertyContract) { WxFlowModel wxFlowModel = new WxFlowModel(); - if(wxPropertyContract.getOperationType().intValue() == EnumContractOperationType.PART.getCode().intValue()) { - if (wxPropertyContract.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) { - wxFlowModel.setFlowType(EnumFlowKey.NEW_PRO_CONTRACT.getCode()); - }else if (wxPropertyContract.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) { - wxFlowModel.setFlowType(EnumFlowKey.NEW_PRO_POINT_CONTRACT.getCode()); - } - }else { - if (wxPropertyContract.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) { - wxFlowModel.setFlowType(EnumFlowKey.NNEW_RENT_CONTRACT.getCode()); - }else if (wxPropertyContract.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) { - wxFlowModel.setFlowType(EnumFlowKey.NEW_RENT_POINT_CONTRACT.getCode()); - } - } + if (wxPropertyContract.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) { + wxFlowModel.setFlowType(EnumFlowKey.NEW_PRO_CONTRACT.getCode()); + }else if (wxPropertyContract.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) { + wxFlowModel.setFlowType(EnumFlowKey.NEW_PRO_POINT_CONTRACT.getCode()); + } +// if(wxPropertyContract.getOperationType().intValue() == EnumContractOperationType.PART.getCode().intValue()) { +// if (wxPropertyContract.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) { +// wxFlowModel.setFlowType(EnumFlowKey.NEW_PRO_CONTRACT.getCode()); +// }else if (wxPropertyContract.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) { +// wxFlowModel.setFlowType(EnumFlowKey.NEW_PRO_POINT_CONTRACT.getCode()); +// } +// }else { +// if (wxPropertyContract.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) { +// wxFlowModel.setFlowType(EnumFlowKey.NNEW_RENT_CONTRACT.getCode()); +// }else if (wxPropertyContract.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) { +// wxFlowModel.setFlowType(EnumFlowKey.NEW_RENT_POINT_CONTRACT.getCode()); +// } +// } wxFlowModel.updateTenantInfo(wxPropertyContract); List flows = wxFlowService.getModelBybusiness(wxFlowModel); if (null != flows && flows.size() > 0) { diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java b/mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java index 80fc582a8..b44e815fb 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java @@ -26,10 +26,10 @@ public enum EnumFlowKey { NEW_PRO_POINT_CONTRACT(15, "多经点位物业合同签约"), NEW_PRO_POINT_CONTRACT_END(16, "多经点位物业合同终止"), - NNEW_RENT_CONTRACT(17, "商铺租金+物业合同签约"), - NEW_RENT_END(18, "商铺租金+物业合同合同终止"), - NEW_RENT_POINT_CONTRACT(19, "多经点位商铺租金+物业合同签约"), - NEW_RENT_POINT_CONTRACT_END(20, "多经点位商铺租金+物业合同终止"), + NNEW_RENT_CONTRACT(17, "商铺租金+物业合同签约【不再使用】"), + NEW_RENT_END(18, "商铺租金+物业合同合同终止【不再使用】"), + NEW_RENT_POINT_CONTRACT(19, "多经点位商铺租金+物业合同签约【不再使用】"), + NEW_RENT_POINT_CONTRACT_END(20, "多经点位商铺租金+物业合同终止【不再使用】"), SETTLE(21,"结算单审批"), ;