单位信息采集完善、变更记录查询、建筑物查询、单位信息列表查询增加筛选条件、街镇查询

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/MybatisGeneratorUtils.java

@@ -71,7 +71,7 @@ public class MybatisGeneratorUtils {
         // strategy.setTablePrefix("t_"); // 表名前缀
         strategy.setEntityLombokModel(true); //使用lombok
         //修改自己想要生成的表
-        strategy.setInclude("base_company_change");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        strategy.setInclude("base_street_town");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         mpg.setStrategy(strategy);
 
         // 关闭默认 xml 生成，调整生成 至 根目录

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/BaseBuildController.java

@@ -7,6 +7,7 @@ import com.usky.common.core.bean.CommonPage;
 import com.usky.common.log.annotation.Log;
 import com.usky.common.log.enums.BusinessType;
 import com.usky.fire.domain.BaseBuild;
+import com.usky.fire.domain.BaseStreetTown;
 import com.usky.fire.service.BaseBuildService;
 import com.usky.fire.service.vo.BaseBuildExportVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -92,6 +93,17 @@ public class BaseBuildController {
         return ApiResult.success();
     }
 
-
+    /**
+     * 建筑信息-列表查询
+     *
+     * @param companyId  建筑编号
+     * @param buildName 建筑名称
+     * @return
+     */
+    @GetMapping("baseBuildByIdList")
+    public ApiResult<List<BaseBuild>> baseBuildByIdList(@RequestParam(value = "companyId", required = false) String companyId,
+                                                             @RequestParam(value = "buildName", required = false) String buildName) {
+        return ApiResult.success(baseBuildService.baseBuildByIdList(companyId, buildName));
+    }
 }
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/BaseCompanyChangeController.java

@@ -1,9 +1,19 @@
 package com.usky.fire.controller.web;
 
 
+import com.usky.common.core.bean.ApiResult;
+import com.usky.fire.domain.BaseCompanyChange;
+import com.usky.fire.service.BaseCompanyChangeService;
+import com.usky.fire.service.vo.CompanyDataVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,9 +23,20 @@ import org.springframework.stereotype.Controller;
  * @author han
  * @since 2023-02-23
  */
-@Controller
+@RestController
 @RequestMapping("/baseCompanyChange")
 public class BaseCompanyChangeController {
-
+    @Autowired
+    private BaseCompanyChangeService baseCompanyChangeService;
+    /**
+     * 变更记录-单位ID查询
+     *
+     * @param companyId   单位ID
+     * @return
+     */
+    @GetMapping("baseCompanyChangeOne")
+    public ApiResult<List<BaseCompanyChange>> baseCompanyChangeOne(@RequestParam(value = "companyId", required = false) String companyId) {
+        return ApiResult.success(baseCompanyChangeService.baseCompanyChangeOne(companyId));
+    }
 }
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/BaseCompanyController.java

