单位详情建筑信息增加字段、单位变更记录增加字段

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

@@ -9,6 +9,7 @@ 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.BaseBuildAddVO;
 import com.usky.fire.service.vo.BaseBuildExportVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -101,7 +102,7 @@ public class BaseBuildController {
      * @return
      */
     @GetMapping("baseBuildByIdList")
-    public ApiResult<List<BaseBuild>> baseBuildByIdList(@RequestParam(value = "companyId", required = false) String companyId,
+    public ApiResult<List<BaseBuildAddVO>> 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/domain/BaseCompanyChange.java

@@ -147,4 +147,9 @@ public class BaseCompanyChange implements Serializable {
      */
     private String streetTown;
 
+    /**
+     * 产证
+     */
+    private String birthCert;
+
 }

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.service.vo.BaseBuildAddVO;
 import com.usky.fire.service.vo.BaseBuildExportVO;
 import com.usky.fire.service.vo.BaseBuildVo;
 
@@ -55,6 +56,6 @@ public interface BaseBuildService extends CrudService<BaseBuild> {
      * @param companyId 项目编号
      * @param buildName 单位编号
      */
-    List<BaseBuild> baseBuildByIdList(String companyId, String buildName);
+    List<BaseBuildAddVO> baseBuildByIdList(String companyId, String buildName);
 
 }

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

@@ -9,10 +9,16 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.common.security.utils.SecurityUtils;
+import com.usky.fire.domain.BaseBuildAttach;
+import com.usky.fire.domain.BaseBuildExtinguish;
+import com.usky.fire.service.BaseBuildAttachService;
+import com.usky.fire.service.BaseBuildExtinguishService;
 import com.usky.fire.service.BaseBuildService;
 import com.usky.fire.domain.BaseBuild;
 import com.usky.fire.mapper.BaseBuildMapper;
+import com.usky.fire.service.vo.BaseBuildAddVO;
 import com.usky.fire.service.vo.BaseBuildExportVO;
+import com.usky.fire.service.vo.CompanyDataVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -35,6 +41,12 @@ import java.util.Map;
 @Service
 public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, BaseBuild> implements BaseBuildService {
 
+    @Autowired
+    private BaseBuildAttachService baseBuildAttachService;
+
+    @Autowired
+    private BaseBuildExtinguishService baseBuildExtinguishService;
+
     @Override
     public CommonPage<Object> baseBuildList(String buildNum, String buildName, Integer pageNum, Integer pageSize) {
         List<Object> list = new ArrayList<>();
@@ -125,17 +137,61 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
     }
 
     @Override
-    public List<BaseBuild> baseBuildByIdList(String companyId, String buildName){
-        List<BaseBuildExportVO> list = new ArrayList<>();
+    public List<BaseBuildAddVO> baseBuildByIdList(String companyId, String buildName){
+        List<BaseBuildAddVO> 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::getCompleteYear, BaseBuild::getSafePerson, BaseBuild::getManagePerson,
+                BaseBuild::getFireRisk, BaseBuild::getBuildPlan, BaseBuild::getAboveFloor, BaseBuild::getUnderFloor,
+                BaseBuild::getFireFacilitySystem, BaseBuild::getOtherSystem, BaseBuild::getOtherFacilities)
                 .eq(BaseBuild::getDeleteFlag, 0)
                 .eq(BaseBuild::getCompanyId, companyId)
                 .orderByDesc(BaseBuild::getId);
         List<BaseBuild> list1 = this.list(queryWrapper);
-        return list1;
+        List<Integer> buildIdList = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(list1)) {
+            for (int i = 0; i < list1.size(); i++) {
+                buildIdList.add(list1.get(i).getId());
+            }
+            List<BaseBuildAttach> list5 = new ArrayList<>();
+            List<BaseBuildExtinguish> list6 = new ArrayList<>();
+            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)
+                        .in(BaseBuildAttach::getBuildId, buildIdList);
+                list5 = baseBuildAttachService.list(queryWrapper4);
+                LambdaQueryWrapper<BaseBuildExtinguish> queryWrapper5 = Wrappers.lambdaQuery();
+                queryWrapper5.select(BaseBuildExtinguish::getId, BaseBuildExtinguish::getBuildId,
+                        BaseBuildExtinguish::getExtinguishNum,
+                        BaseBuildExtinguish::getExtinguishType)
+                        .in(BaseBuildExtinguish::getBuildId, buildIdList)
+                        .eq(BaseBuildExtinguish::getDeleteFlag, 0);;
+                list6 = baseBuildExtinguishService.list(queryWrapper5);
+            }
+            for (int i = 0; i < list1.size(); i++) {
+                List<BaseBuildExtinguish> list8 = new ArrayList<>();
+                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()){
+                        baseBuildAddVO.setBaseBuildAttach(list5.get(k));
+                    }
+                }
+                for (int l = 0; l < list6.size(); l++) {
+                    if (list1.get(i).getId()==list6.get(l).getBuildId()){
+                        list8.add(list6.get(l));
+                        baseBuildAddVO.setBaseBuildExtinguishList(list8);
+                    }
+                }
+                list.add(baseBuildAddVO);
+            }
+        }
+        return list;
     }
 
 }

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

