更新

src/main/java/com/keymobile/rest/ctrl/IndexCtrl.java

@@ -85,7 +85,7 @@ public class IndexCtrl {
     public ApiResponse getMyTasks() {
         User user = userService.getNormalUser();
         User audit = userService.getAudit();
-        List<Job> jobList = new ArrayList<>();
+        List<Map> jobList = new ArrayList<>();
         // 获取任务
         List<Task> tasks = taskService.createNativeTaskQuery()
                 .sql("SELECT * FROM " + managementService.getTableName(Task.class) + " T WHERE T.ASSIGNEE_ = #{assignee1} OR T.ASSIGNEE_ = #{assignee2}")
@@ -96,12 +96,20 @@ public class IndexCtrl {
             String processId = task.getProcessInstanceId();
             Job job = jobService.findByProcessId(processId);
             if (job != null && job.getStatus() != Job.STATUS_COMPLETED) {
+                Map map = new HashMap();
                 if (task.getTaskDefinitionKey().equals("addData")) {
-                    job.setKind(Job.KIND_RECORD);
+                    map.put("kind", Job.KIND_RECORD);
                 } else {
-                    job.setKind(Job.KIND_AUDIT);
+                    map.put("kind", Job.KIND_AUDIT);
                 }
-                jobList.add(job);
+                map.put("taskId", job.getId());
+                if (job.getExcelList().size() > 0) {
+                    Excel excel = job.getExcelList().get(0);
+                    map.put("excelId", excel.getId());
+                    map.put("config", excel.getConfig());
+                    map.put("name", excel.getName());
+                }
+                jobList.add(map);
             }
 
         }

src/main/java/com/keymobile/rest/model/Job.java

@@ -73,8 +73,4 @@ public class Job implements Serializable {
 
     @ManyToOne
     private User user;
-
-
-    @Transient
-    private int kind;
 }