|
|
|
@@ -89,8 +89,8 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public void updateBusinessStatus(Map<String, Object> mapInfo,Integer applyStatus){ |
|
|
|
Long businessId = (Long)mapInfo.get("businessId"); |
|
|
|
Integer flowType = (Integer)mapInfo.get("businessType"); |
|
|
|
Long businessId = Long.parseLong((String)mapInfo.get("businessId")); |
|
|
|
Integer flowType = (Integer)mapInfo.get("flowType"); |
|
|
|
List<Map<String,String>> variables = (List)mapInfo.get("variables"); |
|
|
|
Boolean supplement = (Boolean)mapInfo.get("supplement"); |
|
|
|
Integer contractType = 0; |
|
|
|
@@ -137,7 +137,7 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
|
|
|
|
//终止租赁合同,同时终止物业合同 |
|
|
|
String endProperty = getVariableByKey(variables,"endProperty"); |
|
|
|
if("1".equals(endProperty)){ |
|
|
|
if("2".equals(endProperty)){ |
|
|
|
|
|
|
|
} |
|
|
|
// todo 账单失效 |
|
|
|
@@ -179,7 +179,7 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
MallUserInfo starterInfo = this.mallUserInfoService.getById(userId); |
|
|
|
map.put("starter", starterInfo); |
|
|
|
map.put("startTime",new Date().getTime()); |
|
|
|
map.put("businessId",businessId); |
|
|
|
map.put("businessId",businessId+""); |
|
|
|
map.put("flowType",flowType); |
|
|
|
map.put("taskAssignee",taskAssignee); |
|
|
|
map.put("variables",variables); |
|
|
|
@@ -188,6 +188,7 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(getFlowKeyByType(flowType), map); |
|
|
|
logger.debug("流程启动,流程id:{}",processInstance.getId()); |
|
|
|
|
|
|
|
params.put("flowType",flowType); |
|
|
|
updateBusinessStatus(params,EnumRentContractAppStatus.APPLYING.getCode()); |
|
|
|
|
|
|
|
// 保存wx_flow_record表审批记录 |
|
|
|
@@ -369,7 +370,7 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
taskName = task.getName(); |
|
|
|
taskKey = task.getTaskDefinitionKey(); |
|
|
|
Map<String,Object> mapInfo = taskService.getVariables(task.getId()); |
|
|
|
Long businessId = (Long)mapInfo.get("businessId"); |
|
|
|
Long businessId = Long.parseLong((String)mapInfo.get("businessId")); |
|
|
|
Integer flowType = (Integer)mapInfo.get("flowType"); |
|
|
|
taskService.complete(taskId); |
|
|
|
|
|
|
|
@@ -412,7 +413,7 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
wxMsgValidationcode.setTenantId(tenantId); |
|
|
|
MallUserInfo starter = (MallUserInfo)mapInfo.get("starter"); |
|
|
|
List<Map<String,String>> taskAssigneeList = (List)mapInfo.get("taskAssignee"); |
|
|
|
Long businessId = (Long)mapInfo.get("businessId"); |
|
|
|
Long businessId = Long.parseLong((String)mapInfo.get("businessId")); |
|
|
|
|
|
|
|
// 判断下个节点是否有设置审批人,没有,直接通过,有,发短信通知 |
|
|
|
if(!isEnded(processInstanceId)){ |
|
|
|
@@ -510,7 +511,6 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
|
|
|
|
// 修改合同审核状态为驳回 |
|
|
|
params.putAll(mapInfo); |
|
|
|
params.put("businessType",flowType); |
|
|
|
updateBusinessStatus(params,EnumRentContractAppStatus.REJECT.getCode()); |
|
|
|
|
|
|
|
//保存wx_flow_record表审批记录 |
|
|
|
@@ -568,7 +568,6 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
|
|
|
|
// 修改合同审核状态为撤回 |
|
|
|
params.putAll(mapInfo); |
|
|
|
params.put("businessType",flowType); |
|
|
|
updateBusinessStatus(params,EnumRentContractAppStatus.SETBACK.getCode()); |
|
|
|
|
|
|
|
//保存wx_flow_record表审批记录 |
|
|
|
|