From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-db/src/main/resources/mapper/user/OwnerCarAttrServiceDaoImplMapper.xml |  319 ++++++++++++++++++++++++++++-------------------------
 1 files changed, 169 insertions(+), 150 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/user/OwnerCarAttrServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/OwnerCarAttrServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index c5f17ea..2bf438c
--- a/java110-db/src/main/resources/mapper/user/OwnerCarAttrServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OwnerCarAttrServiceDaoImplMapper.xml
@@ -5,183 +5,202 @@
 <mapper namespace="ownerCarAttrServiceDaoImpl">
 
     <!-- 淇濆瓨涓氫富杞﹁締灞炴�т俊鎭� add by wuxw 2018-07-03 -->
-       <insert id="saveBusinessOwnerCarAttrInfo" parameterType="Map">
-           insert into business_owner_car_attr(
-attr_id,operate,create_time,spec_cd,community_id,b_id,value,car_id
-) values (
-#{attrId},#{operate},#{createTime},#{specCd},#{communityId},#{bId},#{value},#{carId}
-)
-       </insert>
+    <insert id="saveBusinessOwnerCarAttrInfo" parameterType="Map">
+        insert into business_owner_car_attr(
+        attr_id,operate,create_time,spec_cd,community_id,b_id,value,car_id
+        ) values (
+        #{attrId},#{operate},#{createTime},#{specCd},#{communityId},#{bId},#{value},#{carId}
+        )
+    </insert>
 
 
-       <!-- 鏌ヨ涓氫富杞﹁締灞炴�т俊鎭紙Business锛� add by wuxw 2018-07-03 -->
-       <select id="getBusinessOwnerCarAttrInfo" parameterType="Map" resultType="Map">
-           select  t.attr_id,t.attr_id attrId,t.operate,t.create_time,t.create_time createTime,t.spec_cd,t.spec_cd specCd,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.value,t.car_id,t.car_id carId 
-from business_owner_car_attr t 
-where 1 =1 
-<if test="attrId !=null and attrId != ''">
-   and t.attr_id= #{attrId}
-</if> 
-<if test="operate !=null and operate != ''">
-   and t.operate= #{operate}
-</if> 
-<if test="createTime !=null and createTime != ''">
-   and t.create_time= #{createTime}
-</if> 
-<if test="specCd !=null and specCd != ''">
-   and t.spec_cd= #{specCd}
-</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="value !=null and value != ''">
-   and t.value= #{value}
-</if> 
-<if test="carId !=null and carId != ''">
-   and t.car_id= #{carId}
-</if> 
-
-       </select>
+    <insert id="saveOwnerCarAttr" parameterType="Map">
+        insert into owner_car_attr(
+        attr_id,spec_cd,community_id,b_id,value,car_id
+        ) values (
+        #{attrId},#{specCd},#{communityId},'-1',#{value},#{carId}
+        )
+    </insert>
 
 
+    <!-- 鏌ヨ涓氫富杞﹁締灞炴�т俊鎭紙Business锛� add by wuxw 2018-07-03 -->
+    <select id="getBusinessOwnerCarAttrInfo" parameterType="Map" resultType="Map">
+        select t.attr_id,t.attr_id attrId,t.operate,t.create_time,t.create_time createTime,t.spec_cd,t.spec_cd
+        specCd,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.value,t.car_id,t.car_id carId
+        from business_owner_car_attr t
+        where 1 =1
+        <if test="attrId !=null and attrId != ''">
+            and t.attr_id= #{attrId}
+        </if>
+        <if test="operate !=null and operate != ''">
+            and t.operate= #{operate}
+        </if>
+        <if test="createTime !=null and createTime != ''">
+            and t.create_time= #{createTime}
+        </if>
+        <if test="specCd !=null and specCd != ''">
+            and t.spec_cd= #{specCd}
+        </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="value !=null and value != ''">
+            and t.value= #{value}
+        </if>
+        <if test="carId !=null and carId != ''">
+            and t.car_id= #{carId}
+        </if>
 
+    </select>
 
 
     <!-- 淇濆瓨涓氫富杞﹁締灞炴�т俊鎭嚦 instance琛ㄤ腑 add by wuxw 2018-07-03 -->
     <insert id="saveOwnerCarAttrInfoInstance" parameterType="Map">
         insert into owner_car_attr(
-attr_id,create_time,spec_cd,status_cd,community_id,b_id,value,car_id
-) select t.attr_id,t.create_time,t.spec_cd,'0',t.community_id,t.b_id,t.value,t.car_id from business_owner_car_attr t where 1=1
-<if test="attrId !=null and attrId != ''">
-   and t.attr_id= #{attrId}
-</if> 
-   and t.operate= 'ADD'
-<if test="createTime !=null and createTime != ''">
-   and t.create_time= #{createTime}
-</if> 
-<if test="specCd !=null and specCd != ''">
-   and t.spec_cd= #{specCd}
-</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="value !=null and value != ''">
-   and t.value= #{value}
-</if> 
-<if test="carId !=null and carId != ''">
-   and t.car_id= #{carId}
-</if> 
+        attr_id,create_time,spec_cd,status_cd,community_id,b_id,value,car_id
+        ) select t.attr_id,t.create_time,t.spec_cd,'0',t.community_id,t.b_id,t.value,t.car_id from
+        business_owner_car_attr t where 1=1
+        <if test="attrId !=null and attrId != ''">
+            and t.attr_id= #{attrId}
+        </if>
+        and t.operate= 'ADD'
+        <if test="createTime !=null and createTime != ''">
+            and t.create_time= #{createTime}
+        </if>
+        <if test="specCd !=null and specCd != ''">
+            and t.spec_cd= #{specCd}
+        </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="value !=null and value != ''">
+            and t.value= #{value}
+        </if>
+        <if test="carId !=null and carId != ''">
+            and t.car_id= #{carId}
+        </if>
 
     </insert>
 
 
