From c6e3a4fde358f94cdccc0819c8e8236b0e3df747 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 11:17:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../background/vo/SjProjectManageVo.java      | 34 ++++++++++-
 .../resources/mapper/SjEfficiencyMapper.xml   |  8 ++-
 .../mapper/SjProjectManageMapper.xml          | 61 ++++++++++---------
 3 files changed, 70 insertions(+), 33 deletions(-)

diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/SjProjectManageVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/SjProjectManageVo.java
index cf8f975..9bf39f0 100644
--- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/SjProjectManageVo.java
+++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/SjProjectManageVo.java
@@ -23,17 +23,49 @@ public class SjProjectManageVo {
      */
     private String dataContent;
 
-
+    /**
+     * 作业内容
+     */
     private String workContent;
+    /**
+     * 风险等级
+     */
     private String riskLevel;
+    /**
+     * 作业开始时间
+     */
     private String workStartTime;
+    /**
+     * 作业结束时间
+     */
     private String workEndTime;
+    /**
+     * 计划状态
+     */
     private String planStatus;
+    /**
+     * 今日风险
+     */
     private String todayRisk;
+    /**
+     * 备注
+     */
     private String remark;
+    /**
+     * 措施
+     */
     private String measureData;
+    /**
+     * 附件
+     */
     private String filePath;
+    /**
+     * 创建时间
+     */
     private String createTime;
+    /**
+     * 修改时间
+     */
     private String updateTime;
 
     private String bidCode;
diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SjEfficiencyMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SjEfficiencyMapper.xml
index 94b3cea..4fd5b20 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SjEfficiencyMapper.xml
+++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SjEfficiencyMapper.xml
@@ -40,7 +40,9 @@
         <where>
             data_type = '整体效能分析'
             <if test="keyWord!=null and keyWord!=''">
-                and tx_time =#{keyWord}
+                and (tx_time =#{keyWord} or
+                    content like concat('%',#{keyWord},'%')
+                )
             </if>
         </where>
     </select>
@@ -71,9 +73,9 @@
         where id= #{id}
     </select>
 
-    <select id="deleteNewData" resultType="java.lang.Integer">
+    <delete id="deleteNewData">
         delete from sj_new_benefit_analysis where id=#{id}
-    </select>
+    </delete>
 
 
 </mapper>
diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SjProjectManageMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SjProjectManageMapper.xml
index 1b831db..41458f2 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SjProjectManageMapper.xml
+++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SjProjectManageMapper.xml
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.securitycontrol.background.mapper.SjProjectManageMapper">
-<!--    <insert id="addData">-->
-<!--        insert into  sj_project_manage(-->
-<!--                data_type,date_time,data_money,data_content-->
-<!--                )values (#{dataType},#{dateTime},#{dataMoney},#{dataContent})-->
-<!--    </insert>-->
-<!--    <update id="updateData">-->
-<!--        update  sj_project_manage set-->
-<!--             date_time=#{dateTime},data_money=#{dataMoney},data_content=#{dataContent}-->
-<!--    </update>-->
-<!--    <delete id="delete">-->
-<!--        delete from      sj_project_manage where id=#{id}-->
-<!--    </delete>-->
+    <insert id="addData">
+        insert into  sj_project_manage(
+                data_type,date_time,data_money,data_content
+                )values (#{dataType},#{dateTime},#{dataMoney},#{dataContent})
+    </insert>
+    <update id="updateData">
+        update  sj_project_manage set
+             date_time=#{dateTime},data_money=#{dataMoney},data_content=#{dataContent}
+    </update>
+    <delete id="delete">
+        delete from      sj_project_manage where id=#{id}
+    </delete>
 
-<!--    &lt;!&ndash;查询数据&ndash;&gt;-->
-<!--    <select id="getList" resultType="com.securitycontrol.entity.background.vo.SjProjectManageVo">-->
-<!--        select  id,   data_type dataType,  date_time dateTime, data_money dataMoney, data_content dataContent-->
-<!--        from sj_project_manage-->
-<!--        where data_type=#{dataType}-->
-<!--        <if test="dateTime!=null and dateTime!=''">-->
-<!--                and date_time=#{dateTime}-->
-<!--        </if>-->
-<!--    </select>-->
-<!--    <select id="getDetails" resultType="com.securitycontrol.entity.background.vo.SjProjectManageVo">-->
-<!--        select  id,   data_type dataType,  date_time dateTime, data_money dataMoney, data_content dataContent-->
-<!--        from sj_project_manage-->
-<!--         where id=#{id}-->
-<!--    </select>-->
+    <!--查询数据-->
+    <select id="getList" resultType="com.securitycontrol.entity.background.vo.SjProjectManageVo">
+        select  id,   data_type dataType,  date_time dateTime, data_money dataMoney, data_content dataContent
+        from sj_project_manage
+        where data_type=#{dataType}
+        <if test="dateTime!=null and dateTime!=''">
+                and date_time=#{dateTime}
+        </if>
+    </select>
+    <select id="getDetails" resultType="com.securitycontrol.entity.background.vo.SjProjectManageVo">
+        select  id,   data_type dataType,  date_time dateTime, data_money dataMoney, data_content dataContent
+        from sj_project_manage
+         where id=#{id}
+    </select>
 
     <select id="getNewList" resultType="com.securitycontrol.entity.background.vo.SjProjectManageVo">
-        select  id, work_content workContent, risk_level riskLevel, plan_start_time workStartTime, plan_end_time workEndTime,
+        select  id, work_content workContent, risk_level riskLevel, sjm.plan_start_time workStartTime, sjm.plan_end_time workEndTime,
                 plan_status planStatus,today_risk todayRisk, remark, measure_data measureData, file_path filePath,
                 create_time createTime, update_time updateTime, bid_code bidCode, pro_name proName
         from sj_new_project_manmage sjm
@@ -178,11 +178,14 @@
             <if test="content!=null and content!=''">
                 content= #{content},
             </if>
+            <if test="bidCode!=null and bidCode!=''">
+                project_id= #{bidCode},
+            </if>
         </set>
         where id= #{id}
     </update>
 
-    <select id="delAsyncWarnList" resultType="java.lang.Integer">
+    <delete id="delAsyncWarnList">
         delete from sj_new_async_warn where id=#{id}
-    </select>
+    </delete>
 </mapper>