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

Your Name

2023-07-11 d7d9b601b2e4fdb663375993e2cfbdbd363df421

 java110-db/src/main/resources/mapper/community/CommunitySpacePersonV1ServiceDaoImplMapper.xml

@@ -8,9 +8,9 @@
    <!-- 保存小区场地预约信息 add by wuxw 2018-07-03 -->
    <insert id="saveCommunitySpacePersonInfo" parameterType="Map">
        insert into community_space_person(
        receivable_amount,pay_way,remark,received_amount,person_name,space_id,csp_id,appointment_time,person_id,state,person_tel,community_id
        receivable_amount,pay_way,remark,received_amount,person_name,space_id,csp_id,appointment_time,person_id,state,person_tel,community_id,order_id
        ) values (
        #{receivableAmount},#{payWay},#{remark},#{receivedAmount},#{personName},#{spaceId},#{cspId},#{appointmentTime},#{personId},#{state},#{personTel},#{communityId}
        #{receivableAmount},#{payWay},#{remark},#{receivedAmount},#{personName},#{spaceId},#{cspId},#{appointmentTime},#{personId},#{state},#{personTel},#{communityId},#{orderId}
        )
    </insert>

@@ -22,12 +22,12 @@
        receivedAmount,t.person_name,t.person_name personName,t.space_id,t.space_id spaceId,t.csp_id,t.csp_id
        cspId,t.appointment_time,t.appointment_time appointmentTime,t.person_id,t.person_id
        personId,t.state,t.person_tel,t.person_tel personTel,t.community_id,t.community_id communityId,td.name stateName,td1.name payWayName,
        cs.name spaceName,t.create_time createTime
        cs.name spaceName,t.create_time createTime,cv.`name` venueName
        from community_space_person t
        left join community_space cs on t.space_id = cs.space_id and cs.status_cd = '0'
        left join community_venue cv on cs.venue_id = cv.venue_id and cv.status_cd = '0'
        left join t_dict td on t.state = td.status_cd and td.table_name = 'community_space_person' and td.table_columns = 'state'
        left join t_dict td1 on t.pay_way = td1.status_cd and td1.table_name = 'community_space_person' and td1.table_columns = 'pay_way'

        where 1 =1
        <if test="receivableAmount !=null and receivableAmount != ''">
            and t.receivable_amount= #{receivableAmount}
@@ -49,6 +49,9 @@
        </if>
        <if test="spaceId !=null and spaceId != ''">
            and t.space_id= #{spaceId}
        </if>
        <if test="orderId !=null and orderId != ''">
            and t.order_id= #{orderId}
        </if>
        <if test="venueId !=null and venueId != ''">
            and cs.venue_id= #{venueId}
@@ -152,6 +155,9 @@
        <if test="spaceId !=null and spaceId != ''">
            and t.space_id= #{spaceId}
        </if>
        <if test="orderId !=null and orderId != ''">
            and t.order_id= #{orderId}
        </if>
        <if test="venueId !=null and venueId != ''">
            and cs.venue_id= #{venueId}
        </if>