|
@@ -2,6 +2,7 @@ package com.common.workflow.web.rest;
|
|
|
|
|
|
|
|
import com.common.workflow.service.activiti.ActivitiService;
|
|
import com.common.workflow.service.activiti.ActivitiService;
|
|
|
import com.common.workflow.service.dto.ActiHistoricTaskDTO;
|
|
import com.common.workflow.service.dto.ActiHistoricTaskDTO;
|
|
|
|
|
+import com.common.workflow.service.dto.ActiMyTaskDTO;
|
|
|
import com.common.workflow.web.rest.vm.ActiCompleteVM;
|
|
import com.common.workflow.web.rest.vm.ActiCompleteVM;
|
|
|
import com.common.workflow.web.rest.vm.ActiMyTaskVM;
|
|
import com.common.workflow.web.rest.vm.ActiMyTaskVM;
|
|
|
import com.common.workflow.web.rest.vm.ActiProcessVM;
|
|
import com.common.workflow.web.rest.vm.ActiProcessVM;
|
|
@@ -56,6 +57,11 @@ public class ActivitiResource {
|
|
|
String businessKeys = activitiService.findTasksByUserId(actiVm.getProcessKey(), actiVm.getUserId());
|
|
String businessKeys = activitiService.findTasksByUserId(actiVm.getProcessKey(), actiVm.getUserId());
|
|
|
return ResponseEntity.ok(businessKeys);
|
|
return ResponseEntity.ok(businessKeys);
|
|
|
}
|
|
}
|
|
|
|
|
+ @PostMapping("/my-tasks-with-time")
|
|
|
|
|
+ public ResponseEntity<List<ActiMyTaskDTO>> getMyTasksWithTime(@Valid @RequestBody ActiMyTaskVM actiVm) {
|
|
|
|
|
+ List<ActiMyTaskDTO> actiMyTaskDTOS = activitiService.findTasksWithCreateTimeByUserId(actiVm.getProcessKey(), actiVm.getUserId());
|
|
|
|
|
+ return ResponseEntity.ok(actiMyTaskDTOS);
|
|
|
|
|
+ }
|
|
|
@PostMapping("/my-tasks-finished")
|
|
@PostMapping("/my-tasks-finished")
|
|
|
public ResponseEntity<String> getMyTasksFinished(@Valid @RequestBody ActiMyTaskVM actiVm) {
|
|
public ResponseEntity<String> getMyTasksFinished(@Valid @RequestBody ActiMyTaskVM actiVm) {
|
|
|
String businessKeys = activitiService.findTaskHistByUserId(actiVm.getProcessKey(), actiVm.getUserId());
|
|
String businessKeys = activitiService.findTaskHistByUserId(actiVm.getProcessKey(), actiVm.getUserId());
|