From d919e26796ec5a6f78fc0b665840207f185f1274 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 22 二月 2024 15:25:20 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml | 146 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 107 insertions(+), 39 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
index ce8f63e..5d33225 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
@@ -11,12 +11,14 @@
<result column="blockId" jdbcType="BIGINT" property="blockid" />
<result column="divideId" jdbcType="BIGINT" property="divideid" />
<result column="name" jdbcType="VARCHAR" property="name" />
+ <result column="virtualId" jdbcType="BIGINT" property="virtualid" />
<result column="clientNum" jdbcType="VARCHAR" property="clientnum" />
<result column="districtNum" jdbcType="BIGINT" property="districtnum" />
<result column="districtTitle" jdbcType="VARCHAR" property="districttitle" />
<result column="phone" jdbcType="VARCHAR" property="phone" />
<result column="idCard" jdbcType="VARCHAR" property="idcard" />
<result column="area" jdbcType="DOUBLE" property="area" />
+ <result column="typeId" jdbcType="BIGINT" property="typeid" />
<result column="address" jdbcType="VARCHAR" property="address" />
<result column="remarks" jdbcType="VARCHAR" property="remarks" />
<result column="operator" jdbcType="BIGINT" property="operator" />
@@ -26,9 +28,9 @@
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, countyId, townId, villageId, blockId, divideId, `name`, clientNum, districtNum,
- districtTitle, phone, idCard, area, address, remarks, `operator`, operateDt, disabled,
- deleted
+ id, countyId, townId, villageId, blockId, divideId, `name`, virtualId, clientNum,
+ districtNum, districtTitle, phone, idCard, area, typeId, address, remarks, `operator`,
+ operateDt, disabled, deleted
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -42,23 +44,27 @@
delete from se_client
where id = #{id,jdbcType=BIGINT}
</delete>
+
<insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoSe.SeClient">
<!--@mbg.generated-->
insert into se_client (id, countyId, townId,
villageId, blockId, divideId,
- `name`, clientNum, districtNum,
- districtTitle, phone, idCard,
- area, address, remarks,
- `operator`, operateDt, disabled,
- deleted)
+ `name`, virtualId, clientNum,
+ districtNum, districtTitle, phone,
+ idCard, area, typeId,
+ address, remarks, `operator`,
+ operateDt, disabled, deleted
+ )
values (#{id,jdbcType=BIGINT}, #{countyid,jdbcType=BIGINT}, #{townid,jdbcType=BIGINT},
#{villageid,jdbcType=BIGINT}, #{blockid,jdbcType=BIGINT}, #{divideid,jdbcType=BIGINT},
- #{name,jdbcType=VARCHAR}, #{clientnum,jdbcType=VARCHAR}, #{districtnum,jdbcType=BIGINT},
- #{districttitle,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, #{idcard,jdbcType=VARCHAR},
- #{area,jdbcType=DOUBLE}, #{address,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR},
- #{operator,jdbcType=BIGINT}, #{operatedt,jdbcType=TIMESTAMP}, #{disabled,jdbcType=TINYINT},
- #{deleted,jdbcType=TINYINT})
+ #{name,jdbcType=VARCHAR}, #{virtualid,jdbcType=BIGINT}, #{clientnum,jdbcType=VARCHAR},
+ #{districtnum,jdbcType=BIGINT}, #{districttitle,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR},
+ #{idcard,jdbcType=VARCHAR}, #{area,jdbcType=DOUBLE}, #{typeid,jdbcType=BIGINT},
+ #{address,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT},
+ #{operatedt,jdbcType=TIMESTAMP}, #{disabled,jdbcType=TINYINT}, #{deleted,jdbcType=TINYINT}
+ )
</insert>
+
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoSe.SeClient">
<!--@mbg.generated-->
insert into se_client
@@ -84,6 +90,9 @@
<if test="name != null">
`name`,
</if>
+ <if test="virtualid != null">
+ virtualId,
+ </if>
<if test="clientnum != null">
clientNum,
</if>
@@ -101,6 +110,9 @@
</if>
<if test="area != null">
area,
+ </if>
+ <if test="typeid != null">
+ typeId,
</if>
<if test="address != null">
address,
@@ -143,6 +155,9 @@
<if test="name != null">
#{name,jdbcType=VARCHAR},
</if>
+ <if test="virtualid != null">
+ #{virtualid,jdbcType=BIGINT},
+ </if>
<if test="clientnum != null">
#{clientnum,jdbcType=VARCHAR},
</if>
@@ -160,6 +175,9 @@
</if>
<if test="area != null">
#{area,jdbcType=DOUBLE},
+ </if>
+ <if test="typeid != null">
+ #{typeid,jdbcType=BIGINT},
</if>
<if test="address != null">
#{address,jdbcType=VARCHAR},
@@ -203,6 +221,9 @@
<if test="name != null">
`name` = #{name,jdbcType=VARCHAR},
</if>
+ <if test="virtualid != null">
+ virtualId = #{virtualid,jdbcType=BIGINT},
+ </if>
<if test="clientnum != null">
clientNum = #{clientnum,jdbcType=VARCHAR},
</if>
@@ -220,6 +241,9 @@
</if>
<if test="area != null">
area = #{area,jdbcType=DOUBLE},
+ </if>
+ <if test="typeid != null">
+ typeId = #{typeid,jdbcType=BIGINT},
</if>
<if test="address != null">
address = #{address,jdbcType=VARCHAR},
@@ -251,17 +275,18 @@
blockId = #{blockid,jdbcType=BIGINT},
divideId = #{divideid,jdbcType=BIGINT},
`name` = #{name,jdbcType=VARCHAR},
+<!-- virtualId = #{virtualid,jdbcType=BIGINT},-->
clientNum = #{clientnum,jdbcType=VARCHAR},
districtNum = #{districtnum,jdbcType=BIGINT},
districtTitle = #{districttitle,jdbcType=VARCHAR},
phone = #{phone,jdbcType=VARCHAR},
idCard = #{idcard,jdbcType=VARCHAR},
area = #{area,jdbcType=DOUBLE},
+ typeId = #{typeid,jdbcType=BIGINT},
address = #{address,jdbcType=VARCHAR},
remarks = #{remarks,jdbcType=VARCHAR},
`operator` = #{operator,jdbcType=BIGINT},
- operateDt = #{operatedt,jdbcType=TIMESTAMP}
-<!-- ,-->
+ operateDt = #{operatedt,jdbcType=TIMESTAMP},
<!-- disabled = #{disabled,jdbcType=TINYINT},-->
<!-- deleted = #{deleted,jdbcType=TINYINT}-->
where id = #{id,jdbcType=BIGINT}
@@ -283,18 +308,22 @@
FROM se_client cli
, (SELECT @i:=0) AS itable
<where>
- AND disabled = 0
- AND deleted = 0
+ AND cli.disabled = 0
+ AND cli.deleted = 0
<if test = "name != null and name !=''">
- AND name like CONCAT('%',#{name},'%')
+ AND cli.name like CONCAT('%',#{name},'%')
</if>
- <if test = "num != null and num !=''">
- AND clientNum like CONCAT('%',#{num},'%')
+ <if test = "clientNum != null and clientNum !=''">
+ AND cli.clientNum like CONCAT('%',#{clientNum},'%')
</if>
<if test = "phone != null and phone !=''">
- AND phone like CONCAT('%',#{phone},'%')
+ AND cli.phone like CONCAT('%',#{phone},'%')
+ </if>
+
+ <if test = "address != null and address !=''">
+ AND cli.address like CONCAT('%',#{address},'%')
</if>
</where>
@@ -305,43 +334,71 @@
<select id="getClients" resultType="com.dy.pipIrrGlobal.voSe.VoClient">
SELECT
(@i:=@i+1) AS id,
- name,
- clientNum,
- phone,
- idCard,
- (SELECT COUNT(*) FROM se_client_card WHERE clientNum = cli.clientNum) AS cardCount,
- address,
- operateDt
+ CAST(cli.countyId AS char) AS countyId,
+ dis_con.name AS countryName,
+ CAST(cli.townId AS char) AS townId,
+ dis_town.name AS townName,
+ CAST(cli.villageId AS char) AS villageId,
+ dis_village.name AS villageName,
+ CAST(cli.blockId AS char) AS blockId,
+ blo.name AS bolckName,
+ CAST(cli.divideId AS char) AS divideId,
+ divi.name AS divideName,
+ CAST(cli.typeId AS char) AS waterTypeId,
+ wat.typeName AS waterTypeName,
+ CAST(cli.id AS char) AS clientId,
+ cli.name,
+ cli.clientNum,
+ cli.phone,
+ cli.idCard,
+ cli.area,
+ (SELECT COUNT(*) FROM se_client_card WHERE clientId = cli.id) AS cardCount,
+ cli.address,
+ cli.remarks,
+ cli.operateDt
FROM se_client cli
- , (SELECT @i:=0) AS itable
+ LEFT JOIN ba_district dis_con ON cli.countyId = dis_con.id
+ LEFT JOIN ba_district dis_town ON cli.townId = dis_town.id
+ LEFT JOIN ba_district dis_village ON cli.villageId = dis_village.id
+ LEFT JOIN ba_block blo ON cli.blockId = blo.id
+ LEFT JOIN pr_divide divi ON cli.divideId = divi.id
+ LEFT JOIN se_water_type wat ON cli.typeId = wat.id
+ , (SELECT @i:=0) AS itable
<where>
- AND disabled = 0
- AND deleted = 0
+ AND cli.disabled = 0
+ AND cli.deleted = 0
<if test = "name != null and name !=''">
- AND name like CONCAT('%',#{name},'%')
+ AND cli.name like CONCAT('%',#{name},'%')
</if>
<if test = "clientNum != null and clientNum !=''">
- AND clientNum like CONCAT('%',#{clientNum},'%')
+ AND cli.clientNum like CONCAT('%',#{clientNum},'%')
</if>
<if test = "phone != null and phone !=''">
- AND phone like CONCAT('%',#{phone},'%')
+ AND cli.phone like CONCAT('%',#{phone},'%')
</if>
<if test = "address != null and address !=''">
- AND address like CONCAT('%',#{address},'%')
+ AND cli.address like CONCAT('%',#{address},'%')
</if>
</where>
- ORDER BY operateDt DESC
- <if test="pageCurr != null and pageSize != null">
- LIMIT ${pageCurr}, ${pageSize}
- </if>
+ ORDER BY cli.operateDt DESC
+ <trim prefix="limit " >
+ <if test="start != null and count != null">
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+ </if>
+ </trim>
</select>
<!--鏍规嵁鍐滄埛缂栧彿鑾峰彇5绾ц鏀垮尯鍒掍唬鐮�-->
<select id="getAreaCodeByNum" resultType="java.lang.Long">
SELECT districtNum FROM se_client WHERE clientNum = ${clientNum}
+ </select>
+
+ <!--鏍规嵁鍐滄埛缂栧彿鑾峰彇5绾ц鏀垮尯鍒掍覆areaCode锛岃ˉ鍗¤繃绋嬩腑寮�鏂板崱浣跨敤-->
+ <select id="getAreaCodeById" resultType="java.lang.Long">
+ SELECT districtNum FROM se_client WHERE id = ${clientId}
</select>
<!--鏍规嵁鍐滄埛缂栧彿鑾峰彇鍐滄埛ID-->
@@ -363,4 +420,15 @@
<select id="getVillageIdById" parameterType="java.lang.Long" resultType="java.lang.Long">
SELECT villageId FROM se_client WHERE id = ${id}
</select>
+
+ <!--鑾峰彇铏氭嫙鍗″彿鏈�澶у��-->
+ <select id="getMa1xVirtualId" resultType="java.lang.Long">
+ SELECT virtualId FROM se_client ORDER BY id DESC LIMIT 0,1
+ </select>
+
+ <!--鑾峰彇鐢ㄦ按鏂瑰紡鍒楄〃-->
+ <select id="getWaterTypes" resultType="java.util.Map">
+ SELECT id, typeName from se_water_type
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0