#feat .

yanghui

2022-11-28 e939bd98510e3cd011ec4ac51b725544c6b91924

#feat .

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/StreetVOStr.java

New file
@@ -0,0 +1,20 @@
package com.panzhihua.common.model.vos.user;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

@Data
@ApiModel
public class StreetVOStr {
    @ApiModelProperty("街道id")
    private String id;

    @ApiModelProperty("街道名")
    private String name;

    @ApiModelProperty("下属社区列表")
    private List<CommunityVO> childList;
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java

@@ -383,6 +383,8 @@

    List<StreetVOS> selectStreetByAreaCode(Integer code);

    List<StreetVOStr> selectStreetByAreaCodeStr(Integer code);

    List<StreetVO> selectStreetsByAreaCode(Integer code);

    ComActAcidCheckRecordVO selectComActAcidCheckRecordById(Long id);

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -3773,10 +3773,10 @@
            AreaVOStr areaVO = new AreaVOStr();
            areaVO.setId(code+"");
            areaVO.setName(areaCodeToName(code.longValue()));
            List<StreetVOS> streetVOS = userDao.selectStreetByAreaCode(code);
            Iterator<StreetVOS> iterator = streetVOS.listIterator();
            List<StreetVOStr> streetVOS = userDao.selectStreetByAreaCodeStr(code);
            Iterator<StreetVOStr> iterator = streetVOS.listIterator();
            while (iterator.hasNext()) {
                StreetVOS vo = iterator.next();
                StreetVOStr vo = iterator.next();
                List<CommunityVO> communityVOS = userDao.selectCommunityByStreetId(vo.getId(), 3);
                vo.setChildList(communityVOS);


 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysUserDOMapper.xml

@@ -117,5 +117,8 @@
    <select id="selectStoreIdIdByUserId" resultType="java.lang.Long">
        select id from com_convenient_merchants where user_id  = #{userId} and is_del = 0
    </select>
    <select id="selectStreetByAreaCodeStr" resultType="com.panzhihua.common.model.vos.user.StreetVOStr">
        select street_id as id,name as name from com_street where area_code=#{code} and app_id ='wx118de8a734d269f0'
    </select>

</mapper>