From ead9963659999de2be3459a2baf931d53b36fd21 Mon Sep 17 00:00:00 2001
From: dongdingding <207595406@qq.com>
Date: Thu, 19 Oct 2023 08:56:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=88=86=E6=83=85=E8=B5=B0=E5=8A=BFxml?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mapper/tcZz/netWorkYq/TcYqzsMapper.xml | 34 ++++++++++++-------
1 file changed, 21 insertions(+), 13 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/mapper/tcZz/netWorkYq/TcYqzsMapper.xml b/ruoyi-admin/src/main/resources/mapper/tcZz/netWorkYq/TcYqzsMapper.xml
index 1342c327..477ecf13 100644
--- a/ruoyi-admin/src/main/resources/mapper/tcZz/netWorkYq/TcYqzsMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/tcZz/netWorkYq/TcYqzsMapper.xml
@@ -23,20 +23,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectTcYqzsList" parameterType="TcYqzs" resultMap="TcYqzsResult">
<include refid="selectTcYqzsVo"/>
- <where>
- <if test="id != null "> and id = #{id}</if>
- <if test="areaId != null "> and area_id = #{areaId}</if>
- <if test="params.beginDateTime != null and params.beginDateTime != '' and params.endDateTime != null and params.endDateTime != ''"> and date_time between #{params.beginDateTime} and #{params.endDateTime}</if>
- <if test="createBy != null and createBy != ''"> and create_by = #{createBy}</if>
- <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
- <if test="updateBy != null and updateBy != ''"> and update_by = #{updateBy}</if>
- <if test="params.beginUpdateTime != null and params.beginUpdateTime != '' and params.endUpdateTime != null and params.endUpdateTime != ''"> and update_time between #{params.beginUpdateTime} and #{params.endUpdateTime}</if>
- <if test="beginDateTime != null and endDateTime != null "> and date_time between #{beginDateTime} and #{endDateTime}</if>
- <if test="remark != null and remark != ''"> and remark = #{remark}</if>
- <if test="count1 != null "> and count1 = #{count1}</if>
- <if test="count2 != null "> and count2 = #{count2}</if>
+ <where>
+ <if test="id != null ">and id = #{id}</if>
+ <if test="areaId != null ">and area_id = #{areaId}</if>
+ <if test="params.beginDateTime != null and params.beginDateTime != '' and params.endDateTime != null and params.endDateTime != ''">
+ and date_time between #{params.beginDateTime} and #{params.endDateTime}
+ </if>
+ <if test="createBy != null and createBy != ''">and create_by = #{createBy}</if>
+ <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''">
+ and create_time between #{params.beginCreateTime} and #{params.endCreateTime}
+ </if>
+ <if test="updateBy != null and updateBy != ''">and update_by = #{updateBy}</if>
+ <if test="params.beginUpdateTime != null and params.beginUpdateTime != '' and params.endUpdateTime != null and params.endUpdateTime != ''">
+ and update_time between #{params.beginUpdateTime} and #{params.endUpdateTime}
+ </if>
+ <!-- <if test="beginDateTime != null and endDateTime != null "> and date_time between #{beginDateTime} and #{endDateTime}</if>-->
+ <if test="beginDateTime != null">and date_time >= #{beginDateTime}</if>
+ <if test="endDateTime != null">and date_time <= #{endDateTime}</if>
+ <if test="remark != null and remark != ''">and remark = #{remark}</if>
+ <if test="count1 != null ">and count1 = #{count1}</if>
+ <if test="count2 != null ">and count2 = #{count2}</if>
</where>
- order by date_time asc
+ order by date_time asc
</select>
<select id="selectTcYqzsById" parameterType="Long" resultMap="TcYqzsResult">