diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java index d1fed25b..649acafc 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java @@ -420,6 +420,31 @@ public class TodoTaskController extends BaseAction { // return WrapMapper.error("ESP 发送待办任务异常"); } + + @ApiOperation(value = "完成任务", notes = "流程单个节点任务,直接完成任务,外加部分特殊处理节点更改草稿内容") + @ApiImplicitParams({@ApiImplicitParam(name = "taskId", value = "任务id"), + @ApiImplicitParam(name = "userId", value = "完成任务用户Id")}) + @PostMapping("/completeTaskNew") + public Wrapper completeTaskByUserIdNew(@RequestBody BusMesSpecial busMes) { + BusMes busMes1=new BusMes(); + BeanUtils.copyProperties(busMes,busMes1); + QueryWrapper queryWrapper=new QueryWrapper<>(); + if (null!=busMes.getTaskId() && !busMes.getTaskId().isEmpty()){ + queryWrapper.eq("TASK_ID",busMes.getTaskId()); + }else { + queryWrapper.eq("TASK_ID",busMes.getTaskIds()); + } + BusProcessNew busProcessNew=iBusProcessNewService.getOne(queryWrapper); + if (null!=busMes.getSpecialJson()){ + QueryWrapper queryWrapper1=new QueryWrapper<>(); + queryWrapper1.eq("PRC_ID",busProcessNew.getPId()); + BusProcessName busProcessName=iBusProcessNameService.getOne(queryWrapper1); + busProcessName.setMes(busMes.getSpecialJson()); + iBusProcessNameService.update(busProcessName,queryWrapper1); + } + return this.completeTaskByUserId(busMes1); + } + private void completeOA(Task task){ } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/BusMesSpecial.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/BusMesSpecial.java new file mode 100644 index 00000000..1407fa0b --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/BusMesSpecial.java @@ -0,0 +1,119 @@ +package com.ydw.bat.wkflow.business_main.datas.entity; + +import lombok.Data; + +@Data +public class BusMesSpecial { + + private String userId; + + private String taskId; + + private String json; + + private String specialJson; + + private String taskIds; + + private String pId; + + private String prcType; + + private String createUser; + + private String createUserName; + + public String getDept() { + return dept; + } + + public void setDept(String dept) { + this.dept = dept; + } + + private String dept; + + private String userName; + + private String id; + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + + public String getJson() { + return json; + } + + public void setJson(String json) { + this.json = json; + } + + public String getTaskIds() { + return taskIds; + } + + public void setTaskIds(String taskIds) { + this.taskIds = taskIds; + } + + public String getpId() { + return pId; + } + + public void setpId(String pId) { + this.pId = pId; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getPrcType() { + return prcType; + } + + public void setPrcType(String prcType) { + this.prcType = prcType; + } + + public String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } +}