From 7a0a3d837365330be38699894ce0167bade1de58 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期三, 07 十二月 2022 15:00:26 +0800
Subject: [PATCH] 1、优化报修通知信息2、优化缴费审核3、优化发布公告信息4、优化页面显示性问题

---
 java110-db/src/main/resources/mapper/common/MachineAuthServiceDaoImplMapper.xml |  457 +++++++++++++++++++++++++++++++--------------------------
 1 files changed, 248 insertions(+), 209 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/common/MachineAuthServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/common/MachineAuthServiceDaoImplMapper.xml
index ce81a81..10ccf70 100755
--- a/java110-db/src/main/resources/mapper/common/MachineAuthServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/common/MachineAuthServiceDaoImplMapper.xml
@@ -1,232 +1,271 @@
 <?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="machineAuthServiceDaoImpl">
 
+    <insert id="saveMachineAuth" parameterType="Map">
+        insert into machine_auth(person_name, machine_id, person_id, start_time, status_cd, state, end_time,
+                                 community_id, b_id, person_type, auth_id)
+        values (#{personName}, #{machineId}, #{personId}, #{startTime}, #{statusCd}, #{state}, #{endTime},
+                #{communityId}, #{bId}, #{personType}, #{authId})
+    </insert>
+
     <!-- 淇濆瓨璁惧鏉冮檺淇℃伅 add by wuxw 2018-07-03 -->
-       <insert id="saveBusinessMachineAuthInfo" parameterType="Map">
-           insert into business_machine_auth(
-person_name,machine_id,operate,person_id,start_time,state,end_time,community_id,b_id,person_type,auth_id
-) values (
-#{personName},#{machineId},#{operate},#{personId},#{startTime},#{state},#{endTime},#{communityId},#{bId},#{personType},#{authId}
-)
-       </insert>
+    <insert id="saveBusinessMachineAuthInfo" parameterType="Map">
+        insert into business_machine_auth(person_name, machine_id, operate, person_id, start_time, state, end_time,
+                                          community_id, b_id, person_type, auth_id)
+        values (#{personName}, #{machineId}, #{operate}, #{personId}, #{startTime}, #{state}, #{endTime},
+                #{communityId}, #{bId}, #{personType}, #{authId})
+    </insert>
 
-
-       <!-- 鏌ヨ璁惧鏉冮檺淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
-       <select id="getBusinessMachineAuthInfo" parameterType="Map" resultType="Map">
-           select  t.person_name,t.person_name personName,t.machine_id,t.machine_id machineId,t.operate,t.person_id,t.person_id personId,t.start_time,t.start_time startTime,t.state,t.end_time,t.end_time endTime,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.person_type,t.person_type personType,t.auth_id,t.auth_id authId 
-from business_machine_auth t 
-where 1 =1 
-<if test="personName !=null and personName != ''">
-   and t.person_name= #{personName}
-</if> 
-<if test="machineId !=null and machineId != ''">
-   and t.machine_id= #{machineId}
-</if> 
-<if test="operate !=null and operate != ''">
-   and t.operate= #{operate}
-</if> 
-<if test="personId !=null and personId != ''">
-   and t.person_id= #{personId}
-</if> 
-<if test="startTime !=null and startTime != ''">
-   and t.start_time= #{startTime}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="endTime !=null and endTime != ''">
-   and t.end_time= #{endTime}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="personType !=null and personType != ''">
-   and t.person_type= #{personType}
-</if> 
-<if test="authId !=null and authId != ''">
-   and t.auth_id= #{authId}
-</if> 
-
-       </select>
-
-
-
-
+    <!-- 鏌ヨ璁惧鏉冮檺淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
+    <select id="getBusinessMachineAuthInfo" parameterType="Map" resultType="Map">
+        select t.person_name,t.person_name personName,t.machine_id,t.machine_id
+        machineId,t.operate,t.person_id,t.person_id personId,t.start_time,t.start_time
+        startTime,t.state,t.end_time,t.end_time endTime,t.community_id,t.community_id communityId,t.b_id,t.b_id
+        bId,t.person_type,t.person_type personType,t.auth_id,t.auth_id authId
+        from business_machine_auth t
+        where 1 =1
+        <if test="personName !=null and personName != ''">
+            and t.person_name= #{personName}
+        </if>
+        <if test="machineId !=null and machineId != ''">
+            and t.machine_id= #{machineId}
+        </if>
+        <if test="operate !=null and operate != ''">
+            and t.operate= #{operate}
+        </if>
+        <if test="personId !=null and personId != ''">
+            and t.person_id= #{personId}
+        </if>
+        <if test="startTime !=null and startTime != ''">
+            and t.start_time &lt;= #{startTime}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            and t.end_time &gt;= #{endTime}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="personType !=null and personType != ''">
+            and t.person_type= #{personType}
+        </if>
+        <if test="authId !=null and authId != ''">
+            and t.auth_id= #{authId}
+        </if>
+    </select>
 
     <!-- 淇濆瓨璁惧鏉冮檺淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
     <insert id="saveMachineAuthInfoInstance" parameterType="Map">
         insert into machine_auth(
-person_name,machine_id,person_id,start_time,status_cd,state,end_time,community_id,b_id,person_type,auth_id
-) select t.person_name,t.machine_id,t.person_id,t.start_time,'0',t.state,t.end_time,t.community_id,t.b_id,t.person_type,t.auth_id from business_machine_auth t where 1=1
-<if test="personName !=null and personName != ''">
-   and t.person_name= #{personName}
-</if> 
-<if test="machineId !=null and machineId != ''">
-   and t.machine_id= #{machineId}
-</if> 
-   and t.operate= 'ADD'
-<if test="personId !=null and personId != ''">
-   and t.person_id= #{personId}
-</if> 
-<if test="startTime !=null and startTime != ''">
-   and t.start_time= #{startTime}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="endTime !=null and endTime != ''">
-   and t.end_time= #{endTime}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="personType !=null and personType != ''">
-   and t.person_type= #{personType}
-</if> 
-<if test="authId !=null and authId != ''">
-   and t.auth_id= #{authId}
-</if> 
-
+        person_name,machine_id,person_id,start_time,status_cd,state,end_time,community_id,b_id,person_type,auth_id
+        ) select
+        t.person_name,t.machine_id,t.person_id,t.start_time,'0',t.state,t.end_time,t.community_id,t.b_id,t.person_type,t.auth_id
+        from business_machine_auth t where 1=1
+        <if test="personName !=null and personName != ''">
+            and t.person_name= #{personName}
+        </if>
+        <if test="machineId !=null and machineId != ''">
+            and t.machine_id= #{machineId}
+        </if>
+        and t.operate= 'ADD'
+        <if test="personId !=null and personId != ''">
+            and t.person_id= #{personId}
+        </if>
+        <if test="startTime !=null and startTime != ''">
+            and t.start_time= #{startTime}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            and t.end_time= #{endTime}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="personType !=null and personType != ''">
+            and t.person_type= #{personType}
+        </if>
+        <if test="authId !=null and authId != ''">
+            and t.auth_id= #{authId}
+        </if>
     </insert>
-
-
 
     <!-- 鏌ヨ璁惧鏉冮檺淇℃伅 add by wuxw 2018-07-03 -->
     <select id="getMachineAuthInfo" parameterType="Map" resultType="Map">
-        select  t.person_name,t.person_name personName,t.machine_id,t.machine_id machineId,t.person_id,t.person_id personId,t.start_time,t.start_time startTime,t.status_cd,t.status_cd statusCd,t.state,t.end_time,t.end_time endTime,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.person_type,t.person_type personType,t.auth_id,t.auth_id authId 
-from machine_auth t 
-where 1 =1 
-<if test="personName !=null and personName != ''">
-   and t.person_name= #{personName}
-</if> 
-<if test="machineId !=null and machineId != ''">
-   and t.machine_id= #{machineId}
-</if> 
-<if test="personId !=null and personId != ''">
-   and t.person_id= #{personId}
-</if> 
-<if test="startTime !=null and startTime != ''">
-   and t.start_time= #{startTime}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="endTime !=null and endTime != ''">
-   and t.end_time= #{endTime}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="personType !=null and personType != ''">
-   and t.person_type= #{personType}
-</if> 
-<if test="authId !=null and authId != ''">
-   and t.auth_id= #{authId}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
-
+        select t.person_name,t.person_name personName,t.machine_id,t.machine_id machineId,t.person_id,t.person_id
+        personId,t.start_time,t.start_time startTime,t.status_cd,t.status_cd statusCd,t.state,t.end_time,t.end_time
+        endTime,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.person_type,t.person_type
+        personType,t.auth_id,t.auth_id authId,u.name personName,m.machine_name machineName
+        from machine_auth t
+        left join u_user u on t.person_id = u.user_id and u.status_cd = '0'
+        left join machine m on t.machine_id = m.machine_id and m.status_cd = '0'
+        where 1 = 1
+        <if test="personName !=null and personName != ''">
+            and t.person_name= #{personName}
+        </if>
+        <if test="machineId !=null and machineId != ''">
+            and t.machine_id= #{machineId}
+        </if>
+        <if test="personId !=null and personId != ''">
+            and t.person_id= #{personId}
+        </if>
+        <if test="startTime !=null and startTime != ''">
+            and t.start_time &lt;= #{startTime}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            and t.end_time &gt;= #{endTime}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="personType !=null and personType != ''">
+            and t.person_type= #{personType}
+        </if>
+        <if test="authId !=null and authId != ''">
+            and t.auth_id= #{authId}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
     </select>
-
-
-
 
     <!-- 淇敼璁惧鏉冮檺淇℃伅 add by wuxw 2018-07-03 -->
     <update id="updateMachineAuthInfoInstance" parameterType="Map">
-        update  machine_auth t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="personName !=null and personName != ''">
-, t.person_name= #{personName}
-</if> 
-<if test="machineId !=null and machineId != ''">
-, t.machine_id= #{machineId}
-</if> 
-<if test="personId !=null and personId != ''">
-, t.person_id= #{personId}
-</if> 
-<if test="startTime !=null and startTime != ''">
-, t.start_time= #{startTime}
-</if> 
-<if test="state !=null and state != ''">
-, t.state= #{state}
-</if> 
-<if test="endTime !=null and endTime != ''">
-, t.end_time= #{endTime}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
-<if test="personType !=null and personType != ''">
-, t.person_type= #{personType}
-</if> 
- where 1=1 <if test="bId !=null and bId != ''">
-and t.b_id= #{bId}
-</if> 
-<if test="authId !=null and authId != ''">
-and t.auth_id= #{authId}
-</if> 
-
+        update machine_auth t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="personName !=null and personName != ''">
+            , t.person_name= #{personName}
+        </if>
+        <if test="machineId !=null and machineId != ''">
+            , t.machine_id= #{machineId}
+        </if>
+        <if test="personId !=null and personId != ''">
+            , t.person_id= #{personId}
+        </if>
+        <if test="startTime !=null and startTime != ''">
+            , t.start_time= #{startTime}
+        </if>
+        <if test="state !=null and state != ''">
+            , t.state= #{state}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            , t.end_time= #{endTime}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        <if test="personType !=null and personType != ''">
+            , t.person_type= #{personType}
+        </if>
+        where 1=1
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="authId !=null and authId != ''">
+            and t.auth_id= #{authId}
+        </if>
     </update>
 
     <!-- 鏌ヨ璁惧鏉冮檺鏁伴噺 add by wuxw 2018-07-03 -->
-     <select id="queryMachineAuthsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from machine_auth t 
-where 1 =1 
-<if test="personName !=null and personName != ''">
-   and t.person_name= #{personName}
-</if> 
-<if test="machineId !=null and machineId != ''">
-   and t.machine_id= #{machineId}
-</if> 
-<if test="personId !=null and personId != ''">
-   and t.person_id= #{personId}
-</if> 
-<if test="startTime !=null and startTime != ''">
-   and t.start_time= #{startTime}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="endTime !=null and endTime != ''">
-   and t.end_time= #{endTime}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="personType !=null and personType != ''">
-   and t.person_type= #{personType}
-</if> 
-<if test="authId !=null and authId != ''">
-   and t.auth_id= #{authId}
-</if> 
+    <select id="queryMachineAuthsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from machine_auth t
+        left join u_user u on t.person_id = u.user_id and u.status_cd = '0'
+        left join machine m on t.machine_id = m.machine_id and m.status_cd = '0'
+        where 1 = 1
+        <if test="personName !=null and personName != ''">
+            and t.person_name= #{personName}
+        </if>
+        <if test="machineId !=null and machineId != ''">
+            and t.machine_id= #{machineId}
+        </if>
+        <if test="personId !=null and personId != ''">
+            and t.person_id= #{personId}
+        </if>
+        <if test="startTime !=null and startTime != ''">
+            and t.start_time &lt;= #{startTime}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            and t.end_time &gt;= #{endTime}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="personType !=null and personType != ''">
+            and t.person_type= #{personType}
+        </if>
+        <if test="authId !=null and authId != ''">
+            and t.auth_id= #{authId}
+        </if>
+    </select>
 
-
-     </select>
-
+    <update id="deleteMachineAuth" parameterType="Map">
+        update machine_auth t set t.status_cd = '1'
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="personName !=null and personName != ''">
+            , t.person_name= #{personName}
+        </if>
+        <if test="machineId !=null and machineId != ''">
+            , t.machine_id= #{machineId}
+        </if>
+        <if test="personId !=null and personId != ''">
+            , t.person_id= #{personId}
+        </if>
+        <if test="startTime !=null and startTime != ''">
+            , t.start_time= #{startTime}
+        </if>
+        <if test="state !=null and state != ''">
+            , t.state= #{state}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            , t.end_time= #{endTime}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        <if test="personType !=null and personType != ''">
+            , t.person_type= #{personType}
+        </if>
+        where 1=1
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="authId !=null and authId != ''">
+            and t.auth_id= #{authId}
+        </if>
+    </update>
 </mapper>

--
Gitblit v1.8.0