闵行新增单位选择接口

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.BaseCompany;
 import com.usky.fire.domain.BaseStreetTown;
 import com.usky.fire.service.BaseBuildService;
 import com.usky.fire.service.vo.BaseBuildAddVO;
@@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+
 /**
  * <p>
  * 建筑信息 前端控制器
@@ -64,7 +66,7 @@ public class BaseBuildController {
     public void export(HttpServletResponse response,
                        @RequestParam(value = "buildNum", required = false) String buildNum,
                        @RequestParam(value = "buildName", required = false) String buildName,
-                       @RequestParam(value = "exportTitle") String exportTitle)throws IOException{
+                       @RequestParam(value = "exportTitle") String exportTitle) throws IOException {
         List<BaseBuildExportVO> list = baseBuildService.baseBuildListExport(buildNum, buildName);
         ExcelUtil<BaseBuildExportVO> util = new ExcelUtil<BaseBuildExportVO>(BaseBuildExportVO.class);
         util.exportExcel(response, list, exportTitle, exportTitle);
@@ -108,5 +110,10 @@ public class BaseBuildController {
                                                              @RequestParam(value = "buildName", required = false) String buildName) {
         return ApiResult.success(baseBuildService.baseBuildByIdList(companyId, buildName));
     }
+
+    @GetMapping("/companyList")
+    public ApiResult<List<BaseCompany>> baseStreetTownList(@RequestParam(value = "companyName") String companyName) {
+        return ApiResult.success(baseBuildService.baseBuildList(companyName));
+    }
 }
 

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

@@ -3,6 +3,7 @@ package com.usky.fire.service;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.fire.domain.BaseBuild;
 import com.usky.common.mybatis.core.CrudService;
+import com.usky.fire.domain.BaseCompany;
 import com.usky.fire.service.vo.BaseBuildAddVO;
 import com.usky.fire.service.vo.BaseBuildExportVO;
 import com.usky.fire.service.vo.BaseBuildVo;
@@ -59,4 +60,10 @@ public interface BaseBuildService extends CrudService<BaseBuild> {
      */
     List<BaseBuildAddVO> baseBuildByIdList(String companyId, String buildName);
 
+    /**
+     * 建筑信息-列表查询
+     *
+     * @param buildName 单位编号
+     */
+    List<BaseCompany> baseBuildList(String buildName);
 }

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

@@ -25,10 +25,7 @@ import org.springframework.stereotype.Service;
 import javax.swing.text.DateFormatter;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <p>
@@ -56,9 +53,9 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
         IPage<BaseBuild> page = new Page<>(pageNum, pageSize);
         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, BaseBuild::getCompanyId)
+                        BaseBuild::getFireRating, BaseBuild::getUseCharacter, BaseBuild::getBuildStructure, BaseBuild::getBuildHigh,
+                        BaseBuild::getCompleteYear, BaseBuild::getSafePerson, BaseBuild::getManagePerson,
+                        BaseBuild::getFireRisk, BaseBuild::getBuildPlan, BaseBuild::getCompanyId)
                 .eq(BaseBuild::getDeleteFlag, 0)
                 .like(StringUtils.isNotBlank(buildNum), BaseBuild::getBuildNum, buildNum)
                 .like(StringUtils.isNotBlank(buildName), BaseBuild::getBuildName, buildName)
@@ -105,12 +102,12 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
     }
 
     @Override
-    public List<BaseBuildExportVO> baseBuildListExport(String buildNum, String buildName){
+    public List<BaseBuildExportVO> baseBuildListExport(String buildNum, 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)
+                        BaseBuild::getFireRating, BaseBuild::getUseCharacter, BaseBuild::getBuildStructure, BaseBuild::getBuildHigh,
+                        BaseBuild::getCompleteYear, BaseBuild::getSafePerson, BaseBuild::getManagePerson, BaseBuild::getFireRisk, BaseBuild::getBuildPlan)
                 .eq(BaseBuild::getDeleteFlag, 0)
                 .like(StringUtils.isNotBlank(buildNum), BaseBuild::getBuildNum, buildNum)
                 .like(StringUtils.isNotBlank(buildName), BaseBuild::getBuildName, buildName)
