From f8d1143ef6cfbbaaebe3b25efa24ee19c9ea61c8 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 10 Jan 2024 16:52:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/mapper/UserHouseLabelMapper.xml | 122 ++++++++++++++++++++++++++++++----------
1 files changed, 91 insertions(+), 31 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/mapper/UserHouseLabelMapper.xml b/src/main/java/org/springblade/modules/house/mapper/UserHouseLabelMapper.xml
index 63de322..c5fdf4f 100644
--- a/src/main/java/org/springblade/modules/house/mapper/UserHouseLabelMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/UserHouseLabelMapper.xml
@@ -2,16 +2,15 @@
<!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" />
+ <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">
@@ -23,40 +22,101 @@
color,
remark,
user_id,
- lable_type
+ 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="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>
+ <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>
+ <!-- <!–自定义分页查询–>-->
+ <!-- <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>
--
Gitblit v1.9.3