From b0d9b61cb38170e31ab490dad1fb9eb4f159849f Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 20 Feb 2019 14:29:12 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=A1=E6=89=B9=E6=B5=81][=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0][=E6=B7=BB=E5=8A=A0=E5=90=88=E5=90=8C=E6=8F=90?= =?UTF-8?q?=E5=89=8D=E7=BB=88=E6=AD=A2=E5=AE=A1=E6=89=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxFlowServiceImpl.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) 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 48a2b0f98..49c413c70 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -94,10 +94,10 @@ public class WxFlowServiceImpl implements WxFlowService { public void updateBusinessStatus(Map mapInfo,Integer applyStatus){ Long businessId = Long.parseLong((String)mapInfo.get("businessId")); Integer flowType = (Integer)mapInfo.get("flowType"); - List> variables = (List)mapInfo.get("variables"); + List> variables = (List)mapInfo.get("variables"); Boolean supplement = (Boolean)mapInfo.get("supplement"); Integer contractType = 0; - String str = getVariableByKey(variables,"contractType"); + String str = (String)getVariableByKey(variables,"contractType"); if(StringUtils.isNotBlank(str)){ contractType = Integer.parseInt(str); } @@ -137,8 +137,8 @@ public class WxFlowServiceImpl implements WxFlowService { 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.setRentContractId(businessId); wxPropertyContract.setStatus(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()); @@ -179,7 +179,7 @@ public class WxFlowServiceImpl implements WxFlowService { Long businessId = Long.parseLong((String)params.get("businessId")); Integer flowType = (Integer)params.get("businessType"); List> taskAssignee = (List)params.get("taskAssignee"); - List> variables = (List)params.get("variables"); + List> variables = (List)params.get("variables"); Boolean supplement = (Boolean)params.get("supplement"); // 设置节点处理人 @@ -263,10 +263,10 @@ public class WxFlowServiceImpl implements WxFlowService { taskInfoMap.put("taskId",task.getId()); taskInfoMap.put("businessId",mapInfo.get("businessId")); taskInfoMap.put("businessType",mapInfo.get("flowType")); - List> variables = (List)mapInfo.get("variables"); //定制variables,回传 + List> variables = (List)mapInfo.get("variables"); //定制variables,回传 if(CollectionUtils.isNotEmpty(variables)){ - for (Map m:variables) { - taskInfoMap.put(m.get("key"),m.get("value")); + for (Map m:variables) { + taskInfoMap.put((String)m.get("key"),m.get("value")); } } result.add(taskInfoMap); @@ -722,9 +722,9 @@ public class WxFlowServiceImpl implements WxFlowService { } } - public static String getVariableByKey(List> variables,String key){ + public static Object getVariableByKey(List> variables,String key){ if(variables == null) return null; - for (Map map:variables) { + for (Map map:variables) { if(map.get("key").equals(key)){ return map.get("value"); }