@@ -48,6 +48,8 @@ public class BaseCompanyController {
      *
      * @param companyName  单位名称
      * @param organization 组织机构编码
+     * @param streetTownName 街镇名称
+     * @param companyType 单位类型
      * @param pageNum      当前页
      * @param pageSize     每页条数
      * @return
@@ -55,9 +57,11 @@ public class BaseCompanyController {
     @GetMapping("companyList")
     public ApiResult<CommonPage<Object>> companyList(@RequestParam(value = "companyName", required = false) String companyName,
                                                      @RequestParam(value = "organization", required = false) String organization,
+                                                     @RequestParam(value = "streetTownName", required = false) String streetTownName,
+                                                     @RequestParam(value = "companyType", required = false) String companyType,
                                                      @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
                                                      @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
-        return ApiResult.success(baseCompanyService.companyList(companyName, organization, pageNum, pageSize));
+        return ApiResult.success(baseCompanyService.companyList(companyName, organization, streetTownName,companyType,pageNum, pageSize));
     }
 
     /**
@@ -190,5 +194,6 @@ public class BaseCompanyController {
     public ApiResult<List<CompanyDataVo>> companyByNameSelect(@RequestParam(value = "companyName", required = false) String companyName) {
         return ApiResult.success(baseCompanyService.companyByNameSelect(companyName));
     }
+
 }
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/BaseStreetTownController.java

@@ -0,0 +1,46 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.fire.domain.BaseStreetTown;
+import com.usky.fire.service.BaseStreetTownService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 街镇 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-02-23
+ */
+@RestController
+@RequestMapping("/baseStreetTown")
+public class BaseStreetTownController {
+    @Autowired
+    private BaseStreetTownService baseStreetTownService;
+    /**
+     * 街镇-下拉框
+     *
+     * @param economize   省
+     * @param market 市
+     * @param districtCounty 区县
+     * @return
+     */
+    @GetMapping("/baseStreetTownList")
+    public ApiResult<List<BaseStreetTown>> baseStreetTownList(@RequestParam(value = "economize", required = false) String economize,
+                                                              @RequestParam(value = "market", required = false) String market,
+                                                              @RequestParam(value = "districtCounty", required = false) String districtCounty) {
+        return ApiResult.success(baseStreetTownService.baseStreetTownList(economize,market,districtCounty));
+    }
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/BaseBuild.java

@@ -138,6 +138,11 @@ public class BaseBuild implements Serializable {
      */
     private String companyId;
 
+    /**
+     * 地下空间
+     */
+    private Double underSpace;
+
     /**
      * 创建时间
      */

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/BaseStreetTown.java

@@ -0,0 +1,61 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 街镇
+ * </p>
+ *
+ * @author han
+ * @since 2023-02-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseStreetTown implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 街镇名称
+     */
+    private String streetTownName;
+
+    /**
+     * 省
+     */
+    private String economize;
+
+    /**
+     * 市
+     */
+    private String market;
+
+    /**
+     * 区县
+     */
+    private String districtCounty;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/BaseStreetTownMapper.java

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.BaseStreetTown;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 街镇 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-02-23
+ */
+public interface BaseStreetTownMapper extends CrudMapper<BaseStreetTown> {
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/BaseBuildService.java

@@ -49,4 +49,12 @@ public interface BaseBuildService extends CrudService<BaseBuild> {
      */
     void delBaseBuild(Integer id);
 
+    /**
+     * 建筑信息-列表查询-导出
+     *
+     * @param companyId 项目编号
+     * @param buildName 单位编号
+     */
+    List<BaseBuild> baseBuildByIdList(String companyId, String buildName);
+
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/BaseCompanyChangeService.java

@@ -2,8 +2,11 @@ package com.usky.fire.service;
 
 import com.usky.fire.domain.BaseCompanyChange;
 import com.usky.common.mybatis.core.CrudService;
+import com.usky.fire.service.vo.CompanyDataVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 单位信息变更表 服务类
@@ -14,4 +17,10 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface BaseCompanyChangeService extends CrudService<BaseCompanyChange> {
     void baseCompanyChangeAdd(@Param("baseCompanyChange") BaseCompanyChange baseCompanyChange);
+    /**
+     * 变更记录-单位ID查询
+     *
+     * @param companyId   单位ID
+     */
+    List<BaseCompanyChange> baseCompanyChangeOne(String companyId);
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/BaseCompanyService.java

@@ -52,7 +52,9 @@ public interface BaseCompanyService extends CrudService<BaseCompany> {
      * @param pageSize     每页条数
      * @return
      */
-    CommonPage<Object> companyList(String companyName, String organization, Integer pageNum, Integer pageSize);
+    CommonPage<Object> companyList(String companyName, String organization,String streetTownName,
+                                   String companyType, Integer pageNum,
+                                   Integer pageSize);
 
     /**
      * 单位管理-单位列表查询-导出

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/BaseStreetTownService.java

@@ -0,0 +1,28 @@
+package com.usky.fire.service;
+
+import com.usky.fire.domain.BaseCompany;
+import com.usky.fire.domain.BaseStreetTown;
+import com.usky.common.mybatis.core.CrudService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 街镇 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-02-23
+ */
+public interface BaseStreetTownService extends CrudService<BaseStreetTown> {
+    /**
+     * 街镇-下拉框
+     *
+     * @param economize      省
+     * @param market         市
+     * @param districtCounty 区县
+     * @return
+     */
+    List<BaseStreetTown> baseStreetTownList(String economize, String market, String districtCounty);
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/BaseBuildServiceImpl.java

@@ -124,4 +124,18 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
         this.updateById(baseBuild);
     }
 
+    @Override
+    public List<BaseBuild> baseBuildByIdList(String companyId, String buildName){
+        List<BaseBuildExportVO> list = new ArrayList<>();
+        LambdaQueryWrapper<BaseBuild> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(BaseBuild::getId, BaseBuild::getBuildNum, BaseBuild::getBuildName, BaseBuild::getAddress, BaseBuild::getBuildArea,
+                BaseBuild::getFireRating, BaseBuild::getUseCharacter, BaseBuild::getBuildStructure, BaseBuild::getBuildHigh,
+                BaseBuild::getCompleteYear, BaseBuild::getSafePerson, BaseBuild::getManagePerson, BaseBuild::getFireRisk, BaseBuild::getBuildPlan)
+                .eq(BaseBuild::getDeleteFlag, 0)
+                .eq(BaseBuild::getCompanyId, companyId)
+                .orderByDesc(BaseBuild::getId);
+        List<BaseBuild> list1 = this.list(queryWrapper);
+        return list1;
+    }
+
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/BaseCompanyChangeServiceImpl.java

@@ -1,11 +1,21 @@
 package com.usky.fire.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.fire.domain.BaseCompany;
 import com.usky.fire.domain.BaseCompanyChange;
+import com.usky.fire.domain.BaseStreetTown;
 import com.usky.fire.mapper.BaseCompanyChangeMapper;
 import com.usky.fire.service.BaseCompanyChangeService;
 import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.fire.service.vo.CompanyDataVo;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  * 单位信息变更表 服务实现类
@@ -20,4 +30,15 @@ public class BaseCompanyChangeServiceImpl extends AbstractCrudService<BaseCompan
     public void baseCompanyChangeAdd(BaseCompanyChange baseCompanyChange) {
         this.save(baseCompanyChange);
     }
+
+    @Override
+    public List<BaseCompanyChange> baseCompanyChangeOne(String companyId) {
+        LambdaQueryWrapper<BaseCompanyChange> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select()
+                .eq(StringUtils.isNotBlank(companyId),BaseCompanyChange::getCompanyId, companyId)
+                .orderByDesc(BaseCompanyChange::getId)
+                .last(" limit 1");
+        List<BaseCompanyChange> list = this.list(queryWrapper);
+        return list;
+    }
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/BaseCompanyServiceImpl.java

@@ -92,16 +92,20 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
 
 
     @Override
-    public CommonPage<Object> companyList(String companyName, String organization, Integer pageNum, Integer pageSize) {
+    public CommonPage<Object> companyList(String companyName, String organization,String streetTownName,
+                                          String companyType, Integer pageNum, Integer pageSize) {
         List<Object> list = new ArrayList<>();
         IPage<BaseCompany> page = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<BaseCompany> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.select(BaseCompany::getId, BaseCompany::getCompanyId, BaseCompany::getCompanyName, BaseCompany::getOrganization,
                 BaseCompany::getAddress, BaseCompany::getCompanyType, BaseCompany::getFireHazard, BaseCompany::getLinkPhone,
-                BaseCompany::getFoundTime, BaseCompany::getCompanyNature, BaseCompany::getAdministrativeDivision, BaseCompany::getCreateTime)
+                BaseCompany::getFoundTime, BaseCompany::getCompanyNature, BaseCompany::getAdministrativeDivision,
+                BaseCompany::getCreateTime,BaseCompany::getStreetTown)
                 .eq(BaseCompany::getEnable, 0)
                 .like(StringUtils.isNotBlank(companyName), BaseCompany::getCompanyName, companyName)
                 .like(StringUtils.isNotBlank(organization), BaseCompany::getOrganization, organization)
+                .eq(StringUtils.isNotBlank(streetTownName), BaseCompany::getStreetTown, streetTownName)
+                .eq(StringUtils.isNotBlank(companyType), BaseCompany::getCompanyType, companyType)
                 .orderByDesc(BaseCompany::getId);
         page = this.page(page, queryWrapper);
         if (page.getTotal() > 0) {
@@ -128,6 +132,8 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
             for (int i = 0; i < page.getRecords().size(); i++) {
                 Map<String, Object> map = new HashMap<>();
                 map.put("id", page.getRecords().get(i).getId());
+                map.put("streetTownName", page.getRecords().get(i).getStreetTown());
+                map.put("companyId", page.getRecords().get(i).getCompanyId());
                 map.put("companyName", page.getRecords().get(i).getCompanyName());
                 map.put("organization", page.getRecords().get(i).getOrganization());
                 map.put("delegateName", null);
@@ -872,19 +878,28 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
             baseCompanyPersonService.updateById(baseCompanyPerson);
             if (CollectionUtils.isNotEmpty(list)) {
                 for (int j = 0; j < list.size(); j++) {
-                    BaseBuild baseBuild;
-                    baseBuild = list.get(j);
-                    baseBuild.setCreateTime(LocalDateTime.now());
-                    baseBuild.setCreator("123");
-                    baseBuild.setCompanyId(baseCompany.getCompanyId());
-                    baseBuild.setDeleteFlag("0");
-                    baseBuildService.save(baseBuild);
+                    if (null!=list.get(j).getId()) {
+                        BaseBuild baseBuild;
+                        baseBuild = list.get(j);
+                        baseBuild.setUpdateTime(LocalDateTime.now());
+                        baseBuild.setDeleteFlag("0");
+                        baseBuildService.updateById(baseBuild);
+                    }else {
+                        BaseBuild baseBuild;
+                        baseBuild = list.get(j);
+                        baseBuild.setCreateTime(LocalDateTime.now());
+                        baseBuild.setCreator("123");
+                        baseBuild.setCompanyId(baseCompany.getCompanyId());
+                        baseBuild.setDeleteFlag("0");
+                        baseBuildService.save(baseBuild);
+                    }
                 }
             }
         }else {
             UUID uuid = UUID.randomUUID();
             String uuidStr = uuid.toString();
             baseCompany.setCompanyId(uuidStr.replaceAll("-",""));
+            baseCompany.setCompanyType("1");
             baseCompany.setEnable("0");
             this.save(baseCompany);
             baseCompanyAttach1.setCompanyId(uuidStr.replaceAll("-",""));
@@ -909,11 +924,11 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
     public List<CompanyDataVo> companyByNameSelect(String companyName) {
         List<CompanyDataVo> list = new ArrayList<>();
         LambdaQueryWrapper<BaseCompany> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.select(BaseCompany::getCompanyId,BaseCompany::getOrganization,BaseCompany::getCompanyName,
-                BaseCompany::getAddress,BaseCompany::getFoundTime)
+        queryWrapper.select(BaseCompany::getId,BaseCompany::getCompanyId,BaseCompany::getOrganization,BaseCompany::getCompanyName,
+                BaseCompany::getAddress,BaseCompany::getFoundTime,BaseCompany::getStreetTown)
                 .like(StringUtils.isNotBlank(companyName),BaseCompany::getCompanyName, companyName)
                 .eq(BaseCompany::getEnable, 0)
-                .orderByDesc(BaseCompany::getId);
+                .orderByDesc(BaseCompany::getId).last(" limit 10");
         List<BaseCompany> list1 = this.list(queryWrapper);
         if (CollectionUtils.isNotEmpty(list1)) {
             List<String> companyIdList = new ArrayList<>();
@@ -922,6 +937,7 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
             }
             List<BaseCompanyAttach1> list2 = new ArrayList<>();
             List<BaseCompanyPerson> list3 = new ArrayList<>();
+            List<BaseBuild> list4 = new ArrayList<>();
             if (CollectionUtils.isNotEmpty(companyIdList)) {
                 LambdaQueryWrapper<BaseCompanyAttach1> queryWrapper1 = Wrappers.lambdaQuery();
                 queryWrapper1.select(BaseCompanyAttach1::getId, BaseCompanyAttach1::getEmployeeNum,
@@ -935,6 +951,15 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
                         BaseCompanyPerson::getCompanyId)
                         .in(BaseCompanyPerson::getCompanyId, companyIdList);
                 list3 = baseCompanyPersonService.list(queryWrapper2);
+                LambdaQueryWrapper<BaseBuild> queryWrapper3 = Wrappers.lambdaQuery();
+                queryWrapper3.select(BaseBuild::getId, BaseBuild::getBuildName, BaseBuild::getAddress,
+                        BaseBuild::getBuildStructure,BaseBuild::getAboveFloor,BaseBuild::getUnderFloor,
+                        BaseBuild::getBuildArea,BaseBuild::getUnderSpace,BaseBuild::getUseCharacter,
+                        BaseBuild::getCompleteYear,BaseBuild::getBuildHigh,
+                        BaseBuild::getCompanyId)
+                        .in(BaseBuild::getCompanyId, companyIdList)
+                        .eq(BaseBuild::getDeleteFlag, 0);
+                list4 = baseBuildService.list(queryWrapper3);
             }
             for (int i = 0; i < list1.size(); i++) {
                 CompanyDataVo companyDataVo = new CompanyDataVo();
@@ -944,6 +969,7 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
                 companyDataVo.setOrganization(list1.get(i).getOrganization());
                 companyDataVo.setAddress(list1.get(i).getAddress());
                 companyDataVo.setFoundTime(list1.get(i).getFoundTime());
+                companyDataVo.setStreetTown(list1.get(i).getStreetTown());
                 for (int j = 0; j < list2.size(); j++) {
                     if (list1.get(i).getCompanyId().equals(list2.get(j).getCompanyId())) {
                         companyDataVo.setId1(list2.get(j).getId());
@@ -962,6 +988,13 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
                         companyDataVo.setFireManagePhone(list3.get(j).getFireManagePhone());
                     }
                 }
+                List<BaseBuild> list5 = new ArrayList<>();
+                for (int j = 0; j < list4.size(); j++) {
+                    if (list1.get(i).getCompanyId().equals(list4.get(j).getCompanyId())) {
+                        list5.add(list4.get(j));
+                        companyDataVo.setBaseBuildList(list5);
+                    }
+                }
                 list.add(companyDataVo);
             }
         }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/BaseStreetTownServiceImpl.java

@@ -0,0 +1,37 @@
+package com.usky.fire.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.fire.domain.BaseCompany;
+import com.usky.fire.domain.BaseStreetTown;
+import com.usky.fire.mapper.BaseStreetTownMapper;
+import com.usky.fire.service.BaseStreetTownService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 街镇 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-02-23
+ */
+@Service
+public class BaseStreetTownServiceImpl extends AbstractCrudService<BaseStreetTownMapper, BaseStreetTown> implements BaseStreetTownService {
+    @Override
+    public List<BaseStreetTown> baseStreetTownList(String economize,String market,String districtCounty) {
+        LambdaQueryWrapper<BaseStreetTown> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(BaseStreetTown::getId, BaseStreetTown::getEconomize,BaseStreetTown::getMarket,
+                BaseStreetTown::getDistrictCounty, BaseStreetTown::getStreetTownName)
+                .eq(StringUtils.isNotBlank(economize),BaseStreetTown::getEconomize, economize)
+                .eq(StringUtils.isNotBlank(market),BaseStreetTown::getMarket, market)
+                .eq(StringUtils.isNotBlank(districtCounty),BaseStreetTown::getDistrictCounty, districtCounty)
+                .orderByDesc(BaseStreetTown::getId);
+        List<BaseStreetTown> list = this.list(queryWrapper);
+        return list;
+    }
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/CompanyDataVo.java

@@ -2,12 +2,14 @@ package com.usky.fire.service.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.usky.fire.domain.BaseBuild;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -138,4 +140,14 @@ public class CompanyDataVo implements Serializable {
      */
     private String delegateName;
 
+    /**
+     * 街镇
+     */
+    private String streetTown;
+
+    /**
+     * 建筑清单
+     */
+    private List<BaseBuild> baseBuildList;
+
 }

service-fire/service-fire-biz/src/main/resources/mapper/fire/BaseStreetTownMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.fire.mapper.BaseStreetTownMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.BaseStreetTown">
+        <id column="id" property="id" />
+        <result column="street_town_name" property="streetTownName" />
+        <result column="economize" property="economize" />
+        <result column="market" property="market" />
+        <result column="district_county" property="districtCounty" />
+        <result column="creator" property="creator" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+</mapper>