From 34e795bedc57454c43b00cdf8e2cc2d9eb5a932a Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 11 四月 2025 14:59:50 +0800
Subject: [PATCH] 优化轮灌组分页查询接口
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml | 74 ++++++++++++++++++++++++------------
1 files changed, 49 insertions(+), 25 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
index be5f478..9d205f6 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
@@ -19,8 +19,8 @@
<result column="district" jdbcType="VARCHAR" property="district" />
<result column="address" jdbcType="VARCHAR" property="address" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
- <result column="disabled" jdbcType="TINYINT" property="disabled" />
- <result column="deleted" jdbcType="TINYINT" property="deleted" />
+ <result property="disabled" column="disabled" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Disabled"/>
+ <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Deleted"/>
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
@@ -29,8 +29,8 @@
</sql>
<sql id="part_Column_List">
<!--@mbg.generated-->
- id, countyId, townId, villageId, blockId, divideId, typeId, `name`, num, phone, idCard, area, district,address, remark,
- disabled
+ ${alias}.id, ${alias}.countyId, ${alias}.townId, ${alias}.villageId, ${alias}.blockId, ${alias}.divideId, ${alias}.typeId, ${alias}.name, ${alias}.num, ${alias}.phone, ${alias}.idCard, ${alias}.area, ${alias}.district,${alias}.address, ${alias}.remark,
+ ${alias}.disabled
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
@@ -49,38 +49,46 @@
<select id="selectTotal" parameterType="java.util.Map" resultType="java.lang.Long">
select
count(*)
- from ba_client
- where deleted != 1
+ from ba_client bc
+ left join ba_block bbk on bc.blockId = bbk.id
+ left join ba_client_type bct on bc.typeId = bct.id
+ where bc.deleted != 1
<trim prefix="and" suffixOverrides="and">
<if test="countyId != null">
- countyId = #{countyId,jdbcType=BIGINT} and
+ bc.countyId = #{countyId,jdbcType=BIGINT} and
</if>
<if test="townId != null">
- townId = #{townId,jdbcType=BIGINT} and
+ bc.townId = #{townId,jdbcType=BIGINT} and
</if>
<if test="villageId != null">
- villageId = #{villageId,jdbcType=BIGINT} and
+ bc.villageId = #{villageId,jdbcType=BIGINT} and
</if>
<if test="blockId != null">
- blockId = #{blockId,jdbcType=BIGINT} and
+ bc.blockId = #{blockId,jdbcType=BIGINT} and
</if>
- <if test="name != null">
- name like '%#{name,jdbcType=VARCHAR}%' and
+ <if test="name != null and name != ''">
+ bc.`name` like concat('%', #{name}, '%') and
</if>
- <if test="num != null">
- num = '#{num,jdbcType=VARCHAR}' and
+ <if test="num != null and num != ''">
+ bc.num = #{num,jdbcType=VARCHAR} and
</if>
- <if test="phone != null">
- phone = '#{phone,jdbcType=VARCHAR}' and
+ <if test="phone != null and phone != ''">
+ bc.phone = #{phone,jdbcType=VARCHAR} and
</if>
</trim>
</select>
<select id="selectSome" parameterType="java.util.Map" resultMap="BaseResultMap">
<!--@mbg.generated-->
select
- <include refid="part_Column_List" />
- from ba_client
- where deleted != 1
+ <include refid="part_Column_List" >
+ <property name="alias" value="bc"/>
+ </include>,
+ bbk.`name` blockName,
+ bct.`name` typeName
+ from ba_client bc
+ left join ba_block bbk on bc.blockId = bbk.id
+ left join ba_client_type bct on bc.typeId = bct.id
+ where bc.deleted != 1
<trim prefix="and" suffixOverrides="and">
<if test="countyId != null">
countyId = #{countyId,jdbcType=BIGINT} and
@@ -95,23 +103,23 @@
blockId = #{blockId,jdbcType=BIGINT} and
</if>
<if test="name != null">
- name like '%#{name,jdbcType=VARCHAR}%' and
+ bc.`name` like concat('%', #{name}, '%') and
</if>
<if test="num != null">
- num = '#{num,jdbcType=VARCHAR}' and
+ bc.num = #{num,jdbcType=VARCHAR} and
</if>
<if test="phone != null">
- phone = '#{phone,jdbcType=VARCHAR}' and
+ bc.phone = #{phone,jdbcType=VARCHAR} and
</if>
</trim>
- order by id DESC
+ order by bc.id DESC
<trim prefix="limit " >
<if test="start != null and count != null">
- #{start}, #{count}
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
</if>
</trim>
</select>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaClient">
+ <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaClient">
<!--@mbg.generated-->
insert into ba_client (id, countyId, townId, villageId, blockId, divideId,
typeId, `name`, num, phone,
@@ -328,4 +336,20 @@
where id = #{id,jdbcType=BIGINT}
</delete>
+ <!--鏍规嵁鍐滄埛缂栧彿鑾峰彇5绾ц鏀垮尯鍒掍唬鐮�-->
+ <select id="getAreaCodeByNum" resultType="com.dy.pipIrrGlobal.voBa.VoAreaCode">
+ SELECT
+ pro.num AS provinceId,
+ cit.num AS cityId,
+ con.num AS countryId,
+ tow.num AS townId,
+ vil.num AS villageId
+ FROM ba_client cli
+ INNER JOIN ba_district con ON cli.countyId = con.id
+ INNER JOIN ba_district tow ON cli.townId = tow.id
+ INNER JOIN ba_district vil ON cli.villageId = vil.id
+ INNER JOIN ba_district cit ON cit.id = con.supperId
+ INNER JOIN ba_district pro ON pro.id = cit.supperId
+ WHERE cli.num = #{clientNum}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0