Explorar el Código

返回我的任务jfuj

yuedefeng hace 6 años
padre
commit
bccfed5938

+ 18 - 0
src/main/java/com/common/workflow/service/activiti/ActivitiService.java

@@ -17,6 +17,7 @@ import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletResponse;
 
 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.MultiActiCompleteVM;
 import com.common.workflow.web.rest.vm.MultiOrgAuditVM;
@@ -214,6 +215,23 @@ public class ActivitiService {
         return businessKeys;
     }
 
+    /**
+     *
+     * <p>描述: 根据工作流Key 和 用户id查询待办任务列表</p>
+     */
+    public List<ActiMyTaskDTO> findTasksWithCreateTimeByUserId(String processKey, String userId) {
+        List<Task> resultTasks = taskService.createTaskQuery().processDefinitionKey(processKey).taskCandidateOrAssigned(userId).list();
+        List<ActiMyTaskDTO> myTaskDTOS = new ArrayList<>();
+
+        for (Task myTask : resultTasks) {
+            ActiMyTaskDTO myTaskDTO = new ActiMyTaskDTO();
+            myTaskDTO.setBusinessKey(taskService.getVariable(myTask.getId(), "businessKey").toString());
+            myTaskDTO.setCreateTime(myTask.getCreateTime().getTime());
+            myTaskDTOS.add(myTaskDTO);
+        }
+        return myTaskDTOS;
+    }
+
     /**
      *
      * <p>描述: 根据工作流Key 和 用户id查询已办任务列表</p>

+ 25 - 0
src/main/java/com/common/workflow/service/dto/ActiMyTaskDTO.java

@@ -0,0 +1,25 @@
+package com.common.workflow.service.dto;
+
+/**
+ * Created by gyue on 2019-05-28.
+ */
+public class ActiMyTaskDTO {
+    private String businessKey;
+    private long createTime;
+
+    public String getBusinessKey() {
+        return businessKey;
+    }
+
+    public void setBusinessKey(String businessKey) {
+        this.businessKey = businessKey;
+    }
+
+    public long getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(long createTime) {
+        this.createTime = createTime;
+    }
+}

+ 6 - 0
src/main/java/com/common/workflow/web/rest/ActivitiResource.java

@@ -2,6 +2,7 @@ package com.common.workflow.web.rest;
 
 import com.common.workflow.service.activiti.ActivitiService;
 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.ActiMyTaskVM;
 import com.common.workflow.web.rest.vm.ActiProcessVM;
@@ -56,6 +57,11 @@ public class ActivitiResource {
         String businessKeys = activitiService.findTasksByUserId(actiVm.getProcessKey(), actiVm.getUserId());
         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")
     public ResponseEntity<String> getMyTasksFinished(@Valid @RequestBody ActiMyTaskVM actiVm) {
         String businessKeys = activitiService.findTaskHistByUserId(actiVm.getProcessKey(), actiVm.getUserId());

+ 1 - 1
src/main/resources/config/application-dev.yml

@@ -76,7 +76,7 @@ spring:
         asyncExecutorEnabled: false
         asyncExecutorActivate: false
         database-schema-update: false
-        check-process-definitions: true
+        check-process-definitions: false
         process-definition-location-prefix: classpath:/processes2/
     #    process-definition-location-suffixes:
     #      - **.bpmn

+ 1 - 0
src/main/resources/config/application-prod.yml

@@ -27,6 +27,7 @@ spring:
             enabled: false
     datasource:
         type: com.zaxxer.hikari.HikariDataSource
+        # url: jdbc:mysql://47.92.212.59:3306/activiti?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC
         url: jdbc:mysql://172.17.0.1:3306/activiti?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC
         username: root
         password: zks123456