|
|
|
@@ -2,6 +2,7 @@ package com.iformall.service.impl; |
|
|
|
|
|
|
|
import com.github.pagehelper.PageHelper; |
|
|
|
import com.github.pagehelper.PageInfo; |
|
|
|
import com.iformall.common.ErrorCode; |
|
|
|
import com.iformall.common.Result; |
|
|
|
import com.iformall.common.ResultData; |
|
|
|
import com.iformall.domain.po.*; |
|
|
|
@@ -92,7 +93,7 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
rent.setApplyStatus(applyStatus); |
|
|
|
wxRentContractService.updateApplyStatus(rent); |
|
|
|
|
|
|
|
// 如果审批完成,而且是补录,修改状态 |
|
|
|
// 如果审批完成,而且是补录直接改为已签约状态(普通需要绑定商户才是已签约) |
|
|
|
if(supplement!=null && supplement && EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) { |
|
|
|
wxRentContractService.updateRentContractStatus(businessId); |
|
|
|
} |
|
|
|
@@ -252,6 +253,9 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
} |
|
|
|
String processInstanceId = resultList.get(0).getProcessInstanceId(); |
|
|
|
ProcessInstance pi = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult(); |
|
|
|
if(pi == null){ |
|
|
|
return new ResultData(ErrorCode.FLOW_INST_NOT_EXIST.getCode(), "任务不存在"); |
|
|
|
} |
|
|
|
Task task = taskService.createTaskQuery().processInstanceId(pi.getId()).singleResult(); |
|
|
|
Map<String,Object> mapInfo = taskService.getVariables(task.getId()); |
|
|
|
List<Map<String,String>> taskAssigneeList = (List)mapInfo.get("taskAssignee"); |
|
|
|
@@ -318,7 +322,7 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
|
|
|
|
Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); |
|
|
|
if (task == null) { |
|
|
|
throw new MallinkException(Result.ERROR, "流程不存在"); |
|
|
|
return new ResultData(ErrorCode.FLOW_INST_NOT_EXIST.getCode(), "任务不存在"); |
|
|
|
} |
|
|
|
taskName = task.getName(); |
|
|
|
taskKey = task.getTaskDefinitionKey(); |
|
|
|
@@ -464,7 +468,7 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
String taskKey; |
|
|
|
Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); |
|
|
|
if (task == null) { |
|
|
|
throw new MallinkException(Result.ERROR, "流程不存在"); |
|
|
|
return new ResultData(ErrorCode.FLOW_INST_NOT_EXIST.getCode(), "任务不存在"); |
|
|
|
} |
|
|
|
taskName = task.getName(); |
|
|
|
taskKey = task.getTaskDefinitionKey(); |
|
|
|
|