From 284aa08d1aa62314c0ad09a0377673066dd426f2 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Wed, 22 May 2024 22:51:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20JobSummaryMapper.updateBatch=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E6=B7=BB=E5=8A=A0system=5Ftask=5Ftype=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E8=BF=9B=E8=A1=8C=E5=8C=BA=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mariadb/mapper/JobSummaryMapper.xml       |  8 ++++---
 .../mysql/mapper/JobSummaryMapper.xml         |  4 +++-
 .../oracle/mapper/JobSummaryMapper.xml        |  5 +++--
 .../postgresql/mapper/JobSummaryMapper.xml    | 22 ++++++++++---------
 .../sqlserver/mapper/JobSummaryMapper.xml     | 10 ++++++---
 5 files changed, 30 insertions(+), 19 deletions(-)

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
                    </foreach>
                ) 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
     </update>
 
     <select id="selectJobLineList"
diff --git a/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml b/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml
index fe3f61e8e..45bb5deb7 100644
--- a/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml
+++ b/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml
@@ -36,6 +36,7 @@
                            #{item.stopReason}       AS stop_reason,
                            #{item.cancelNum}        AS cancel_num,
                            #{item.cancelReason}     AS cancel_reason,
+                           #{item.systemTaskType}   AS system_task_type,
                            #{item.triggerAt}        AS trigger_at,
                            #{item.businessId}       AS business_id
                    </foreach>
@@ -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
     </update>
 
     <select id="selectJobLineList"
diff --git a/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/JobSummaryMapper.xml b/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/JobSummaryMapper.xml
index db4f02d53..3d7dececd 100644
--- a/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/JobSummaryMapper.xml
+++ b/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/JobSummaryMapper.xml
@@ -4,7 +4,7 @@
 
     <insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="false" keyProperty="id">
         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)
         <foreach collection="list" item="item" separator="UNION ALL">
             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}
         </foreach>
     </update>
 
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 (
                 <foreach collection="list" item="item" index="index" separator="UNION ALL">
                     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
                 </foreach>
             ) 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
     </update>
 
     <select id="selectJobLineList"
diff --git a/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobSummaryMapper.xml b/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobSummaryMapper.xml
index 23bab2676..0c793fa86 100644
--- a/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobSummaryMapper.xml
+++ b/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobSummaryMapper.xml
@@ -44,10 +44,14 @@
                            #{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.systemTaskType}   AS system_task_type,
+                           #{item.businessId}       AS business_id,
+                           #{item.triggerAt}        AS trigger_at
                    </foreach>
-               ) AS src ON (dest.trigger_at = src.trigger_at AND dest.business_id = src.business_id)
+               ) AS src
+             ON (dest.system_task_type = src.system_task_type
+             AND dest.business_id = src.business_id
+             AND dest.trigger_at = src.trigger_at)
     </update>
 
     <select id="selectJobLineList"