diff --git a/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/JobSummaryMapper.xml b/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/JobSummaryMapper.xml index fe3f61e8e..c6d325ab0 100644 --- a/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/JobSummaryMapper.xml +++ b/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/JobSummaryMapper.xml @@ -36,8 +36,9 @@ #{item.stopReason} AS stop_reason, #{item.cancelNum} AS cancel_num, #{item.cancelReason} AS cancel_reason, - #{item.triggerAt} AS trigger_at, - #{item.businessId} AS business_id + #{system_task_type} AS system_task_type, + #{item.businessId} AS business_id, + #{item.triggerAt} AS trigger_at ) tt SET rt.success_num = tt.success_num, @@ -47,8 +48,9 @@ rt.stop_reason = tt.stop_reason, rt.cancel_num = tt.cancel_num, rt.cancel_reason = tt.cancel_reason - WHERE rt.trigger_at = tt.trigger_at + WHERE rt.system_task_type = tt.system_task_type AND rt.business_id = tt.business_id + AND rt.trigger_at = tt.trigger_at INSERT INTO sj_job_summary (namespace_id, group_name, business_id, trigger_at, system_task_type, - success_num,fail_num,fail_reason,stop_num,stop_reason, cancel_num,cancel_reason) + success_num,fail_num,fail_reason,stop_num,stop_reason, cancel_num,cancel_reason) SELECT #{item.namespaceId}, @@ -33,8 +33,9 @@ stop_reason = #{item.stopReason}, cancel_num = #{item.cancelNum}, cancel_reason = #{item.cancelReason} - WHERE trigger_at = #{item.triggerAt} + WHERE system_task_type = #{item.systemTaskType} AND business_id = #{item.businessId} + AND trigger_at = #{item.triggerAt} diff --git a/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/JobSummaryMapper.xml b/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/JobSummaryMapper.xml index bf6bac1b6..596923e34 100644 --- a/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/JobSummaryMapper.xml +++ b/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/JobSummaryMapper.xml @@ -36,19 +36,21 @@ FROM ( SELECT - #{item.successNum} AS success_num, - #{item.failNum} AS fail_num, - #{item.failReason} AS fail_reason, - #{item.stopNum} AS stop_num, - #{item.stopReason} AS stop_reason, - #{item.cancelNum} AS cancel_num, - #{item.cancelReason} AS cancel_reason, - #{item.triggerAt} AS trigger_at, - #{item.businessId} AS business_id + #{item.successNum} AS success_num, + #{item.failNum} AS fail_num, + #{item.failReason} AS fail_reason, + #{item.stopNum} AS stop_num, + #{item.stopReason} AS stop_reason, + #{item.cancelNum} AS cancel_num, + #{item.cancelReason} AS cancel_reason, + #{item.systemTaskType} AS system_task_type, + #{item.businessId} AS business_id, + #{item.triggerAt} AS trigger_at ) AS tt - WHERE rt.trigger_at = tt.trigger_at + WHERE rt.system_task_type = tt.system_task_type AND rt.business_id = tt.business_id + AND rt.trigger_at = tt.trigger_at