Explorar el Código

fix contract

release_toaliyun_real
xiaohanzi hace 5 años
padre
commit
c465b8e9fd
Se han modificado 2 ficheros con 14 adiciones y 14 borrados
  1. +10
    -10
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java
  2. +4
    -4
      mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java

+ 10
- 10
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java Ver fichero

@@ -52,9 +52,9 @@ public class WxContractBaseController extends BaseController{
protected boolean rentPropertyHasWorkFlow(WxRentPropertyContractVo rpvo) {
WxFlowModel wxFlowModel = new WxFlowModel();
if (rpvo.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) {
wxFlowModel.setFlowType(EnumFlowContractType.WHOLE_SHOP.getCode());
wxFlowModel.setFlowType(EnumFlowKey.NNEW_RENT_CONTRACT.getCode());
}else if (rpvo.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) {
wxFlowModel.setFlowType(EnumFlowContractType.WHOLE_POINT.getCode());
wxFlowModel.setFlowType(EnumFlowKey.NEW_RENT_POINT_CONTRACT.getCode());
}
wxFlowModel.updateTenantInfo(rpvo);
List<WxFlowModel> flows = wxFlowService.getModelBybusiness(wxFlowModel);
@@ -70,15 +70,15 @@ public class WxContractBaseController extends BaseController{
if(wxRentContract.getOperationType().intValue() == EnumContractOperationType.PART.getCode().intValue()) {
if (wxRentContract.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) {
wxFlowModel.setFlowType(EnumFlowContractType.RENT.getCode());
wxFlowModel.setFlowType(EnumFlowKey.NEW_RENT_CONTRACT.getCode());
}else if (wxRentContract.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) {
wxFlowModel.setFlowType(EnumFlowContractType.RENT_POINT.getCode());
wxFlowModel.setFlowType(EnumFlowKey.NEW_SHOP_CONTRACT.getCode());
}
}else {
if (wxRentContract.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) {
wxFlowModel.setFlowType(EnumFlowContractType.WHOLE_SHOP.getCode());
wxFlowModel.setFlowType(EnumFlowKey.NNEW_RENT_CONTRACT.getCode());
}else if (wxRentContract.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) {
wxFlowModel.setFlowType(EnumFlowContractType.WHOLE_POINT.getCode());
wxFlowModel.setFlowType(EnumFlowKey.NEW_RENT_POINT_CONTRACT.getCode());
}
}
wxFlowModel.updateTenantInfo(wxRentContract);
@@ -93,15 +93,15 @@ public class WxContractBaseController extends BaseController{
WxFlowModel wxFlowModel = new WxFlowModel();
if(wxPropertyContract.getOperationType().intValue() == EnumContractOperationType.PART.getCode().intValue()) {
if (wxPropertyContract.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) {
wxFlowModel.setFlowType(EnumFlowContractType.PROPERTY.getCode());
wxFlowModel.setFlowType(EnumFlowKey.NEW_PRO_CONTRACT.getCode());
}else if (wxPropertyContract.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) {
wxFlowModel.setFlowType(EnumFlowContractType.PROPERTY_POINT.getCode());
wxFlowModel.setFlowType(EnumFlowKey.NEW_PRO_POINT_CONTRACT.getCode());
}
}else {
if (wxPropertyContract.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) {
wxFlowModel.setFlowType(EnumFlowContractType.WHOLE_SHOP.getCode());
wxFlowModel.setFlowType(EnumFlowKey.NNEW_RENT_CONTRACT.getCode());
}else if (wxPropertyContract.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) {
wxFlowModel.setFlowType(EnumFlowContractType.WHOLE_POINT.getCode());
wxFlowModel.setFlowType(EnumFlowKey.NEW_RENT_POINT_CONTRACT.getCode());
}
}
wxFlowModel.updateTenantInfo(wxPropertyContract);


+ 4
- 4
mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java Ver fichero

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


Cargando…
Cancelar
Guardar