Merge branch 'refs/heads/feature-concurrency' into cleanup

src/main/java/com/whdc/component/AutoCallTaskScheduled.java

@@ -166,6 +166,20 @@ public class AutoCallTaskScheduled {
                 }
             } catch (Exception e) {
                 log.error("处理任务时发生异常 taskId={}", taskId, e);
+                AutoCallTask task = autoCallTaskService.getTaskMapper().selectById(taskId);
+                task.setStatus(AutoCallTask.STATUS_CANCELLED);
+
+                List<AutoCallPerson> personList = autoCallTaskService.getPersonMapper().selectList(
+                        new QueryWrapper<AutoCallPerson>()
+                                .eq("task_id", taskId)
+                                .isNull("__remark")
+                                .isNull("__tag")
+                );
+                for (AutoCallPerson person : personList) {
+                    person.setStatus(AutoCallPerson.STATUS_CANCELLED);
+                    person.setDetailRemark("请人工处置");
+                    autoCallTaskService.getPersonMapper().updateById(person);
+                }
             }
         }
     }

src/main/java/com/whdc/service/autocall/AutoCallApiService.java

@@ -562,7 +562,7 @@ private void addTableHeader(Table table) {
                 .orderByDesc("id");
         query.in("status",
                 AutoCallTask.STATUS_ALL_FAIL,
-                AutoCallTask.STATUS_SHOULD_GENERATE,
+//                AutoCallTask.STATUS_SHOULD_GENERATE,
                 AutoCallTask.STATUS_CANCELLED,
                 AutoCallTask.STATUS_GENERATED_AKA_READY_TO_UPLOAD
         );