|
|
@@ -93,17 +93,18 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
*/ |
|
|
*/ |
|
|
@Override |
|
|
@Override |
|
|
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(mapInfo.get("businessId").toString()); |
|
|
Integer flowType = (Integer)mapInfo.get("flowType"); |
|
|
Integer flowType = (Integer)mapInfo.get("flowType"); |
|
|
List<Map<String,Object>> 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;// 1租赁合同2点位合同3物业合同4点位物业合同 |
|
|
|
|
|
|
|
|
Integer contractType = 0; |
|
|
String str = (String)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); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if(1 == flowType){ |
|
|
if(1 == flowType){ |
|
|
|
|
|
// 1租赁合同 2点位合同 3物业 4点位物业合同 |
|
|
if(contractType.intValue() == 1 || contractType.intValue() == 2){ |
|
|
if(contractType.intValue() == 1 || contractType.intValue() == 2){ |
|
|
WxRentContract rent = new WxRentContract(); |
|
|
WxRentContract rent = new WxRentContract(); |
|
|
rent.setId(businessId); |
|
|
rent.setId(businessId); |
|
|
@@ -177,7 +178,7 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
@Transactional(propagation = Propagation.REQUIRED,rollbackFor = {Exception.class}) |
|
|
@Transactional(propagation = Propagation.REQUIRED,rollbackFor = {Exception.class}) |
|
|
public ResultData start(Map<String, Object> params,Long userId,String userName,String tenantId) { |
|
|
public ResultData start(Map<String, Object> params,Long userId,String userName,String tenantId) { |
|
|
String remark = (String)params.get("remark"); |
|
|
String remark = (String)params.get("remark"); |
|
|
Long businessId = Long.parseLong((String)params.get("businessId")); |
|
|
|
|
|
|
|
|
Long businessId = Long.parseLong(params.get("businessId").toString()); |
|
|
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,Object>> variables = (List)params.get("variables"); |
|
|
List<Map<String,Object>> variables = (List)params.get("variables"); |
|
|
@@ -438,7 +439,7 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
wxMsgValidationcode.setTenantId(tenantId); |
|
|
wxMsgValidationcode.setTenantId(tenantId); |
|
|
MallUserInfo starter = (MallUserInfo)mapInfo.get("starter"); |
|
|
MallUserInfo starter = (MallUserInfo)mapInfo.get("starter"); |
|
|
List<Map<String,String>> taskAssigneeList = (List)mapInfo.get("taskAssignee"); |
|
|
List<Map<String,String>> taskAssigneeList = (List)mapInfo.get("taskAssignee"); |
|
|
Long businessId = Long.parseLong((String)mapInfo.get("businessId")); |
|
|
|
|
|
|
|
|
Long businessId = Long.parseLong(mapInfo.get("businessId").toString()); |
|
|
|
|
|
|
|
|
// 判断下个节点是否有设置审批人,没有,直接通过,有,发短信通知 |
|
|
// 判断下个节点是否有设置审批人,没有,直接通过,有,发短信通知 |
|
|
if(!isEnded(processInstanceId)){ |
|
|
if(!isEnded(processInstanceId)){ |
|
|
@@ -520,7 +521,7 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
|
|
|
|
|
Task task = taskService.createTaskQuery().processInstanceId(processInstanceId).singleResult(); |
|
|
Task task = taskService.createTaskQuery().processInstanceId(processInstanceId).singleResult(); |
|
|
Map<String,Object> mapInfo = taskService.getVariables(task.getId()); |
|
|
Map<String,Object> 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"); |
|
|
Integer flowType = (Integer)mapInfo.get("flowType"); |
|
|
MallUserInfo starter = (MallUserInfo)mapInfo.get("starter"); |
|
|
MallUserInfo starter = (MallUserInfo)mapInfo.get("starter"); |
|
|
|
|
|
|
|
|
@@ -576,7 +577,7 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
|
|
|
|
|
Task task = taskService.createTaskQuery().processInstanceId(processInstanceId).singleResult(); |
|
|
Task task = taskService.createTaskQuery().processInstanceId(processInstanceId).singleResult(); |
|
|
Map<String,Object> mapInfo = taskService.getVariables(task.getId()); |
|
|
Map<String,Object> 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"); |
|
|
Integer flowType = (Integer)mapInfo.get("flowType"); |
|
|
|
|
|
|
|
|
String taskName; |
|
|
String taskName; |
|
|
|