[审批流][修改][添加审批类型判断]

mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java

@@ -134,7 +134,7 @@ public class WxFlowServiceImpl implements WxFlowService {
             contractType = Integer.parseInt(str);
         }
 
-        if(EnumFlowKey.CONTRACT.getCode().equals(flowType)){
+        if(EnumFlowKey.CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_RENT_CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_SHOP_CONTRACT.getCode().equals(flowType)){
             // 1租赁合同 2点位合同 3物业 4点位物业合同
             if(contractType.intValue() == 1 || contractType.intValue() == 2){
                 WxRentContract rent = new WxRentContract();
@@ -159,7 +159,7 @@ public class WxFlowServiceImpl implements WxFlowService {
                     wxPropertyContractService.updatePropertyContractStatus(businessId);
                 }
             }
-        }else if(EnumFlowKey.END_CONTRACT.getCode().equals(flowType)){
+        }else if(EnumFlowKey.END_CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_SHOP_END_CONTRACT.getCode().equals(flowType)){
             if(contractType.intValue() == 1 || contractType.intValue() == 2){
                 WxRentContract rent = new WxRentContract();
                 rent.setId(businessId);
@@ -206,7 +206,7 @@ public class WxFlowServiceImpl implements WxFlowService {
                 }
                 wxPropertyContractMapper.updateApplyStatus(wxPropertyContract);
             }
-        } else if (EnumFlowKey.BILL.getCode().equals(flowType)) {
+        } else if (EnumFlowKey.BILL.getCode().equals(flowType) || EnumFlowKey.NEW_BILL_CHANGE.getCode().equals(flowType)) {
             if(EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) {
                 //账单审批
                 Integer billType = (Integer) getVariableByKey(variables, "billType");