-
     <!-- 鏌ヨ涓氫富杞﹁締灞炴�т俊鎭� add by wuxw 2018-07-03 -->
     <select id="getOwnerCarAttrInfo" parameterType="Map" resultType="Map">
-        select  t.attr_id,t.attr_id attrId,t.create_time,t.create_time createTime,t.spec_cd,t.spec_cd specCd,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.value,t.car_id,t.car_id carId 
-from owner_car_attr t 
-where 1 =1 
-<if test="attrId !=null and attrId != ''">
-   and t.attr_id= #{attrId}
-</if> 
-<if test="createTime !=null and createTime != ''">
-   and t.create_time= #{createTime}
-</if> 
-<if test="specCd !=null and specCd != ''">
-   and t.spec_cd= #{specCd}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</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="value !=null and value != ''">
-   and t.value= #{value}
-</if> 
-<if test="carId !=null and carId != ''">
-   and t.car_id= #{carId}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.attr_id,t.attr_id attrId,t.create_time,t.create_time createTime,t.spec_cd,t.spec_cd
+        specCd,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.b_id,t.b_id
+        bId,t.value,t.car_id,t.car_id carId,
+        s.spec_name specName,
+        v.value_name valueName,
+        s.list_show listShow
+        from owner_car_attr t
+        left join attr_spec s on t.spec_cd = s.spec_cd and s.status_cd = '0' and t.spec_cd = s.spec_cd and s.table_name = 'owner_car_attr'
+        left join attr_value v on t.`value` = v.`value` and s.spec_id = v.spec_id and v.status_cd = '0'
+        where 1 =1
+        <if test="attrId !=null and attrId != ''">
+            and t.attr_id= #{attrId}
+        </if>
+        <if test="createTime !=null and createTime != ''">
+            and t.create_time= #{createTime}
+        </if>
+        <if test="specCd !=null and specCd != ''">
+            and t.spec_cd= #{specCd}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </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="value !=null and value != ''">
+            and t.value= #{value}
+        </if>
+        <if test="carId !=null and carId != ''">
+            and t.car_id= #{carId}
+        </if>
+        <if test="carIds != null and carIds != null">
+            and t.car_id in
+            <foreach collection="carIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </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="updateOwnerCarAttrInfoInstance" parameterType="Map">
-        update  owner_car_attr t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="createTime !=null and createTime != ''">
-, t.create_time= #{createTime}
-</if> 
-<if test="specCd !=null and specCd != ''">
-, t.spec_cd= #{specCd}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
-<if test="value !=null and value != ''">
-, t.value= #{value}
-</if> 
-<if test="carId !=null and carId != ''">
-, t.car_id= #{carId}
-</if> 
- where 1=1 <if test="attrId !=null and attrId != ''">
-and t.attr_id= #{attrId}
-</if> 
-<if test="bId !=null and bId != ''">
-and t.b_id= #{bId}
-</if> 
+        update owner_car_attr t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="createTime !=null and createTime != ''">
+            , t.create_time= #{createTime}
+        </if>
+        <if test="specCd !=null and specCd != ''">
+            , t.spec_cd= #{specCd}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        <if test="value !=null and value != ''">
+            , t.value= #{value}
+        </if>
+        <if test="carId !=null and carId != ''">
+            , t.car_id= #{carId}
+        </if>
+        where 1=1
+        <if test="attrId !=null and attrId != ''">
+            and t.attr_id= #{attrId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
 
     </update>
 
     <!-- 鏌ヨ涓氫富杞﹁締灞炴�ф暟閲� add by wuxw 2018-07-03 -->
-     <select id="queryOwnerCarAttrsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from owner_car_attr t 
-where 1 =1 
-<if test="attrId !=null and attrId != ''">
-   and t.attr_id= #{attrId}
-</if> 
-<if test="createTime !=null and createTime != ''">
-   and t.create_time= #{createTime}
-</if> 
-<if test="specCd !=null and specCd != ''">
-   and t.spec_cd= #{specCd}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</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="value !=null and value != ''">
-   and t.value= #{value}
-</if> 
-<if test="carId !=null and carId != ''">
-   and t.car_id= #{carId}
-</if> 
+    <select id="queryOwnerCarAttrsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from owner_car_attr t
+        where 1 =1
+        <if test="attrId !=null and attrId != ''">
+            and t.attr_id= #{attrId}
+        </if>
+        <if test="createTime !=null and createTime != ''">
+            and t.create_time= #{createTime}
+        </if>
+        <if test="specCd !=null and specCd != ''">
+            and t.spec_cd= #{specCd}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </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="value !=null and value != ''">
+            and t.value= #{value}
+        </if>
+        <if test="carId !=null and carId != ''">
+            and t.car_id= #{carId}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>

--
Gitblit v1.8.0