| @@ -94,10 +94,10 @@ public class WxFlowServiceImpl implements WxFlowService { | |||||
| public void updateBusinessStatus(Map<String, Object> mapInfo,Integer applyStatus){ | public void updateBusinessStatus(Map<String, Object> mapInfo,Integer applyStatus){ | ||||
| Long businessId = Long.parseLong((String)mapInfo.get("businessId")); | Long businessId = Long.parseLong((String)mapInfo.get("businessId")); | ||||
| Integer flowType = (Integer)mapInfo.get("flowType"); | Integer flowType = (Integer)mapInfo.get("flowType"); | ||||
| List<Map<String,String>> variables = (List)mapInfo.get("variables"); | |||||
| List<Map<String,Object>> variables = (List)mapInfo.get("variables"); | |||||
| Boolean supplement = (Boolean)mapInfo.get("supplement"); | Boolean supplement = (Boolean)mapInfo.get("supplement"); | ||||
| Integer contractType = 0; | Integer contractType = 0; | ||||
| String str = getVariableByKey(variables,"contractType"); | |||||
| String str = (String)getVariableByKey(variables,"contractType"); | |||||
| if(StringUtils.isNotBlank(str)){ | if(StringUtils.isNotBlank(str)){ | ||||
| contractType = Integer.parseInt(str); | contractType = Integer.parseInt(str); | ||||
| } | } | ||||
| @@ -137,8 +137,8 @@ public class WxFlowServiceImpl implements WxFlowService { | |||||
| rent.setStatus(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()); | rent.setStatus(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()); | ||||
| //终止租赁合同,同时终止物业合同 | //终止租赁合同,同时终止物业合同 | ||||
| String endProperty = getVariableByKey(variables,"endProperty"); | |||||
| if(EnumEndProperty.END_RENT_AND_PROPERTY.getCode().toString().equals(endProperty)){ | |||||
| Integer endProperty = (Integer)getVariableByKey(variables,"endProperty"); | |||||
| if(EnumEndProperty.END_RENT_AND_PROPERTY.getCode().intValue() == endProperty.intValue()){ | |||||
| WxPropertyContract wxPropertyContract = new WxPropertyContract(); | WxPropertyContract wxPropertyContract = new WxPropertyContract(); | ||||
| wxPropertyContract.setRentContractId(businessId); | wxPropertyContract.setRentContractId(businessId); | ||||
| wxPropertyContract.setStatus(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()); | wxPropertyContract.setStatus(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()); | ||||
| @@ -179,7 +179,7 @@ public class WxFlowServiceImpl implements WxFlowService { | |||||
| Long businessId = Long.parseLong((String)params.get("businessId")); | Long businessId = Long.parseLong((String)params.get("businessId")); | ||||
| Integer flowType = (Integer)params.get("businessType"); | Integer flowType = (Integer)params.get("businessType"); | ||||
| List<Map<String,String>> taskAssignee = (List)params.get("taskAssignee"); | List<Map<String,String>> taskAssignee = (List)params.get("taskAssignee"); | ||||
| List<Map<String,String>> variables = (List)params.get("variables"); | |||||
| List<Map<String,Object>> variables = (List)params.get("variables"); | |||||
| Boolean supplement = (Boolean)params.get("supplement"); | Boolean supplement = (Boolean)params.get("supplement"); | ||||
| // 设置节点处理人 | // 设置节点处理人 | ||||
| @@ -263,10 +263,10 @@ public class WxFlowServiceImpl implements WxFlowService { | |||||
| taskInfoMap.put("taskId",task.getId()); | taskInfoMap.put("taskId",task.getId()); | ||||
| taskInfoMap.put("businessId",mapInfo.get("businessId")); | taskInfoMap.put("businessId",mapInfo.get("businessId")); | ||||
| taskInfoMap.put("businessType",mapInfo.get("flowType")); | taskInfoMap.put("businessType",mapInfo.get("flowType")); | ||||
| List<Map<String,String>> variables = (List)mapInfo.get("variables"); //定制variables,回传 | |||||
| List<Map<String,Object>> variables = (List)mapInfo.get("variables"); //定制variables,回传 | |||||
| if(CollectionUtils.isNotEmpty(variables)){ | if(CollectionUtils.isNotEmpty(variables)){ | ||||
| for (Map<String,String> m:variables) { | |||||
| taskInfoMap.put(m.get("key"),m.get("value")); | |||||
| for (Map<String,Object> m:variables) { | |||||
| taskInfoMap.put((String)m.get("key"),m.get("value")); | |||||
| } | } | ||||
| } | } | ||||
| result.add(taskInfoMap); | result.add(taskInfoMap); | ||||
| @@ -722,9 +722,9 @@ public class WxFlowServiceImpl implements WxFlowService { | |||||
| } | } | ||||
| } | } | ||||
| public static String getVariableByKey(List<Map<String,String>> variables,String key){ | |||||
| public static Object getVariableByKey(List<Map<String,Object>> variables,String key){ | |||||
| if(variables == null) return null; | if(variables == null) return null; | ||||
| for (Map<String,String> map:variables) { | |||||
| for (Map<String,Object> map:variables) { | |||||
| if(map.get("key").equals(key)){ | if(map.get("key").equals(key)){ | ||||
| return map.get("value"); | return map.get("value"); | ||||
| } | } | ||||