linwe
2023-11-17 f6672d6695f0018c1c8bb7ea488c1983dba2309a
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -11,7 +11,7 @@
        <result column="associated_user_id" property="associatedUserId"/>
        <result column="associated_user_name" property="associatedUserName"/>
        <result column="relationship" property="relationship"/>
        <result column="primary_contact" property="primaryContact"/>
<!--        <result column="primary_contact" property="primaryContact"/>-->
        <result column="residential_status" property="residentialStatus"/>
        <result column="gender" property="gender"/>
        <result column="birthday" property="birthday"/>
@@ -28,7 +28,7 @@
        <result column="other_contact" property="otherContact"/>
        <result column="current_address" property="currentAddress"/>
        <result column="disability_cert" property="disabilityCert"/>
        <result column="data_status" property="dataStatus"/>
<!--        <result column="data_status" property="dataStatus"/>-->
        <result column="role_type" property="roleType"/>
        <result column="party_ember" property="partyEmber"/>
        <result column="create_user" property="createUser"/>
@@ -37,6 +37,7 @@
        <result column="update_time" property="updateTime"/>
        <result column="remark" property="remark"/>
        <result column="is_deleted" property="isDeleted"/>
        <result column="confirm_flag" property="confirmFlag"/>
    </resultMap>
    <sql id="selectHousehold">
@@ -72,9 +73,9 @@
            update_user,
            update_time,
            remark,
            is_deleted
        from
            jczz_household
            is_deleted,
            confirm_flag
        from jczz_household
    </sql>
    <resultMap id="householdAndLabelMap" type="org.springblade.modules.house.vo.HouseholdVO" autoMapping="true">
@@ -87,8 +88,29 @@
    </resultMap>
    <!--自定义分页数据查询-->
    <select id="selectHouseholdPage" resultMap="householdResultMap">
        select * from jczz_household where is_deleted = 0
    <select id="selectHouseholdPage" resultType="org.springblade.modules.house.vo.HouseholdVO">
        select
        jh.*,
        jhs.district_name aoiName,
        concat(jhs.building," ",unit," ",room) as address
        from
        jczz_household jh join jczz_house jhs on jh.house_code = jhs.house_code and jhs.is_deleted = 0
        where jh.is_deleted = 0
        <if test="household.name!=null and household.name !=''">
            and jh.name like concat('%',#{household.name},'%')
        </if>
        <if test="household.phoneNumber!=null and household.phoneNumber !=''">
            and jh.phone_number like concat('%',#{household.phoneNumber},'%')
        </if>
        <if test="household.idCard!=null and household.idCard !=''">
            and jh.id_card like concat('%',#{household.idCard},'%')
        </if>
        <if test="household.aoiName!=null and household.aoiName !=''">
            and jhs.district_name like concat('%',#{household.aoiName},'%')
        </if>
        <if test="household.confirmFlag != null ">
            and jh.confirm_flag = #{household.confirmFlag}
        </if>
    </select>
    <!--查询房屋集合信息-->
@@ -112,9 +134,9 @@
            jh.*,
            jhl.id as cid,jhl.*,jhl.remark as cremark
        from jczz_household jh
        left join jczz_household_label jhl on jh.id = jhl.household_id
        where 1=1 and is_deleted = 0
        and house_code = #{code}
        left join jczz_user_house_label jhl on jh.id = jhl.household_id
        where 1=1 and jh.is_deleted = 0
        and jh.house_code = #{code}
    </select>
    <!--查询房屋集合信息-按id-->
@@ -123,12 +145,12 @@
            jh.*,
            jhl.id as cid,jhl.*,jhl.remark as cremark
        from jczz_household jh
        left join jczz_household_label jhl on jh.id = jhl.household_id
        left join jczz_user_house_label jhl on jh.id = jhl.household_id
        where 1=1 and is_deleted = 0
        and jh.id = #{household.id}
    </select>
    <select id="export" resultType="org.springblade.modules.system.excel.HouseHoldExcel">
    <select id="export" resultType="org.springblade.modules.house.excel.HouseHoldExcel">
        <include refid="selectHousehold"/>
        <where>
            <if test="id != null "> and id = #{id}</if>
@@ -167,4 +189,20 @@
    </select>
    <select id="statistics" resultType="java.lang.Integer">
        SELECT
            count(1)
        FROM
            jczz_grid_range jgr
                LEFT JOIN jczz_grid jg ON jg.id = jgr.grid_id
                LEFT JOIN jczz_household jh on jh.house_code=jgr.house_code
        WHERE
            jg.is_deleted = 0
          and jh.confirm_flag = 0
          AND jg.user_id = #{userId}
    </select>
</mapper>