bug修复

linwei

2024-01-10 1e6e1c296add6c168eaa99a8a3e37a9f34d9a2dd

 src/main/java/org/springblade/modules/house/mapper/UserHouseLabelMapper.xml

@@ -3,14 +3,14 @@
<mapper namespace="org.springblade.modules.house.mapper.UserHouseLabelMapper">

    <resultMap type="org.springblade.modules.house.dto.UserHouseLabelDTO" id="UserHouseLabelDTOResult">
        <result property="id"    column="id"    />
        <result property="houseCode"    column="house_code"    />
        <result property="labelId"    column="label_id"    />
        <result property="labelName"    column="label_name"    />
        <result property="color"    column="color"    />
        <result property="remark"    column="remark"    />
        <result property="userId"    column="user_id"    />
        <result property="lableType"    column="lable_type"    />
        <result property="id" column="id"/>
        <result property="houseCode" column="house_code"/>
        <result property="labelId" column="label_id"/>
        <result property="labelName" column="label_name"/>
        <result property="color" column="color"/>
        <result property="remark" column="remark"/>
        <result property="userId" column="user_id"/>
        <result property="lableType" column="lable_type"/>
    </resultMap>

    <sql id="selectUserHouseLabel">
@@ -62,28 +62,61 @@
        </where>
    </select>

<!--    &lt;!&ndash;自定义分页查询&ndash;&gt;-->
<!--    <select id="selectHouseholdLabelPage" resultMap="householdLabelResultMap">-->
<!--        select * from jczz_household_label where is_deleted = 0-->
<!--    </select>-->
    <!--    &lt;!&ndash;自定义分页查询&ndash;&gt;-->
    <!--    <select id="selectHouseholdLabelPage" resultMap="householdLabelResultMap">-->
    <!--        select * from jczz_household_label where is_deleted = 0-->
    <!--    </select>-->




    <select id="getUserLabelList" resultType="java.lang.Integer"  parameterType="org.springblade.modules.house.dto.UserHouseLabelDTO">
    <select id="getUserLabelList" resultType="java.lang.Integer"
            parameterType="org.springblade.modules.house.dto.UserHouseLabelDTO">
        select label_id
        from jczz_user_house_label
        <where>
            <if test="id != null "> and id = #{id}</if>
            <if test="houseCode != null  and houseCode != ''"> and house_code = #{houseCode}</if>
            <if test="labelId != null "> and label_id = #{labelId}</if>
            <if test="labelName != null  and labelName != ''"> and label_name = #{labelName}</if>
            <if test="color != null  and color != ''"> and color = #{color}</if>
            <if test="remark != null  and remark != ''"> and remark = #{remark}</if>
            <if test="userId != null "> and user_id = #{userId}</if>
            <if test="lableType != null "> and lable_type = #{lableType}</if>
            <if test="id != null ">and id = #{id}</if>
            <if test="houseCode != null  and houseCode != ''">and house_code = #{houseCode}</if>
            <if test="labelId != null ">and label_id = #{labelId}</if>
            <if test="labelName != null  and labelName != ''">and label_name = #{labelName}</if>
            <if test="color != null  and color != ''">and color = #{color}</if>
            <if test="remark != null  and remark != ''">and remark = #{remark}</if>
            <if test="userId != null ">and user_id = #{userId}</if>
            <if test="lableType != null ">and lable_type = #{lableType}</if>
        </where>
    </select>

    <select id="statisticalLabels" resultType="org.springblade.modules.house.vo.HouseholdLabelVO"
            parameterType="org.springblade.modules.house.vo.HouseholdLabelVO">
        SELECT
   br.region_level,
   br.NAME regionName,
   jc.`street_code`,
   jc.NAME communityName,
      jc.code communityCode,
   (
   SELECT
      count( 1 )
   FROM
      jczz_user_house_label juhl
      LEFT JOIN jczz_label jl ON juhl.label_id = jl.id
   WHERE
      juhl.lable_type = 1
      AND jl.parent_id = '103'
      AND juhl.household_id IS NOT NULL
      AND juhl.house_code IN (
      SELECT
         jgr.house_code
      FROM
         jczz_grid jg
         LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
      WHERE
         jc.`code` = jg.community_code
      )) numbers
FROM
   jczz_community jc
   LEFT JOIN `blade_region` br ON br.`code` = jc.`street_code`
WHERE
   jc.street_code IS NOT NULL
    </select>


</mapper>