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

Your Name

2023-07-11 d7d9b601b2e4fdb663375993e2cfbdbd363df421

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

@@ -8,9 +8,9 @@
    <!-- 保存车辆信息 add by wuxw 2018-07-03 -->
    <insert id="saveOwnerCarInfo" parameterType="Map">
        insert into owner_car(car_brand, car_num, ps_id, remark, owner_id, car_type_cd, user_id, car_id, car_color,
                              car_type, start_time, end_time, state, community_id, member_id, b_id,lease_type)
        car_type, start_time, end_time, state, community_id, member_id, b_id,lease_type)
        values (#{carBrand}, #{carNum}, #{psId}, #{remark}, #{ownerId}, #{carTypeCd}, #{userId}, #{carId}, #{carColor},
                #{carType}, #{startTime}, #{endTime}, #{state}, #{communityId}, #{memberId}, '-1',#{leaseType})
        #{carType}, #{startTime}, #{endTime}, #{state}, #{communityId}, #{memberId}, '-1',#{leaseType})
    </insert>


@@ -20,7 +20,8 @@
        psId,t.remark,t.status_cd,t.status_cd statusCd,t.owner_id,t.owner_id ownerId,t.car_type_cd,t.car_type_cd
        carTypeCd,t.user_id,t.user_id userId,t.car_id,t.car_id carId,t.car_color,t.car_color
        carColor,t.car_type,t.car_type carType,t.start_time,t.start_time startTime,t.end_time,t.end_time
        endTime,t.state,t.community_id,t.community_id communityId,t.member_id,t.member_id memberId,t.lease_type leaseType
        endTime,t.state,t.community_id,t.community_id communityId,t.member_id,t.member_id memberId,t.lease_type
        leaseType
        from owner_car t
        where 1 =1
        <if test="carBrand !=null and carBrand != ''">
@@ -28,6 +29,9 @@
        </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="psId !=null and psId != ''">
            and t.ps_id= #{psId}
@@ -159,6 +163,9 @@
        <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="psId !=null and psId != ''">
            and t.ps_id= #{psId}
        </if>
@@ -212,4 +219,17 @@
        </if>
    </select>


    <select id="queryOwnerCarCountByOwnerIds" parameterType="Map" resultType="Map">
        select t.owner_id ownerId,count(1) carCount
        from
        owner_car t
        where t.status_cd = '0'
        and t.owner_id in
        <foreach collection="ownerIds" item="item" open="(" close=")" separator=",">
            #{item}
        </foreach>
        group by t.owner_id
    </select>

</mapper>