diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 2e1b3e9a6..84e170f41 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -139,7 +139,7 @@ public class WxFlowServiceImpl implements WxFlowService { //终止租赁合同,同时终止物业合同 Integer endProperty = (Integer)getVariableByKey(variables,"endProperty"); - if(EnumEndProperty.END_RENT_AND_PROPERTY.getCode().intValue() == endProperty.intValue()){ + if(endProperty!=null && EnumEndProperty.END_RENT_AND_PROPERTY.getCode().intValue() == endProperty.intValue()){ WxPropertyContract wxPropertyContract = new WxPropertyContract(); wxPropertyContract.setRentContractId(businessId); wxPropertyContract.setStatus(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()); @@ -395,7 +395,7 @@ public class WxFlowServiceImpl implements WxFlowService { taskName = task.getName(); taskKey = task.getTaskDefinitionKey(); Map mapInfo = taskService.getVariables(task.getId()); - Long businessId = Long.parseLong((String)mapInfo.get("businessId")); + Long businessId = Long.parseLong(mapInfo.get("businessId").toString()); Integer flowType = (Integer)mapInfo.get("flowType"); taskService.complete(taskId); diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index 92c8ceacf..2452b0f86 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -183,6 +183,7 @@ update wx_property_contract set apply_status=#{applyStatus} ,business_type=#{businessType} + ,status=#{status} where id=#{id} diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 6fa24edc5..47fbce12f 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -170,6 +170,7 @@ update wx_rent_contract set apply_status=#{applyStatus} ,business_type=#{businessType} + ,status=#{status} where id=#{id}