ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 流程使用枚举

Browse Source
This commit is contained in:
lijiarao
2023-10-26 11:20:23 +08:00
parent c374ab9d65
commit e9b86e72c1
2 changed files with 3 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/controller/ActivitiController.java
-29
View File
@@ -212,35 +212,6 @@ public class ActivitiController {
}
@ApiOperation(value="签收任务")
@PostMapping("/claim")
public Result<Object> claim(@RequestBody Map<String,Object> map) {
String taskId = map.get("taskId").toString();
String userId = map.get("userId").toString();
taskService.claim(taskId, userId);
return Result.OK();
}
/**
* 加签
*/
@ApiOperation(value="加签/委托")
@GetMapping("/delegateTask")
public Result<Object> delegateTask(@RequestParam(value = "taskId") String taskId,
@RequestParam(value = "userId") String userId) {
taskService.delegateTask(taskId, userId);
return Result.OK();
}
@ApiOperation(value="解决委托")
@GetMapping("/resolveTask")
public Result<Object> resolveTask(@RequestParam(value = "taskId") String taskId) {
taskService.resolveTask(taskId);
return Result.OK();
}
@GetMapping(value = "/readResource")
@ApiOperation(value = "获取实时流程图", notes = "获取实时流程图,输出跟踪流程信息")
public void getFlowImgByInstanceId(@RequestParam(value = "processInstanceId") String
laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java
+3 -2
View File
@@ -8,6 +8,7 @@ import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.LoginUser;
import com.jero.modules.activiti.entity.ProcessAll;
import com.jero.modules.activiti.entity.ProcessApprovalRecord;
import com.jero.modules.activiti.enums.FinishFlagEnum;
import com.jero.modules.activiti.process.common.entity.ProcessDraft;
import com.jero.modules.activiti.process.common.service.ProcessDraftService;
import com.jero.modules.activiti.service.ProcessAllService;
@@ -59,7 +60,7 @@ public class WorkCenterController {
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = loginUser.getId();
queryWrapper.eq("par.user_id",userId);
queryWrapper.eq("par.finish_flag",0);
queryWrapper.eq("par.finish_flag", FinishFlagEnum.INCOMPLETE.getValue());
Page<ProcessAll> page = new Page<>(pageNo, pageSize);
IPage<ProcessAll> todoList = processAllService.getTodoList(page, queryWrapper);
@@ -76,7 +77,7 @@ public class WorkCenterController {
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = loginUser.getId();
queryWrapper.eq("par.user_id",userId);
queryWrapper.eq("par.finish_flag",1);
queryWrapper.eq("par.finish_flag",FinishFlagEnum.COMPLETE.getValue());
Page<ProcessAll> page = new Page<>(pageNo, pageSize);
IPage<ProcessAll> completedList = processAllService.getCompletedList(page, queryWrapper);