From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能

---
 java110-db/src/main/resources/mapper/community/NoticeServiceDaoImplMapper.xml |   44 ++++++++++++++++++++------------------------
 1 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/community/NoticeServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/NoticeServiceDaoImplMapper.xml
index 50c459f..17e22a0 100755
--- a/java110-db/src/main/resources/mapper/community/NoticeServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/NoticeServiceDaoImplMapper.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="noticeServiceDaoImpl">
 
@@ -13,7 +12,6 @@
         #{objType},#{objId},#{state}
         )
     </insert>
-
 
     <!-- 鏌ヨ閫氱煡淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
     <select id="getBusinessNoticeInfo" parameterType="Map" resultType="Map">
@@ -32,10 +30,10 @@
             and t.context= #{context}
         </if>
         <if test="startTime !=null">
-            and t.start_time= #{startTime}
+            and t.start_time &lt;= #{startTime}
         </if>
         <if test="endTime !=null">
-            and t.end_time= #{endTime}
+            and t.end_time &gt;= #{endTime}
         </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
@@ -52,10 +50,7 @@
         <if test="noticeId !=null and noticeId != ''">
             and t.notice_id= #{noticeId}
         </if>
-
-
     </select>
-
 
     <!-- 淇濆瓨閫氱煡淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
     <insert id="saveNoticeInfoInstance" parameterType="Map">
@@ -93,9 +88,7 @@
         <if test="noticeId !=null and noticeId != ''">
             and t.notice_id= #{noticeId}
         </if>
-
     </insert>
-
 
     <!-- 鏌ヨ閫氱煡淇℃伅 add by wuxw 2018-07-03 -->
     <select id="getNoticeInfo" parameterType="Map" resultType="Map">
@@ -111,14 +104,20 @@
         <if test="noticeTypeCd !=null and noticeTypeCd != ''">
             and t.notice_type_cd= #{noticeTypeCd}
         </if>
+        <if test="noticeTypeCds !=null">
+            and t.notice_type_cd in
+            <foreach collection="noticeTypeCds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="context !=null and context != ''">
             and t.context= #{context}
         </if>
         <if test="startTime !=null">
-            and t.start_time= #{startTime}
+            and t.start_time &lt;= #{startTime}
         </if>
         <if test="endTime !=null">
-            and t.end_time= #{endTime}
+            and t.end_time &gt;= #{endTime}
         </if>
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
@@ -132,9 +131,6 @@
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
-        <if test="userId !=null and userId != ''">
-            and t.user_id= #{userId}
-        </if>
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
@@ -145,9 +141,7 @@
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
-
     </select>
-
 
     <!-- 淇敼閫氱煡淇℃伅 add by wuxw 2018-07-03 -->
     <update id="updateNoticeInfoInstance" parameterType="Map">
@@ -183,7 +177,6 @@
         <if test="noticeId !=null and noticeId != ''">
             and t.notice_id= #{noticeId}
         </if>
-
     </update>
 
     <!-- 鏌ヨ閫氱煡鏁伴噺 add by wuxw 2018-07-03 -->
@@ -194,14 +187,20 @@
         <if test="noticeTypeCd !=null and noticeTypeCd != ''">
             and t.notice_type_cd= #{noticeTypeCd}
         </if>
+        <if test="noticeTypeCds !=null">
+            and t.notice_type_cd in
+            <foreach collection="noticeTypeCds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="context !=null and context != ''">
             and t.context= #{context}
         </if>
         <if test="startTime !=null">
-            and t.start_time= #{startTime}
+            and t.start_time &lt;= #{startTime}
         </if>
         <if test="endTime !=null">
-            and t.end_time= #{endTime}
+            and t.end_time &gt;= #{endTime}
         </if>
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
@@ -215,12 +214,9 @@
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
-        <if test="userId !=null and userId != ''">
-            and t.user_id= #{userId}
-        </if>
         <if test="noticeId !=null and noticeId != ''">
             and t.notice_id= #{noticeId}
         </if>
     </select>
 
-</mapper>
+</mapper>
\ No newline at end of file

--
Gitblit v1.8.0