|
|
|
@@ -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<WxFlowModel> 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<WxFlowModel> 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<WxFlowModel> flows = wxFlowService.getModelBybusiness(wxFlowModel); |
|
|
|
if (null != flows && flows.size() > 0) { |
|
|
|
|