From 16a96f990b1c2ae06f56a8ebac44e911b9d8ef32 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 23 十一月 2023 14:20:03 +0800
Subject: [PATCH] 行政区划编码最大值改为999，农户编码改为字符串型
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml | 58 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 33 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 0a73af3..0d06d71 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
@@ -12,15 +12,15 @@
<result column="divideId" jdbcType="BIGINT" property="divideId" />
<result column="typeId" jdbcType="BIGINT" property="typeId" />
<result column="name" jdbcType="VARCHAR" property="name" />
- <result column="num" jdbcType="INTEGER" property="num" />
+ <result column="num" jdbcType="VARCHAR" property="num" />
<result column="phone" jdbcType="VARCHAR" property="phone" />
<result column="idCard" jdbcType="VARCHAR" property="idcard" />
<result column="area" jdbcType="FLOAT" property="area" />
<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 concat('%', #{name}, '%') 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>
</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,16 +103,16 @@
blockId = #{blockId,jdbcType=BIGINT} and
</if>
<if test="name != null">
- name like concat('%', #{name}, '%') 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}
@@ -121,7 +129,7 @@
values (#{id,jdbcType=BIGINT}, #{countyId,jdbcType=BIGINT},
#{townId,jdbcType=BIGINT}, #{villageId,jdbcType=BIGINT},
#{blockId,jdbcType=BIGINT}, #{divideId,jdbcType=BIGINT}, #{typeId,jdbcType=BIGINT},
- #{name,jdbcType=VARCHAR}, #{num,jdbcType=INTEGER},
+ #{name,jdbcType=VARCHAR}, #{num,jdbcType=VARCHAR},
#{phone,jdbcType=VARCHAR}, #{idcard,jdbcType=VARCHAR},
#{area,jdbcType=FLOAT}, #{district,jdbcType=VARCHAR},
#{address,jdbcType=VARCHAR},#{remark,jdbcType=VARCHAR},
@@ -211,7 +219,7 @@
#{name,jdbcType=VARCHAR},
</if>
<if test="num != null">
- #{num,jdbcType=INTEGER},
+ #{num,jdbcType=VARCHAR},
</if>
<if test="phone != null">
#{phone,jdbcType=VARCHAR},
@@ -264,7 +272,7 @@
'name' = #{name,jdbcType=VARCHAR},
</if>
<if test="num != null">
- num = #{num,jdbcType=INTEGER},
+ num = #{num,jdbcType=VARCHAR},
</if>
<if test="phone != null">
phone = #{phone,jdbcType=VARCHAR},
@@ -304,7 +312,7 @@
blockId = #{blockId,jdbcType=BIGINT},
typeId = #{typeId,jdbcType=BIGINT},
`name` = #{name,jdbcType=VARCHAR},
- num = #{num,jdbcType=INTEGER},
+ num = #{num,jdbcType=VARCHAR},
phone = #{phone,jdbcType=VARCHAR},
idcard = #{idcard,jdbcType=VARCHAR},
area = #{area,jdbcType=FLOAT},
--
Gitblit v1.8.0