From cd2cfd37366002f790a2ed1435962d4eff7d5cec Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 01 Jun 2021 09:39:30 +0800
Subject: [PATCH] 版本合并
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/suser/mapper/SuserMapper.xml | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/suser/mapper/SuserMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/suser/mapper/SuserMapper.xml
index b2c48e5..bba55f4 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/suser/mapper/SuserMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/suser/mapper/SuserMapper.xml
@@ -26,11 +26,16 @@
<result column="address" property="address"/>
<result column="type" property="type"/>
<result column="dj" property="dj"/>
+ <result column="jd" property="jd"/>
+ <result column="wd" property="wd"/>
<result column="information" property="information"/>
<result column="createtime" property="createtime"/>
<result column="is_delete" property="isDelete"/>
<result column="coordinate" property="coordinate"/>
<result column="addvcd" property="addvcd"/>
+ <result column="province" property="province"/>
+ <result column="city" property="city"/>
+ <result column="district" property="district"/>
</resultMap>
<resultMap id="ss" type="org.springblade.jfpt.suser.vo.SuserVOs">
@@ -50,7 +55,8 @@
<select id="selectSuserPage" resultMap="suserResultMaps">
- select s.id,s.ynumber,ST_ASTEXT(s.coordinate) as coordinate,s.yname,s.phone,s.address,s.type,s.dj,s.information,s.createtime,s.addvcd from sys_suser s left join sys_district d on d.addvcds=s.addvcd where is_delete=0
+ select s.id,s.ynumber,ST_ASTEXT(s.coordinate) as coordinate,s.yname,s.phone,s.address,s.type,s.dj,s.information,s.createtime,s.addvcd,province,city,district
+ from sys_suser s left join sys_district d on d.addvcds=s.addvcd where is_delete=0
<if test="suser.yname!=null">
and s.yname like concat(concat('%', #{suser.yname}), '%')
</if>
@@ -66,6 +72,13 @@
<if test="suser.dj!=null">
and s.dj like concat(concat('%', #{suser.dj}), '%')
</if>
+ <if test="suser.province!=null">
+ and s.province like concat(concat('%', #{suser.province}), '%')
+ </if> <if test="suser.city!=null">
+ and s.city like concat(concat('%', #{suser.city}), '%')
+ </if> <if test="suser.district!=null">
+ and s.district like concat(concat('%', #{suser.district}), '%')
+ </if>
order by s.createtime
</select>
@@ -91,7 +104,7 @@
<select id="selectList" resultMap="suserResultMaps">
- select s.id,ynumber,ST_ASTEXT(s.coordinate) as coordinate,s.yname,s.phone,s.address,l.types as type,s.dj,s.information,s.createtime,d.addvnm as addvcd from sys_suser s left join sys_district d on d.addvcds=s.addvcd LEFT JOIN sys_lx l on l.tnumber=s.type where is_delete=0
+ select s.id,ynumber,s.jd,s.wd,ST_ASTEXT(s.coordinate) as coordinate,s.yname,s.phone,s.address,l.types as type,s.dj,s.information,s.createtime,d.addvnm as addvcd from sys_suser s left join sys_district d on d.addvcds=s.addvcd LEFT JOIN sys_lx l on l.tnumber=s.type where is_delete=0
<if test="type!=null and type!=''">
and s.type =#{type}
</if>
@@ -100,4 +113,13 @@
</if>
</select>
+ <!--查询业主总数-->
+ <select id="selectSuserCount" resultType="java.lang.Integer">
+ select count(*) from sys_suser where is_delete=0
+ </select>
+
+ <update id="updateUser">
+ update jfpth.blade_user SET online_status=#{online_status},work_status=#{workSt} where id=#{account}
+ </update>
+
</mapper>
--
Gitblit v1.9.3