From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml | 56 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 39 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml b/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml
index 6c72b46..bf70153 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml
@@ -2,19 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.modules.grid.mapper.GridWorkLogMapper">
- <!-- 通用查询映射结果 -->
- <resultMap id="gridWorkLogResultMap" type="org.springblade.modules.grid.entity.GridWorkLogEntity">
- <result column="id" property="id"/>
- <result column="house_code" property="houseCode"/>
- <result column="name" property="name"/>
- <result column="phone" property="phone"/>
- <result column="context" property="context"/>
- <result column="url" property="url"/>
- <result column="create_time" property="createTime"/>
- <result column="create_user" property="createUser"/>
- <result column="is_deleted" property="isDeleted"/>
- </resultMap>
-
<!--自定义分页查询-->
<select id="selectGridWorkLogPage" resultType="org.springblade.modules.grid.vo.GridWorkLogVO">
select
@@ -27,19 +14,28 @@
bu.real_name as createUserName
from jczz_grid_work_log jgwl
left join jczz_household jh on jgwl.household_id = jh.id and jh.is_deleted = 0
+ left join jczz_house jhs on jhs.house_code = jh.house_code and jhs.is_deleted = 0
LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jh.house_code
- LEFT JOIN jczz_grid_range jgr on jgr.house_code=jda.address_code
- LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0
+ LEFT JOIN jczz_grid jg on jhs.grid_code = jg.grid_code and jg.is_deleted = 0
LEFT JOIN blade_user bu on bu.id = jgwl.create_user and bu.is_deleted = 0
where jgwl.is_deleted = 0
<if test="gridWorkLog.type !=null">
and jgwl.type = #{gridWorkLog.type}
+ </if>
+ <if test="gridWorkLog.source !=null">
+ and jgwl.source = #{gridWorkLog.source}
+ </if>
+ <if test="gridWorkLog.status !=null">
+ and jgwl.status = #{gridWorkLog.status}
</if>
<if test="gridWorkLog.personType !=null">
and jgwl.person_type = #{gridWorkLog.personType}
</if>
<if test="gridWorkLog.name !=null and gridWorkLog.name!=''">
and jh.name like concat('%',#{gridWorkLog.name},'%')
+ </if>
+ <if test="gridWorkLog.houseCode !=null and gridWorkLog.houseCode!=''">
+ and jh.house_code = #{gridWorkLog.houseCode}
</if>
<if test="gridWorkLog.phone !=null and gridWorkLog.phone!=''">
and jh.phone_number like concat('%',#{gridWorkLog.phone},'%')
@@ -50,10 +46,36 @@
<if test="gridWorkLog.neiName!=null and gridWorkLog.neiName!=''">
and jda.nei_name like concat('%',#{gridWorkLog.neiName},'%')
</if>
- <if test="gridWorkLog.regionCode!=null and gridWorkLog.regionCode!=''">
- and jg.community_code like concat('%',#{gridWorkLog.regionCode},'%')
+ <if test="gridWorkLog.gridId !=null">
+ and jg.id = #{gridWorkLog.gridId}
+ </if>
+ <if test="isAdministrator==2">
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and jg.community_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jg.community_code in ('')
+ </otherwise>
+ </choose>
</if>
</select>
+ <!--走访日志数量统计-->
+ <select id="getGridWorkCountHandleCount" resultType="java.lang.Integer">
+ select count(*) from jczz_grid_work_log jgwl
+ left join jczz_household jh on jgwl.household_id = jh.id and jh.is_deleted = 0
+ left join jczz_house jhs on jhs.house_code=jh.house_code and jhs.is_deleted = 0
+ where jgwl.is_deleted = 0
+ <if test="status!=null">
+ and jgwl.status = #{status}
+ </if>
+ <if test="gridCode!=null and gridCode!=''">
+ and jhs.grid_code = #{gridCode}
+ </if>
+ </select>
</mapper>
--
Gitblit v1.9.3