From be1b426b7d765a546f4a26b60e80aa49a57079b9 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期六, 13 一月 2024 16:25:11 +0800
Subject: [PATCH] 1、优化采购模块数量不能为小数点问题2、新增客服巡查巡楼记录功能模块3、新增页面导出功能4、优化记录查询条件新增时间段查询条件5、其他界面性调整

---
 java110-db/src/main/resources/mapper/user/NotepadV1ServiceDaoImplMapper.xml |   32 ++++++++++++++------------------
 1 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/user/NotepadV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/NotepadV1ServiceDaoImplMapper.xml
index b8752b9..5ad0452 100644
--- a/java110-db/src/main/resources/mapper/user/NotepadV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/NotepadV1ServiceDaoImplMapper.xml
@@ -1,32 +1,28 @@
 <?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="notepadV1ServiceDaoImpl">
 
-
     <!-- 淇濆瓨澶囧繕褰曚俊鎭� add by wuxw 2018-07-03 -->
     <insert id="saveNotepadInfo" parameterType="Map">
-        insert into notepad(
-        create_user_id,note_id,create_user_name,obj_name,title,room_id,room_name,note_type,thrid_id,obj_id,state,obj_type,link
-        ) values (
-        #{createUserId},#{noteId},#{createUserName},#{objName},#{title},#{roomId},#{roomName},#{noteType},#{thridId},#{objId},#{state},#{objType},#{link}
-        )
+        insert into notepad(create_user_id, note_id, create_user_name, obj_name, title, room_id, room_name, note_type,
+                            thrid_id, obj_id, state, obj_type, link)
+        values (#{createUserId}, #{noteId}, #{createUserName}, #{objName}, #{title}, #{roomId}, #{roomName},
+                #{noteType}, #{thridId}, #{objId}, #{state}, #{objType}, #{link})
     </insert>
-
 
     <!-- 鏌ヨ澶囧繕褰曚俊鎭� add by wuxw 2018-07-03 -->
     <select id="getNotepadInfo" parameterType="Map" resultType="Map">
-
         select t.create_user_id,t.create_user_id createUserId,t.note_id,t.note_id
         noteId,t.create_user_name,t.create_user_name createUserName,t.status_cd,t.status_cd
         statusCd,t.obj_name,t.obj_name objName,t.title,t.room_id,t.room_id roomId,t.room_name,t.room_name
         roomName,t.note_type,t.note_type noteType,t.thrid_id,t.thrid_id thridId,t.obj_id,t.obj_id
         objId,t.state,t.obj_type,t.obj_type objType,t.link,t.create_time createTime,td.`name` noteTypeName
         from notepad t
-        left join t_dict td on td.table_name = 'notepad' and td.table_columns = 'note_type' and td.status_cd = t.note_type
+        left join t_dict td on td.table_name = 'notepad' and td.table_columns = 'note_type' and td.status_cd =
+        t.note_type
         <if test="communityId !=null and communityId != ''">
-             left join building_owner bo on t.obj_id = bo.member_id and bo.status_cd = '0'
+            left join building_owner bo on t.obj_id = bo.member_id and bo.status_cd = '0'
         </if>
         where 1 =1
         <if test="communityId !=null and communityId != ''">
@@ -78,9 +74,7 @@
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
-
     </select>
-
 
     <!-- 淇敼澶囧繕褰曚俊鎭� add by wuxw 2018-07-03 -->
     <update id="updateNotepadInfo" parameterType="Map">
@@ -128,14 +122,19 @@
         <if test="noteId !=null and noteId != ''">
             and t.note_id= #{noteId}
         </if>
-
     </update>
 
     <!-- 鏌ヨ澶囧繕褰曟暟閲� add by wuxw 2018-07-03 -->
     <select id="queryNotepadsCount" parameterType="Map" resultType="Map">
         select count(1) count
         from notepad t
+        <if test="communityId !=null and communityId != ''">
+            left join building_owner bo on t.obj_id = bo.member_id and bo.status_cd = '0'
+        </if>
         where 1 =1
+        <if test="communityId !=null and communityId != ''">
+            and bo.community_id = #{communityId}
+        </if>
         <if test="createUserId !=null and createUserId != ''">
             and t.create_user_id= #{createUserId}
         </if>
@@ -178,8 +177,5 @@
         <if test="objType !=null and objType != ''">
             and t.obj_type= #{objType}
         </if>
-
-
     </select>
-
 </mapper>

--
Gitblit v1.8.0