add 通用转办接口
This commit is contained in:
+7
-4
@@ -10,6 +10,7 @@ import com.jero.modules.activiti.entity.ProcessApprovalRecord;
|
|||||||
import com.jero.modules.activiti.enums.FinishFlagEnum;
|
import com.jero.modules.activiti.enums.FinishFlagEnum;
|
||||||
import com.jero.modules.activiti.process.common.entity.ProcessDraft;
|
import com.jero.modules.activiti.process.common.entity.ProcessDraft;
|
||||||
import com.jero.modules.activiti.process.common.service.ProcessDraftService;
|
import com.jero.modules.activiti.process.common.service.ProcessDraftService;
|
||||||
|
import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
|
||||||
import com.jero.modules.activiti.service.ProcessAllService;
|
import com.jero.modules.activiti.service.ProcessAllService;
|
||||||
import com.jero.modules.activiti.service.ProcessApprovalRecordService;
|
import com.jero.modules.activiti.service.ProcessApprovalRecordService;
|
||||||
import com.jero.modules.activiti.vo.DelegateTaskParam;
|
import com.jero.modules.activiti.vo.DelegateTaskParam;
|
||||||
@@ -44,6 +45,8 @@ public class WorkCenterController {
|
|||||||
private ProcessDraftService processDraftService;
|
private ProcessDraftService processDraftService;
|
||||||
@Resource
|
@Resource
|
||||||
private ProcessApprovalRecordService processApprovalRecordService;
|
private ProcessApprovalRecordService processApprovalRecordService;
|
||||||
|
@Resource
|
||||||
|
private IProcessHandleService processHandleService;
|
||||||
|
|
||||||
@ApiOperation(value = "查询待办流程列表")
|
@ApiOperation(value = "查询待办流程列表")
|
||||||
@GetMapping("/getTodoList")
|
@GetMapping("/getTodoList")
|
||||||
@@ -178,12 +181,12 @@ public class WorkCenterController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 转签
|
* 转办
|
||||||
*/
|
*/
|
||||||
@ApiOperation(value="转签")
|
@ApiOperation(value="转办")
|
||||||
@PostMapping("/transferTask")
|
@PostMapping("/transfer")
|
||||||
public Result<Object> transferTask(@RequestBody DelegateTaskParam param) {
|
public Result<Object> transferTask(@RequestBody DelegateTaskParam param) {
|
||||||
processAllService.transferTask(param);
|
processHandleService.transfer(param.getTaskId(), param.getUserId());
|
||||||
return Result.OK();
|
return Result.OK();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -154,17 +154,4 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
|
|||||||
approvalRecordService.update(updateWrapper1);
|
approvalRecordService.update(updateWrapper1);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void transferTask(DelegateTaskParam param) {
|
|
||||||
String taskId = param.getTaskId();
|
|
||||||
String userId = param.getUserId();
|
|
||||||
//获取审批(未完成的任务id是之前的)
|
|
||||||
ProcessApprovalRecord approvalRecord = approvalRecordService.getToDoByTaskId(taskId);
|
|
||||||
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
||||||
|
|
||||||
LambdaUpdateWrapper<ProcessApprovalRecord> updateWrapper = new LambdaUpdateWrapper<>();
|
|
||||||
updateWrapper.eq(ProcessApprovalRecord::getId, approvalRecord.getId());
|
|
||||||
updateWrapper.set(ProcessApprovalRecord::getTransferBy,loginUser.getId());
|
|
||||||
updateWrapper.set(ProcessApprovalRecord::getUserId,userId);
|
|
||||||
approvalRecordService.update(updateWrapper);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user