From 15c6c37726ecbdda6d84d13e3a1b60a1a785eb56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E4=BA=AE?= <fltoo@qq.com>
Date: Fri, 23 Jan 2026 13:34:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E6=9E=90=E9=A2=84=E8=AD=A6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E7=A8=8Bid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/background/vo/SjNewWorkerWarnVo.java |  2 ++
 .../main/resources/mapper/SjNewWorkerMapper.xml | 16 +++++++++-------
 .../main/resources/mapper/SjWorkTeamMapper.xml  | 17 ++++++++++-------
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/SjNewWorkerWarnVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/SjNewWorkerWarnVo.java
index 00456ba..a4bc539 100644
--- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/SjNewWorkerWarnVo.java
+++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/SjNewWorkerWarnVo.java
@@ -41,4 +41,6 @@ public class SjNewWorkerWarnVo {
      */
     private String remark;
 
+    private String bidCode;
+    private String proName;
 }
diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SjNewWorkerMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SjNewWorkerMapper.xml
index 0efe38d..e3ed377 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SjNewWorkerMapper.xml
+++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SjNewWorkerMapper.xml
@@ -15,8 +15,8 @@
     <insert id="addWarnData">
         insert into sj_new_worker_warn(
                 tx_time, tx_type, content,
-        data_type, remark, create_time, measure_data,file_path
-        )values (#{txTime},#{txType},#{content},#{dataType},#{remark},now(),#{measureData},#{filePath})
+        data_type, remark, create_time, measure_data,file_path, project_id
+        )values (#{txTime},#{txType},#{content},#{dataType},#{remark},now(),#{measureData},#{filePath},#{bidCode})
     </insert>
     <update id="updateData">
         update sj_new_worker_analysic set
@@ -29,7 +29,7 @@
     <update id="updateWarnData">
         update sj_new_worker_warn set
               tx_time=#{txTime}, tx_type=#{txType}, content=#{content},
-              data_type=#{dataType}, remark=#{remark}
+              data_type=#{dataType}, remark=#{remark}, project_id= #{bidCode}
         where id=#{id}
     </update>
     <delete id="deleteData">
@@ -54,10 +54,12 @@
         </where>
     </select>
     <select id="getWarnList" resultType="com.securitycontrol.entity.background.vo.SjNewWorkerWarnVo">
-        select id,   tx_time txTime, tx_type txType,
-            content content,  data_type dataType,remark remark,
-            create_time createTime,   measure_data measureData,  file_path filePath
-        from sj_new_worker_warn
+        select id, tx_time txTime, tx_type txType,
+            content,  data_type dataType,remark,
+            create_time createTime,   measure_data measureData,  file_path filePath,
+        project_id bidCode, pro_name proName
+        from sj_new_worker_warn sjb
+        left join tb_project tp on sjb.project_id=tp.bid_code
         <where >
             <if test="txType!=null and txType!=''">
                 and tx_type like concat('%',#{txType},'%')
diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SjWorkTeamMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SjWorkTeamMapper.xml
index 944734a..7da572b 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SjWorkTeamMapper.xml
+++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SjWorkTeamMapper.xml
@@ -32,9 +32,10 @@
     </insert>
     <insert id="addAsyncWarnList">
         insert into sj_new_zylll_warn(
-                tx_time, tx_type,content,
-        data_type, remark,  create_time, measure_data,file_path
-        )values (#{txTime},#{txType},#{content},#{dataType},#{remark},now(),#{measureData},#{filePath})
+                tx_time, tx_type,content,data_type, remark,  create_time,
+        measure_data,file_path,project_id
+        )values (#{txTime},#{txType},#{content},#{dataType},#{remark},now(),
+        #{measureData},#{filePath},#{bidCode})
     </insert>
     <insert id="addFaultData">
         insert into sj_new_fault_record (
@@ -60,7 +61,7 @@
     <update id="updateAsyncWarnList">
         update sj_new_zylll_warn set
             tx_time=#{txTime}, tx_type=#{txType},content=#{content},
-            data_type=#{dataType}, remark=#{remark}
+            data_type=#{dataType}, remark=#{remark},project_id = #{bidCode}
         where id=#{id}
     </update>
     <update id="updateFaultData">
@@ -216,9 +217,11 @@
     </select>
     <select id="getAsyncWarnList" resultType="com.securitycontrol.entity.background.vo.SjNewZylllWarnVo">
         select id, tx_time txTime,  tx_type txType,
-            content content,  data_type dataType,  remark,
-            create_time createTime, measure_data measureData, file_path filePath
-    FROM sj_new_zylll_warn
+            content content,  data_type dataType, remark,
+            create_time createTime, measure_data measureData, file_path filePath,
+            bid_code bidCode, pro_name proName
+    FROM sj_new_zylll_warn sjb
+        left join tb_project tp on sjb.project_id=tp.bid_code
        <where>
         <if test="keyWord!=null and keyWord!=''">
             and (