Browse Source

[审批流][添加][添加合同提前终止审批]

release_toaliyun_real
luozukai 7 years ago
parent
commit
34b6f181dd
3 changed files with 14 additions and 9 deletions
  1. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxFlowService.java
  3. +11
    -6
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java

+ 2
- 2
mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java View File

@@ -40,9 +40,9 @@ public class WxFlowAbleController extends BaseController {
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "flowType", value = "流程类型,1合同流程 2账单流程", dataType = "int", paramType = "query", required = true)
@ApiImplicitParam(name = "flowType", value = "流程类型,1合同流程 2账单流程", dataType = "string", paramType = "query", required = true)
}) })
public ResultData list(Integer flowType,Integer pageNum, Integer pageSize) {
public ResultData list(String flowType,Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] FlowAbleController::list"); logger.debug("[" + getIpAddr() + "] FlowAbleController::list");
return wxFlowService.list(flowType,pageNum,pageSize,super.getUser().getId()); return wxFlowService.list(flowType,pageNum,pageSize,super.getUser().getId());
} }


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxFlowService.java View File

@@ -37,7 +37,7 @@ public interface WxFlowService {
* @param pageSize * @param pageSize
* @return * @return
*/ */
ResultData list(Integer flowType,Integer pageNum, Integer pageSize,Long userId);
ResultData list(String flowType,Integer pageNum, Integer pageSize,Long userId);


/** /**
* 审批历史 * 审批历史


+ 11
- 6
mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java View File

@@ -23,6 +23,7 @@ import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.identitylink.api.IdentityLink; import org.flowable.identitylink.api.IdentityLink;
import org.flowable.image.ProcessDiagramGenerator; import org.flowable.image.ProcessDiagramGenerator;
import org.flowable.task.api.Task; import org.flowable.task.api.Task;
import org.flowable.task.api.TaskQuery;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -222,10 +223,14 @@ public class WxFlowServiceImpl implements WxFlowService {
} }


@Override @Override
public ResultData list(Integer flowType, Integer pageNum, Integer pageSize,Long userId) {
String flowKey = getFlowKeyByType(flowType);
int total = taskService.createTaskQuery().processDefinitionKey(flowKey)
.taskCandidateUser(userId.toString()).list().size();
public ResultData list(String flowType, Integer pageNum, Integer pageSize,Long userId) {
List<String> definitionKeyList = new ArrayList<>();
for (String ft:flowType.split(",")) {
definitionKeyList.add(getFlowKeyByType(Integer.parseInt(ft)));
}
TaskQuery taskQuery = taskService.createTaskQuery();
taskQuery.processDefinitionKeyIn(definitionKeyList);
int total = taskQuery.taskCandidateUser(userId.toString()).list().size();
int pages; int pages;
if(total % pageSize == 0){ if(total % pageSize == 0){
pages = total / pageSize; pages = total / pageSize;
@@ -233,8 +238,7 @@ public class WxFlowServiceImpl implements WxFlowService {
pages = total / pageSize +1; pages = total / pageSize +1;
} }


List<Task> tasks = taskService.createTaskQuery().processDefinitionKey(flowKey)
.taskCandidateUser(userId.toString()).orderByTaskCreateTime().desc()
List<Task> tasks = taskQuery.orderByTaskCreateTime().desc()
.listPage((pageNum -1) * pageSize,pageSize); .listPage((pageNum -1) * pageSize,pageSize);
List<Map<String,Object>> result = new ArrayList<>(); List<Map<String,Object>> result = new ArrayList<>();


@@ -247,6 +251,7 @@ public class WxFlowServiceImpl implements WxFlowService {
taskInfoMap.put("processInstanceId",task.getProcessInstanceId()); taskInfoMap.put("processInstanceId",task.getProcessInstanceId());
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"));
List<Map<String,String>> variables = (List)mapInfo.get("variables"); //定制variables,回传 List<Map<String,String>> variables = (List)mapInfo.get("variables"); //定制variables,回传
if(CollectionUtils.isNotEmpty(variables)){ if(CollectionUtils.isNotEmpty(variables)){
for (Map<String,String> m:variables) { for (Map<String,String> m:variables) {


Loading…
Cancel
Save