Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110

2022-01-17 48c9414db4b7c44a43524115570796025d38a653

 java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml

@@ -15,7 +15,6 @@
        )
    </insert>


    <!-- 查询车辆管理信息（Business） add by wuxw 2018-07-03 -->
    <select id="getBusinessOwnerCarInfo" parameterType="Map" resultType="Map">
        select t.car_color,t.car_color carColor,t.car_brand,t.car_brand carBrand,t.car_type,t.car_type
@@ -67,9 +66,7 @@
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>

    </select>


    <!-- 保存车辆管理信息至 instance表中 add by wuxw 2018-07-03 -->
    <insert id="saveOwnerCarInfoInstance" parameterType="Map">
@@ -120,7 +117,6 @@
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>

    </insert>


@@ -154,8 +150,17 @@
        <if test="carTypeCd !=null and carTypeCd != ''">
            and t.car_type_cd= #{carTypeCd}
        </if>
        <if test="carTypeCds !=null">
            and t.car_type_cd in
            <foreach collection="carTypeCds" item="item" index="index" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        <if test="carNum !=null and carNum != ''">
            and t.car_num= #{carNum}
        </if>
        <if test="carNumLike !=null and carNumLike != ''">
            and t.car_num like  concat('%',#{carNumLike},'%')
        </if>
        <if test="carNums !=null">
            and t.car_num in
@@ -211,16 +216,20 @@
        <if test="state !=null and state != ''">
            and t.state= #{state}
        </if>
        <if test="valid == '1'">
        <if test="valid == 1">
            and t.end_time &gt; now()
        </if>
        <if test="valid == 3">
            and t.end_time &lt; now()
        </if>
        <if test="valid == 2">
            and t.ps_id= '-1'
        </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="updateOwnerCarInfoInstance" parameterType="Map">
@@ -304,8 +313,17 @@
        <if test="carTypeCd !=null and carTypeCd != ''">
            and t.car_type_cd= #{carTypeCd}
        </if>
        <if test="carTypeCds !=null">
            and t.car_type_cd in
            <foreach collection="carTypeCds" item="item" index="index" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        <if test="carNum !=null and carNum != ''">
            and t.car_num= #{carNum}
        </if>
        <if test="carNumLike !=null and carNumLike != ''">
            and t.car_num like  concat('%',#{carNumLike},'%')
        </if>
        <if test="carNums !=null">
            and t.car_num in
@@ -355,11 +373,31 @@
        <if test="state !=null and state != ''">
            and t.state= #{state}
        </if>
        <if test="valid == '1'">
        <if test="valid == 1">
            and t.end_time &gt; now()
        </if>

        <if test="valid == 3">
            and t.end_time &lt; now()
        </if>
        <if test="valid == 2">
            and t.ps_id= '-1'
        </if>

    </select>

    <select id="queryOwnerParkingSpaceCount" parameterType="Map" resultType="Map">
        select count(DISTINCT t.ps_id) count
        from owner_car t
        where
         t.ps_id != '-1'
        <if test="statusCd !=null and statusCd != ''">
            and t.status_cd= #{statusCd}
        </if>
        <if test="ownerId !=null and ownerId != ''">
            and t.owner_id= #{ownerId}
        </if>
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
    </select>
</mapper>