From 3ce737b52fca082ac3a2ecda4a848e2e4abcd0ee Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 06 Jul 2023 09:38:18 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.xml | 49 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 43 insertions(+), 6 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.xml
index 9ec25fb..1190e55 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.xml
@@ -10,6 +10,12 @@
<result column="key" property="key"/>
<result column="has_children" property="hasChildren"/>
</resultMap>
+ <insert id="customizeSave">
+ INSERT INTO "att_ad_base"
+ ("guid","ad_code","ad_name","p_ad_code","p_ad_name","ad_grad")
+ VALUES
+ (#{attAdBase.adCode},#{attAdBase.adCode},#{attAdBase.adName},#{attAdBase.pAdCode},#{attAdBase.pAdName},#{attAdBase.adGrad})
+ </insert>
<select id="lazyTree" resultMap="treeNodeResultMap">
SELECT
@@ -27,14 +33,16 @@
and region."p_ad_code" = #{param1}
</if>
<if test="param2.code!=null and param2.code!=''">
- and region."ad_code" like concat(concat('%', #{param2.code}),'%')
+ and region."ad_code" like concat(#{param2.code},'%')
</if>
<if test="param2.name!=null and param2.name!=''">
- and region."ad_name" like concat(concat('%', #{param2.name}),'%')
+ and region."ad_name" like concat('%',#{param2.name},'%')
</if>
- and region."ad_grad" != 4
+ <if test="param2.showFour !=null and param2.showFour !=''">
+ and IF(#{param2.showFour} = 'true',region."ad_grad" != 5,region."ad_grad" != 4)
+ </if>
</where>
- ORDER BY region."ad_code"
+ ORDER BY region."order_id"
</select>
<select id="selectAttAdBaseTree" resultType="cn.gistack.common.node.TreeNode">
@@ -58,7 +66,7 @@
</if>
and region."ad_grad" != 4
</where>
- ORDER BY region."ad_code"
+ ORDER BY region."order_id"
</select>
<select id="lazyTreeAll" resultMap="treeNodeResultMap">
@@ -83,7 +91,36 @@
and region."ad_name" like concat(concat('%', #{param2.name}),'%')
</if>
</where>
- ORDER BY region."ad_code"
+ ORDER BY region."order_id"
+ </select>
+
+ <!--根据水库编号查询除责任人之外的人员信息-->
+ <select id="getPersonListByResGuid" resultType="cn.gistack.sm.sjztmd.vo.PersonVO">
+ select bu.real_name as name,bu.phone,bd.ad_code from YWXT.blade_user bu
+ left join YWXT.blade_dept bd on locate(bd.id,bu.dept_id)>0 and bd.is_deleted = 0
+ left join YWXT.blade_role br on locate(br.id,bu.role_id)>0 and br.is_deleted = 0
+ where bu.is_deleted = 0
+ and bd.ad_code in (
+ select "ad_code" from SJZT_MD."att_ad_base"
+ start with "ad_code" = (select "interior_ad_guid" from SJZT_MD."att_res_base" where "guid" = #{res_cd} )
+ CONNECT BY PRIOR "p_ad_code" = "ad_code"
+ )
+ and br.role_name like concat('%',#{roleName},'%')
+ and bu.phone is not null and bu.phone!=''
+ </select>
+
+ <select id="getDetail" resultType="cn.gistack.sm.sjztmd.vo.AttAdBaseVO">
+ SELECT
+ region."guid",
+ region."ad_code",
+ region."p_ad_code",
+ region."ad_name",
+ region."ad_grad",
+ region."p_ad_name" AS pAdName,
+ region."order_id" AS orderId,
+ ( SELECT CASE WHEN count( 1 ) > 0 THEN 1 ELSE 0 END FROM "SJZT_MD"."att_ad_base" WHERE "p_ad_code" = region."ad_code" ) AS "has_children"
+ FROM "SJZT_MD"."att_ad_base" region
+ WHERE region."guid" = #{attAdBase.guid}
</select>
</mapper>
--
Gitblit v1.9.3