@@ -130,7 +130,7 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
                 LambdaQueryWrapper<BaseCompanyAttach1> queryWrapper2 = Wrappers.lambdaQuery();
                 queryWrapper2.select(BaseCompanyAttach1::getId, BaseCompanyAttach1::getCompanyId, BaseCompanyAttach1::getFixedAssets,
                         BaseCompanyAttach1::getCoverArea, BaseCompanyAttach1::getBuildArea, BaseCompanyAttach1::getEmployeeNum,
-                        BaseCompanyAttach1::getMainAttribute, BaseCompanyAttach1::getGovernBody)
+                        BaseCompanyAttach1::getMainAttribute, BaseCompanyAttach1::getGovernBody,BaseCompanyAttach1::getBirthCert)
                         .in(BaseCompanyAttach1::getCompanyId, companyIdList);
                 list2 = baseCompanyAttach1Service.list(queryWrapper2);
             }
@@ -177,6 +177,7 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
                         map.put("mainAttribute", list2.get(j).getMainAttribute());
                         map.put("governBody", list2.get(j).getGovernBody());
                         map.put("id2", list2.get(j).getId());
+                        map.put("birthCert", list2.get(j).getBirthCert());
                     }
                 }
                 map.put("createTime", page.getRecords().get(i).getCreateTime());
@@ -844,7 +845,7 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
                     LambdaQueryWrapper<BaseCompanyAttach1> queryWrapper1 = Wrappers.lambdaQuery();
                     queryWrapper1.select(BaseCompanyAttach1::getId, BaseCompanyAttach1::getEmployeeNum,
                             BaseCompanyAttach1::getBuildArea, BaseCompanyAttach1::getCoverArea, BaseCompanyAttach1::getFixedAssets,
-                            BaseCompanyAttach1::getCompanyId)
+                            BaseCompanyAttach1::getCompanyId,BaseCompanyAttach1::getBirthCert)
                             .in(BaseCompanyAttach1::getCompanyId, companyIdList);
                     list2 = baseCompanyAttach1Service.list(queryWrapper1);
                     LambdaQueryWrapper<BaseCompanyPerson> queryWrapper2 = Wrappers.lambdaQuery();
@@ -869,6 +870,7 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
                             baseCompanyChange.setCoverArea(list2.get(j).getCoverArea());
                             baseCompanyChange.setBuildArea(list2.get(j).getBuildArea());
                             baseCompanyChange.setFixedAssets(list2.get(j).getFixedAssets());
+                            baseCompanyChange.setBirthCert(list2.get(j).getBirthCert());
                         }
                     }
                     for (int j = 0; j < list3.size(); j++) {

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

@@ -28,6 +28,8 @@
         <result column="build_area" property="buildArea" />
         <result column="creator" property="creator" />
         <result column="create_time" property="createTime" />
+        <result column="street_town" property="streetTown" />
+        <result column="birth_cert" property="birthCert" />
     </resultMap>
 
 </mapper>