Просмотр исходного кода

Merge branch 'release_toaliyun_real' into release_real_200809

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
e57a52fefb
2 измененных файлов: 46 добавлений и 41 удалений
  1. +42
    -37
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java
  2. +4
    -4
      mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java

+ 42
- 37
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<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) {


+ 4
- 4
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,"结算单审批"),
;


Загрузка…
Отмена
Сохранить