修改bug 获取所属地区

fengjin

2022-09-30 2d46e7bdebd6845c3291ef4faed8ed8fa7911cd9

修改bug 获取所属地区

 flower_city/src/main/java/com/dg/core/controller/AreaCodeController.java

@@ -2,6 +2,7 @@

import com.dg.core.ResultData;
import com.dg.core.db.gen.entity.AreaCode2022;
import com.dg.core.db.gen.entity.OrganizationChartEntity;
import com.dg.core.service.IAreaCodeService;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
@@ -9,6 +10,7 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;

@Api(tags = {"所属地区接口"})
@RestController
@@ -27,4 +29,14 @@
    public TableDataInfo getAreaCodeByTransactionId(@RequestParam("transactionId") Integer transactionId){
        return getDataTable(iAreaCodeService.getAreaCodeByTransactionId(transactionId));
    }

    /**
     * 获取攀枝花所有所属地区
     * @return
     */
    @ApiOperation(value = "获取攀枝花所有所属地区",response = AreaCode2022.class)
    @GetMapping("/getListByPCode")
    public TableDataInfo getListByPCode(){
        return getDataTable(iAreaCodeService.getListByPCode("510400000000"));
    }
}

 flower_city/src/main/java/com/dg/core/db/gen/entity/AreaCode2022.java

@@ -1,11 +1,13 @@
package com.dg.core.db.gen.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.util.List;

/**
 * <p>
@@ -38,7 +40,7 @@
     * 级别1-5,省市县镇村
     */
    @ApiModelProperty("级别1-5,省市县镇村")
    private Boolean level;
    private Integer level;

    /**
     * 父级区划代码
@@ -46,6 +48,12 @@
    @ApiModelProperty("父级区划代码")
    private Long pcode;

    /**
     * 子节点
     */
    @TableField(exist = false)
    @ApiModelProperty("子节点")
    private List<AreaCode2022> child;


}

 flower_city/src/main/java/com/dg/core/service/IAreaCodeService.java

@@ -1,6 +1,7 @@
package com.dg.core.service;

import com.dg.core.db.gen.entity.AreaCode2022;
import com.dg.core.db.gen.entity.OrganizationChartEntity;

import java.util.List;

@@ -11,4 +12,10 @@
     * @return
     */
    List<AreaCode2022> getAreaCodeByTransactionId(Integer transactionId);

    /**
     * 根据pcode获取所属地区
     * @return
     */
    List<AreaCode2022> getListByPCode(String id);
}

 flower_city/src/main/java/com/dg/core/service/impl/AreaCodeServiceImpl.java

@@ -46,6 +46,7 @@
           return baseMapper.selectByIdSet(areaCodes);
    }


    public  List<String> getAreaCodeIds(List<String> areaCodes, OrganizationChartEntity organizationChartEntity){
       List<OrganizationChartEntity>  organizationChartEntitys= organizationChartMapper.selectList(new QueryWrapper<OrganizationChartEntity>().lambda()
                .eq(OrganizationChartEntity::getParentId, organizationChartEntity.getId()));
@@ -61,5 +62,15 @@
        return  areaCodes;
    }

    @Override
    public  List<AreaCode2022> getListByPCode(String id){
        List<AreaCode2022> areaCode2022s = baseMapper.selectList(new QueryWrapper<AreaCode2022>().lambda().eq(AreaCode2022::getPcode, id));
        for (AreaCode2022 areaCode2022:areaCode2022s) {
            if (areaCode2022.getLevel()!=4)
              areaCode2022.setChild(this.getListByPCode(areaCode2022.getCode().toString()));
        }
      return  areaCode2022s;
    }


}