From e0b8a22df9a40e1b5691140e23721d2c0a5a5a0b Mon Sep 17 00:00:00 2001
From: wangwh <2397901735@qq.com>
Date: Fri, 25 Oct 2024 09:32:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_grid' into gzdyh_grid
---
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUnitMapper.xml | 86 +++++++++++++++++++++++++++++++++++-------
1 files changed, 71 insertions(+), 15 deletions(-)
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUnitMapper.xml b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUnitMapper.xml
index 00e5dba..efcc35f 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUnitMapper.xml
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUnitMapper.xml
@@ -5,7 +5,7 @@
* @description: 自定义sql，请自行实现业务逻辑
* @company: hugeinfo
* @author: liyj
- * @time:2024-08-19 20:04:19
+ * @time:2024-10-17 16:41:35
* @version 1.0.0
-->
<mapper namespace="cn.huge.module.ctuser.dao.mapper.CtUnitMapper">
@@ -51,7 +51,8 @@
<result property="workTimeWeek" column="work_time_week"/>
<result property="workTimeAm" column="work_time_am"/>
<result property="workTimePm" column="work_time_pm"/>
-
+ <result property="unitFun" column="unit_fun"/>
+ <result property="courtStatus" column="court_status"/>
</resultMap>
<!-- 表 -->
<sql id='table-name'>dyh_ct_unit</sql>
@@ -96,7 +97,9 @@
telephone,
work_time_week,
work_time_am,
- work_time_pm
+ work_time_pm,
+ unit_fun,
+ court_status
</sql>
<!-- 更新实体字段 -->
<sql id="set-part">
@@ -139,16 +142,13 @@
<if test="entity.workTimeWeek != null">work_time_week = #{entity.workTimeWeek},</if>
<if test="entity.workTimeAm != null">work_time_am = #{entity.workTimeAm},</if>
<if test="entity.workTimePm != null">work_time_pm = #{entity.workTimePm},</if>
-
-
+ <if test="entity.unitFun != null">unit_fun = #{entity.unitFun},</if>
+ <if test="entity.courtStatus != null">court_status = #{entity.courtStatus}</if>
</sql>
<!-- 条件 -->
<sql id="where-part">
<if test="terms != null">
<where>
- <if test="terms.keyword != null and terms.keyword !=''">
- and unit_name like CONCAT('%', #{terms.keyword}, '%')
- </if>
<if test="terms.id != null and terms.id !=''">
and id = #{terms.id}
</if>
@@ -166,12 +166,6 @@
</if>
<if test="terms.unitType != null and terms.unitType !=''">
and unit_type = #{terms.unitType}
- </if>
- <if test="terms.unitTypes != null and terms.unitTypes.size > 0 ">
- and unit_type in
- <foreach item="unitType" collection="terms.unitTypes" separator="," open="(" close=")" index="">
- #{unitType}
- </foreach>
</if>
<if test="terms.unitCode != null and terms.unitCode !=''">
and unit_code = #{terms.unitCode}
@@ -271,6 +265,27 @@
and (DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.updateStart}
and DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.updateEnd})
</if>
+ <if test="terms.postalCode != null and terms.postalCode !=''">
+ and postal_code = #{terms.postalCode}
+ </if>
+ <if test="terms.telephone != null and terms.telephone !=''">
+ and telephone = #{terms.telephone}
+ </if>
+ <if test="terms.workTimeWeek != null and terms.workTimeWeek !=''">
+ and work_time_week = #{terms.workTimeWeek}
+ </if>
+ <if test="terms.workTimeAm != null and terms.workTimeAm !=''">
+ and work_time_am = #{terms.workTimeAm}
+ </if>
+ <if test="terms.workTimePm != null and terms.workTimePm !=''">
+ and work_time_pm = #{terms.workTimePm}
+ </if>
+ <if test="terms.unitFun != null and terms.unitFun !=''">
+ and unit_fun = #{terms.unitFun}
+ </if>
+ <if test="terms.courtStatus != null and terms.courtStatus !=''">
+ and court_status = #{terms.courtStatus}
+ </if>
</where>
</if>
</sql>
@@ -351,4 +366,45 @@
set target_unit_name = #{unitName}
where target_unit_id = #{unitId}
</update>
-</mapper>
\ No newline at end of file
+
+ <!-- 查询某一单位下下一级所有管辖单位-->
+ <select id="listAllChild" resultMap="dataResult">
+ WITH RECURSIVE unit_hierarchy(id, parent_id, name) AS (
+ -- 锚成员 (起始点)
+ SELECT
+ id ,
+ parent_id,
+ unit_name
+ FROM
+ dyh_ct_unit
+ WHERE
+ id = #{unitId}
+
+ UNION ALL
+
+ -- 递归成员
+ SELECT
+ u.id,
+ u.parent_id,
+ u.unit_name
+ FROM
+ dyh_ct_unit u
+ JOIN
+ unit_hierarchy h ON u.parent_id = h.id where u.delete_status = 0
+ )
+ SELECT
+ id AS id,
+ parent_id AS parent_id,
+ name AS unit_name
+ FROM
+ unit_hierarchy;
+ </select>
+
+ <!-- 根据条件分页查询 -->
+ <select id="selectUnitByGridId" resultMap="dataResult">
+ SELECT
+ t1.*
+ FROM dyh_ct_unit t1 left join dyh_ct_unit_grid t2 on t1.id = t2.dyh_unit_id
+ where t2.third_unit_id = #{gridUnitId} limit 1
+ </select>
+</mapper>
\ No newline at end of file
--
Gitblit v1.8.0