@@ -158,7 +155,7 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
     }
 
     @Override
-    public List<BaseBuildAddVO> baseBuildByIdList(String companyId, String buildName){
+    public List<BaseBuildAddVO> baseBuildByIdList(String companyId, String buildName) {
         List<BaseBuildAddVO> list = new ArrayList<>();
         LambdaQueryWrapper<BaseBuild> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(BaseBuild::getDeleteFlag, 0)
@@ -175,18 +172,19 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
             if (CollectionUtils.isNotEmpty(buildIdList)) {
                 LambdaQueryWrapper<BaseBuildAttach> queryWrapper4 = Wrappers.lambdaQuery();
                 queryWrapper4.select(BaseBuildAttach::getId, BaseBuildAttach::getBuildId,
-                        BaseBuildAttach::getHazardousProduceA,
-                        BaseBuildAttach::getHazardousProduceB,BaseBuildAttach::getHazardousProduceC,
-                        BaseBuildAttach::getHazardousProduceD,BaseBuildAttach::getHazardousStorageA,
-                        BaseBuildAttach::getHazardousStorageB,BaseBuildAttach::getHazardousStorageC,BaseBuildAttach::getHazardousStorageD)
+                                BaseBuildAttach::getHazardousProduceA,
+                                BaseBuildAttach::getHazardousProduceB, BaseBuildAttach::getHazardousProduceC,
+                                BaseBuildAttach::getHazardousProduceD, BaseBuildAttach::getHazardousStorageA,
+                                BaseBuildAttach::getHazardousStorageB, BaseBuildAttach::getHazardousStorageC, BaseBuildAttach::getHazardousStorageD)
                         .in(BaseBuildAttach::getBuildId, buildIdList);
                 list5 = baseBuildAttachService.list(queryWrapper4);
                 LambdaQueryWrapper<BaseBuildExtinguish> queryWrapper5 = Wrappers.lambdaQuery();
                 queryWrapper5.select(BaseBuildExtinguish::getId, BaseBuildExtinguish::getBuildId,
-                        BaseBuildExtinguish::getExtinguishNum,
-                        BaseBuildExtinguish::getExtinguishType)
+                                BaseBuildExtinguish::getExtinguishNum,
+                                BaseBuildExtinguish::getExtinguishType)
                         .in(BaseBuildExtinguish::getBuildId, buildIdList)
-                        .eq(BaseBuildExtinguish::getDeleteFlag, 0);;
+                        .eq(BaseBuildExtinguish::getDeleteFlag, 0);
+                ;
                 list6 = baseBuildExtinguishService.list(queryWrapper5);
             }
             for (int i = 0; i < list1.size(); i++) {
@@ -194,12 +192,12 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
                 BaseBuildAddVO baseBuildAddVO = new BaseBuildAddVO();
                 baseBuildAddVO.setBaseBuild(list1.get(i));
                 for (int k = 0; k < list5.size(); k++) {
-                    if (list1.get(i).getId()==list5.get(k).getBuildId()){
+                    if (list1.get(i).getId() == list5.get(k).getBuildId()) {
                         baseBuildAddVO.setBaseBuildAttach(list5.get(k));
                     }
                 }
                 for (int l = 0; l < list6.size(); l++) {
-                    if (list1.get(i).getId()==list6.get(l).getBuildId()){
+                    if (list1.get(i).getId() == list6.get(l).getBuildId()) {
                         list8.add(list6.get(l));
                         baseBuildAddVO.setBaseBuildExtinguishList(list8);
                     }
@@ -210,4 +208,13 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
         return list;
     }
 
+    @Override
+    public List<BaseCompany> baseBuildList(String buildName) {
+        LambdaQueryWrapper<BaseCompany> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(BaseCompany::getCompanyId, BaseCompany::getCompanyName)
+                .eq(BaseCompany::getCompanyType, "1")
+                .eq(BaseCompany::getEnable, 0)
+                .like(BaseCompany::getCompanyName, buildName);
+        return baseCompanyMapper.selectList(queryWrapper);
+    }
 }