bug修复

linwei

2024-01-10 1e6e1c296add6c168eaa99a8a3e37a9f34d9a2dd

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<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"/>
    </resultMap>
 
    <sql id="selectUserHouseLabel">
        select
            id,
            house_code,
            label_id,
            label_name,
            color,
            remark,
            user_id,
            lable_type,
            household_id
        from
            jczz_user_house_label
    </sql>
 
 
    <!--    <select id="selectUserHouseLabelList" parameterType="org.springblade.modules.house.dto.UserHouseLabelDTO" resultMap="UserHouseLabelDTOResult">-->
    <!--        <include refid="selectUserHouseLabel"/>-->
    <!--        <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>-->
    <!--        </where>-->
    <!--    </select>-->
 
 
    <select id="selectHouseLabelPage" resultMap="UserHouseLabelDTOResult">
        <include refid="selectUserHouseLabel"/>
        <where>
            <if test="houseLabel.id != null ">and id = #{houseLabel.id}</if>
            <if test="houseLabel.houseCode != null  and houseLabel.houseCode != ''">and house_code =
                #{houseLabel.houseCode}
            </if>
            <if test="houseLabel.labelId != null ">and label_id = #{houseLabel.labelId}</if>
            <if test="houseLabel.labelName != null  and houseLabel.labelName != ''">and label_name =
                #{houseLabel.labelName}
            </if>
            <if test="houseLabel.color != null  and houseLabel.color != ''">and color = #{houseLabel.color}</if>
            <if test="houseLabel.remark != null  and remark != ''">and remark = #{houseLabel.remark}</if>
            <if test="houseLabel.userId != null ">and user_id = #{houseLabel.userId}</if>
            <if test="houseLabel.lableType != null ">and lable_type = #{houseLabel.lableType}</if>
        </where>
    </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 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>
        </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>