From 1133cee5ca25b0634ed5c4d5a72e874bc77723e6 Mon Sep 17 00:00:00 2001
From: buaixuexideshitongxue <2936013465@qq.com>
Date: Fri, 17 Apr 2026 09:46:43 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=89=A5=E7=A6=BB=E5=87=BA=E4=B8=93?=
 =?UTF-8?q?=E9=A1=B9=E7=9D=A3=E5=AF=9F=E6=98=8E=E7=BB=86=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E5=A4=A7=E5=B1=8Fsql=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supervision/mapper/NegativeMapper.java    | 17 ++++------
 src/main/resources/mapper/NegativeMapper.xml  | 31 +++++++++++++++++++
 2 files changed, 37 insertions(+), 11 deletions(-)
 create mode 100644 src/main/resources/mapper/NegativeMapper.xml

diff --git a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java
index 576e9cc..8d1cb28 100644
--- a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java
@@ -311,17 +311,12 @@ public interface NegativeMapper extends BaseMapper<Negative> {
             @Param("codes") List<String> codes
     );
 
-    @Select("select ng.* from negative ng " +
-            "LEFT JOIN sup_depart sd on  ng.involveDepartId = sd.id " +
-            "LEFT JOIN sup_depart sdd on  sd.pid = sdd.id " +
-            "LEFT JOIN sup_depart sddd on sdd.pid = sddd.id " +
-            "where " +
-            "ng.special_supervision =#{specialSupervision} " +
-            "and ng.crtTime >= #{beginTime} " +
-            "and ng.crtTime <= #{endTime} " +
-            "AND (sd.id =#{id} OR sdd.id=#{id} or sddd.id=#{id});"
-    )
-    List<Negative> getYellowBetNegativeList(String id, Date beginTime, Date endTime, String specialSupervision);
+    List<Negative> getYellowBetNegativeList(
+            @Param("id") String id,
+            @Param("beginTime") Date beginTime,
+            @Param("endTime") Date endTime,
+            @Param("specialSupervision") String specialSupervision
+    );
 
 
 
diff --git a/src/main/resources/mapper/NegativeMapper.xml b/src/main/resources/mapper/NegativeMapper.xml
new file mode 100644
index 0000000..4b10cf7
--- /dev/null
+++ b/src/main/resources/mapper/NegativeMapper.xml
@@ -0,0 +1,31 @@
+<?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.biutag.supervision.mapper.NegativeMapper">
+
+    <select id="getYellowBetNegativeList" resultType="com.biutag.supervision.pojo.entity.Negative">
+        SELECT ng.* FROM negative ng
+        LEFT JOIN sup_depart sd ON ng.involveDepartId = sd.id
+        LEFT JOIN sup_depart sdd ON sd.pid = sdd.id
+        LEFT JOIN sup_depart sddd ON sdd.pid = sddd.id
+        <where>
+            <if test="beginTime != null">
+                AND ng.crtTime &gt;= #{beginTime}
+            </if>
+            <if test="endTime != null">
+                AND ng.crtTime &lt;= #{endTime}
+            </if>
+            <if test="id != null and id != ''">
+                AND (sd.id = #{id} OR sdd.id = #{id} OR sddd.id = #{id})
+            </if>
+            <choose>
+                <when test="specialSupervision != null and specialSupervision != ''">
+                    AND FIND_IN_SET(#{specialSupervision}, ng.special_supervision) &gt; 0
+                </when>
+                <otherwise>
+                </otherwise>
+            </choose>
+        </where>
+    </select>
+
+</mapper>