From 17596fa7fe65f33cb89a19ed32fa44508f52e871 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 03 Jul 2023 20:01:39 +0800
Subject: [PATCH] 行政区划增加排序字段
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttAdBase.java | 7 +++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.xml | 7 ++++---
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttAdBase.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttAdBase.java
index 4e99033..d28121f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttAdBase.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttAdBase.java
@@ -67,4 +67,11 @@
@TableField("\"ad_grad\"")
private String adGrad;
+ /**
+ * 排序
+ */
+ @ApiModelProperty(value = "排序")
+ @TableField("\"order_id\"")
+ private Integer orderId;
+
}
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 c37b409..f40ca65 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
@@ -42,7 +42,7 @@
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">
@@ -66,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">
@@ -91,7 +91,7 @@
and region."ad_name" like concat(concat('%', #{param2.name}),'%')
</if>
</where>
- ORDER BY region."ad_code"
+ ORDER BY region."order_id"
</select>
<!--根据水库编号查询除责任人之外的人员信息-->
@@ -113,6 +113,7 @@
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}
--
Gitblit v1.9.3