走访日志查询修改

zhongrj

2024-01-06 9683dc8df6fa6fa14c0586f8fab8108fcb66513f

走访日志查询修改

 src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml

@@ -15,14 +15,43 @@
        <result column="is_deleted" property="isDeleted"/>
    </resultMap>


    <select id="selectGridWorkLogPage" resultMap="gridWorkLogResultMap">
        select * from jczz_grid_work_log where is_deleted = 0
    <!--自定义分页查询-->
    <select id="selectGridWorkLogPage" resultType="org.springblade.modules.grid.vo.GridWorkLogVO">
        select
        jgwl.*,
        jh.name,jh.phone_number as phone,
        if(jda.id is not null,jda.address_name,jh.current_address) as address,
        jda.town_street_name AS townName,
        jda.nei_name AS neiName,
        jg.grid_name,
        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_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 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.personType !=null">
            and jgwl.person_type = #{gridWorkLog.personType}
        </if>
        <if test="gridWorkLog.name !=null and gridWorkLog.name!=''">
            and name like concat('%',#{gridWorkLog.name},'%')
            and jgwl.name like concat('%',#{gridWorkLog.name},'%')
        </if>
        <if test="gridWorkLog.phone !=null and gridWorkLog.phone!=''">
            and phone like concat('%',#{gridWorkLog.phone},'%')
            and jgwl.phone like concat('%',#{gridWorkLog.phone},'%')
        </if>
        <if test="gridWorkLog.townName!=null and gridWorkLog.townName!=''">
            and jda.town_street_name like concat('%',#{gridWorkLog.townName},'%')
        </if>
        <if test="gridWorkLog.neiName!=null and gridWorkLog.neiName!=''">
            and jda.nei_name like concat('%',#{household.neiName},'%')
        </if>
        <if test="gridWorkLog.regionCode!=null and gridWorkLog.regionCode!=''">
            and jg.community_code like concat('%',#{gridWorkLog.regionCode},'%')
        </if>
    </select>


 src/main/java/org/springblade/modules/grid/service/impl/GridWorkLogServiceImpl.java

@@ -17,11 +17,15 @@
package org.springblade.modules.grid.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.grid.entity.GridWorkLogEntity;
import org.springblade.modules.grid.vo.GridWorkLogVO;
import org.springblade.modules.grid.mapper.GridWorkLogMapper;
import org.springblade.modules.grid.service.IGridWorkLogService;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.service.IDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;

@@ -34,8 +38,16 @@
@Service
public class GridWorkLogServiceImpl extends ServiceImpl<GridWorkLogMapper, GridWorkLogEntity> implements IGridWorkLogService {


    @Autowired
    private IDeptService deptService;

    @Override
    public IPage<GridWorkLogVO> selectGridWorkLogPage(IPage<GridWorkLogVO> page, GridWorkLogVO gridWorkLog) {
        Dept dept = deptService.getById(AuthUtil.getDeptId());
        if (null!=dept){
            gridWorkLog.setRegionCode(dept.getRegionCode());
        }
        return page.setRecords(baseMapper.selectGridWorkLogPage(page, gridWorkLog));
    }


 src/main/java/org/springblade/modules/grid/vo/GridWorkLogVO.java

@@ -48,4 +48,32 @@
    @ApiModelProperty(value = "被访人地址")
    private String address;

    /**
     * 街道名称
     */
    @ApiModelProperty(value = "街道名称")
    private String townName;
    /**
     * 社区名称
     */
    @ApiModelProperty(value = "社区名称")
    private String neiName;

    /**
     * 网格名称
     */
    @ApiModelProperty(value = "网格名称")
    private String gridName;

    /**
     * 创建人姓名
     */
    @ApiModelProperty(value = "创建人姓名")
    private String createUserName;

    /**
     * 区域编号
     */
    private String regionCode;

}