二维码数据查询展示修改，

zhongrj

2023-11-05 cfec0e3ce9141e9e42eb3efa887b474f10b30361

二维码数据查询展示修改，

 src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.java

@@ -16,6 +16,7 @@
 */
package org.springblade.modules.doorplateAddress.mapper;

import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import liquibase.pro.packaged.P;
@@ -117,7 +118,18 @@
     */
    List<FuncNode> getDoorplateNameList(@Param("name") String name,@Param("code") String code);

    /**
     * 根据参数获取地址详情
     * @param doorplateAddressVO
     * @return
     */
    @InterceptorIgnore(tenantLine = "true")
    DoorplateAddressVO getDoorplateAddressDetail(@Param("vo") DoorplateAddressVO doorplateAddressVO);

    List<DoorplateAddressVO> getDoorplateAddressList(@Param("vo") DoorplateAddressVO doorplateAddressVO);
    /**
     * 根据参数获取地址详情
     * @param doorplateAddressVO
     * @return
     */
    DoorplateAddressVO getDoorplateAddressList(@Param("vo") DoorplateAddressVO doorplateAddressVO);
}

 src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml

@@ -2,6 +2,18 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.modules.doorplateAddress.mapper.DoorplateAddressMapper">

    <!--门牌地址详情查询-->
    <resultMap id="doorplateAddressDetailMap" type="org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO"
               autoMapping="true">
        <id property="id" column="id"/>
        <association property="place" javaType="org.springblade.modules.place.vo.PlaceVO"
                    autoMapping="true">
            <id property="id" column="cid"/>
            <result property="createTime" column="pcreateTime"/>
            <result property="createUserName" column="createUserName"/>
        </association>
    </resultMap>

    <!--自定义分页查询-->
    <select id="selectDoorplateAddressPage" resultType="org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO">
        select * from jczz_doorplate_address where 1=1
@@ -177,8 +189,14 @@
    </select>

    <select id="getDoorplateAddressDetail"
            resultType="org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO">
        SELECT * FROM jczz_doorplate_address
            resultMap="doorplateAddressDetailMap">
        SELECT
            jda.*,
            jp.id as cid,jp.*,jp.create_time as pcreateTime,
            bu.real_name as createUserName
        FROM jczz_doorplate_address jda
        left join jczz_place jp on jda.address_code = jp.house_code and jp.is_deleted = 0
        left join blade_user bu on bu.id = jp.create_user and bu.is_deleted = 0
        WHERE 1=1
        <if test="vo.stdId != null and vo.stdId != ''">
            AND address_code = #{vo.stdId}

 src/main/java/org/springblade/modules/doorplateAddress/service/IDoorplateAddressService.java

@@ -66,5 +66,9 @@

    List<DoorplateAddressVOTree> getDoorplateAddressList(String code, String type);

    /**
     * 根据参数获取地址详情
     * @return
     */
    DoorplateAddressVO getDoorplateAddressDetail(DoorplateAddressVO doorplateAddressVO);
}

 src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java

@@ -305,15 +305,15 @@
        return list;
    }

    /**
     * 根据参数获取地址详情
     * @return
     */
    @Override
    public DoorplateAddressVO getDoorplateAddressDetail(DoorplateAddressVO doorplateAddressVO) {

        List<DoorplateAddressVO> list = baseMapper.getDoorplateAddressList(doorplateAddressVO);

        if (list.size()>0){
            return list.get(0);
        }else {
            return null;
        }
        //根据参数获取地址详情
        DoorplateAddressVO doorplateAddress = baseMapper.getDoorplateAddressDetail(doorplateAddressVO);
        // 返回
        return doorplateAddress;
    }
}

 src/main/java/org/springblade/modules/doorplateAddress/vo/DoorplateAddressVO.java

@@ -5,6 +5,8 @@
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
import org.springblade.modules.house.vo.HouseRentalVO;
import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.place.entity.PlaceEntity;
import org.springblade.modules.place.vo.PlaceVO;

import java.util.ArrayList;
import java.util.List;
@@ -24,6 +26,8 @@

    private List<HouseholdVO> householdList = new ArrayList<>();

    private PlaceVO place;

    //对应address_code 或者 doorplate_address_code
    private String stdId;


 src/main/java/org/springblade/modules/place/vo/PlaceVO.java

@@ -39,5 +39,10 @@

    private String phone;

    /**
     * 采集人姓名
     */
    private String createUserName;


}