From 781c2e20a4bb844dae3f4eafbf5f0e494b942ea8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 25 五月 2023 18:07:08 +0800
Subject: [PATCH] optimize

---
 java110-db/src/main/resources/mapper/community/ParkingSpaceServiceDaoImplMapper.xml |  148 ++++++++++++++++++++++++++-----------------------
 1 files changed, 78 insertions(+), 70 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/community/ParkingSpaceServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/ParkingSpaceServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index a96bea4..a9453db
--- a/java110-db/src/main/resources/mapper/community/ParkingSpaceServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/ParkingSpaceServiceDaoImplMapper.xml
@@ -1,32 +1,29 @@
 <?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="parkingSpaceServiceDaoImpl">
 
     <!-- 淇濆瓨鍋滆溅浣嶄俊鎭� add by wuxw 2018-07-03 -->
     <insert id="saveBusinessParkingSpaceInfo" parameterType="Map">
-        insert into business_parking_space(
-        area,operate,num,ps_id,pa_id, remark,state,community_id,b_id
-        ) values (
-        #{area},#{operate},#{num},#{psId},#{paId},#{remark},#{state},#{communityId},#{bId}
-        )
+        insert into business_parking_space(area, operate, num, ps_id, pa_id, remark, state, community_id, b_id,
+                                           parking_type)
+        values (#{area}, #{operate}, #{num}, #{psId}, #{paId}, #{remark}, #{state}, #{communityId}, #{bId},
+                #{parkingType})
     </insert>
 
     <!-- 淇濆瓨杞︿綅淇℃伅 -->
     <insert id="saveParkingSpace" parameterType="Map">
-        insert into parking_space(
-        area,num,ps_id,pa_id,remark,state,community_id,b_id,parking_type,create_time
-        ) values (
-        #{area},#{num},#{psId},#{paId},#{remark},#{state},#{communityId},#{bId},#{parkingType},#{createTime}
-        )
+        insert into parking_space(area, num, ps_id, pa_id, remark, state, community_id, b_id, parking_type, create_time)
+        values (#{area}, #{num}, #{psId}, #{paId}, #{remark}, #{state}, #{communityId}, #{bId}, #{parkingType},
+                #{createTime})
     </insert>
 
     <!-- 鏌ヨ鍋滆溅浣嶄俊鎭紙Business锛� add by wuxw 2018-07-03 -->
     <select id="getBusinessParkingSpaceInfo" parameterType="Map" resultType="Map">
         select t.area,t.operate,t.num,t.ps_id,t.ps_id
         psId,t.pa_id,t.pa_id
-        paId,t.remark,t.state,t.community_id,t.community_id communityId,t.b_id,t.b_id bId
+        paId,t.remark,t.state,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.parking_type,t.parking_type
+        parkingType
         from business_parking_space t
         where 1 =1
         <if test="area !=null and area != ''">
@@ -35,7 +32,6 @@
         <if test="operate !=null and operate != ''">
             and t.operate= #{operate}
         </if>
-
         <if test="num !=null and num != ''">
             and t.num= #{num}
         </if>
@@ -51,21 +47,23 @@
         <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="parkingType !=null and parkingType != ''">
+            and t.parking_type= #{parkingType}
+        </if>
     </select>
-
 
     <!-- 淇濆瓨鍋滆溅浣嶄俊鎭嚦 instance琛ㄤ腑 add by wuxw 2018-07-03 -->
     <insert id="saveParkingSpaceInfoInstance" parameterType="Map">
         insert into parking_space(
-        area,num,ps_id,pa_id,remark,status_cd,state,community_id,b_id
-        ) select t.area,t.num,t.ps_id,t.pa_id,t.remark,'0',t.state,t.community_id,t.b_id from
+        area,num,ps_id,pa_id,remark,status_cd,state,community_id,b_id,parking_type
+        ) select t.area,t.num,t.ps_id,t.pa_id,t.remark,'0',t.state,t.community_id,t.b_id,t.parking_type
+        from
         business_parking_space t where 1=1
         <if test="area !=null and area != ''">
             and t.area= #{area}
@@ -92,8 +90,10 @@
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
+        <if test="parkingType !=null and parkingType != ''">
+            and t.parking_type= #{parkingType}
+        </if>
     </insert>
-
 
     <!-- 鏌ヨ鍋滆溅浣嶄俊鎭� add by wuxw 2018-07-03 -->
     <select id="getParkingSpaceInfo" parameterType="Map" resultType="Map">
@@ -112,11 +112,13 @@
         t.community_id communityId,
         t.b_id,
         t.b_id bId,
+        t.parking_type,
         t.parking_type parkingType,
-        td2. NAME parkingTypeName,
-        td1. NAME stateName,
+        td2.NAME parkingTypeName,
+        td1.NAME stateName,
         pa.num areaNum,
-        pa.type_cd typeCd
+        pa.type_cd typeCd,
+        t.create_time createTime
         FROM
         parking_space t
         LEFT JOIN t_dict td1 ON t.state = td1.status_cd
@@ -167,6 +169,12 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="paIds != null ">
+                and t.pa_id in
+                <foreach collection="paIds" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
             <if test="communityId !=null and communityId != ''">
                 and t.community_id= #{communityId}
             </if>
@@ -179,7 +187,6 @@
             </if>
         </where>
     </select>
-
 
     <!-- 淇敼鍋滆溅浣嶄俊鎭� add by wuxw 2018-07-03 -->
     <update id="updateParkingSpaceInfoInstance" parameterType="Map">
@@ -219,53 +226,54 @@
 
     <!-- 鏌ヨ鍋滆溅浣嶆暟閲� add by wuxw 2018-07-03 -->
     <select id="queryParkingSpacesCount" parameterType="Map" resultType="Map">
-        select count(1) count
+        SELECT count(1) count
         FROM
-        parking_space t,t_dict td,parking_area pa
-        where
-        t.state = td.status_cd
-        and td.table_name='parking_space'
-        and td.table_columns='state'
-        and t.pa_id = pa.pa_id
-        and pa.status_cd ='0'
-        <if test="area !=null and area != ''">
-            and t.area= #{area}
-        </if>
-        <if test="num !=null and num != ''">
-            and t.num= #{num}
-        </if>
-        <if test="areaNum !=null and areaNum != ''">
-            and pa.num= #{areaNum}
-        </if>
-        <if test="psId !=null and psId != ''">
-            and t.ps_id= #{psId}
-        </if>
-        <if test="paId !=null and paId != ''">
-            and t.pa_id= #{paId}
-        </if>
-        <if test="remark !=null and remark != ''">
-            and t.remark= #{remark}
-        </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="states != null and states != null">
-            and t.state in
-            <foreach collection="states" item="item" open="(" close=")" separator=",">
-                #{item}
-            </foreach>
-        </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>
-
-
+        parking_space t
+        LEFT JOIN t_dict td1 ON t.state = td1.status_cd
+        AND td1.table_name = 'parking_space'
+        AND td1.table_columns = 'state'
+        LEFT JOIN t_dict td2 ON t.parking_type = td2.status_cd
+        AND td2.table_name = 'parking_space'
+        AND td2.table_columns = 'parking_type'
+        LEFT JOIN parking_area pa ON t.pa_id = pa.pa_id
+        AND pa.status_cd = '0'
+        <where>
+            <if test="area !=null and area != ''">
+                and t.area= #{area}
+            </if>
+            <if test="num !=null and num != ''">
+                and t.num= #{num}
+            </if>
+            <if test="areaNum !=null and areaNum != ''">
+                and pa.num= #{areaNum}
+            </if>
+            <if test="psId !=null and psId != ''">
+                and t.ps_id= #{psId}
+            </if>
+            <if test="paId !=null and paId != ''">
+                and t.pa_id= #{paId}
+            </if>
+            <if test="remark !=null and remark != ''">
+                and t.remark= #{remark}
+            </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="states != null and states != null">
+                and t.state in
+                <foreach collection="states" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </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>
+        </where>
     </select>
-
 </mapper>

--
Gitblit v1.8.0