单位信息采集-名称查询、信息新增、变更记录新增；优化电子督察单筛选逻辑

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

@@ -33,7 +33,7 @@ public class MybatisGeneratorUtils {
         projectPath+="/"+model;
         gc.setOutputDir(projectPath+ "/src/main/java");  //生成路径(一般都是生成在此项目的src/main/java下面)
         //修改为自己的名字
-        gc.setAuthor("ZYJ"); //设置作者
+        gc.setAuthor("han"); //设置作者
         gc.setOpen(false);
         gc.setFileOverride(true); //第二次生成会把第一次生成的覆盖掉
         gc.setServiceName("%sService"); //生成的service接口名字首字母是否为I，这样设置就没有
@@ -71,7 +71,7 @@ public class MybatisGeneratorUtils {
         // strategy.setTablePrefix("t_"); // 表名前缀
         strategy.setEntityLombokModel(true); //使用lombok
         //修改自己想要生成的表
-        strategy.setInclude("dem_store");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        strategy.setInclude("base_company_change");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         mpg.setStrategy(strategy);
 
         // 关闭默认 xml 生成，调整生成 至 根目录

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

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 单位信息变更表 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-02-23
+ */
+@Controller
+@RequestMapping("/baseCompanyChange")
+public class BaseCompanyChangeController {
+
+}
+

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

@@ -7,11 +7,9 @@ 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.BaseCompany;
+import com.usky.fire.domain.DemGridMember;
 import com.usky.fire.service.BaseCompanyService;
-import com.usky.fire.service.vo.BaseCompanyExportVO;
-import com.usky.fire.service.vo.CompanyDataVo;
-import com.usky.fire.service.vo.CompanyExportVO;
-import com.usky.fire.service.vo.DemGridMemberVO;
+import com.usky.fire.service.vo.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -168,5 +166,29 @@ public class BaseCompanyController {
         ExcelUtil<BaseCompanyExportVO> util = new ExcelUtil<BaseCompanyExportVO>(BaseCompanyExportVO.class);
         util.exportExcel(response, list, exportTitle, exportTitle);
     }
+
+    /**
+     * 单位信息采集-新增
+     *
+     * @param companyAddVO
+     * @return
+     */
+    @Log(title = "单位信息采集-新增", businessType = BusinessType.INSERT)
+    @PostMapping("addBaseCompany")
+    public ApiResult<Void> addBaseCompany(@RequestBody CompanyAddVO companyAddVO) {
+        baseCompanyService.addBaseCompany(companyAddVO);
+        return ApiResult.success();
+    }
+
+    /**
+     * 单位信息采集-名称模糊查询
+     *
+     * @param companyName   单位名称
+     * @return
+     */
+    @GetMapping("companyByNameSelect")
+    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/domain/BaseCompanyChange.java

@@ -0,0 +1,146 @@
+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 BaseCompanyChange implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 单位ID
+     */
+    private String companyId;
+
+    /**
+     * 单位编号
+     */
+    private String companyCode;
+
+    /**
+     * 组织机构编码
+     */
+    private String organization;
+
+    /**
+     * 单位名称
+     */
+    private String companyName;
+
+    /**
+     * 单位详细地址
+     */
+    private String address;
+
+    /**
+     * 单位类型（1：重点单位、2：一般单位、3：九小场所、9：其他单位）
+     */
+    private String companyType;
+
+    /**
+     * 单位联系电话
+     */
+    private String linkPhone;
+
+    /**
+     * 单位性质
+     */
+    private Integer companyNature;
+
+    /**
+     * 管辖机构（含大队）
+     */
+    private String governBody;
+
+    /**
+     * 消防安全管理人电话
+     */
+    private String fireManagePhone;
+
+    /**
+     * 消防安全管理人姓名
+     */
+    private String fireManageName;
+
+    /**
+     * 职工人数
+     */
+    private String employeeNum;
+
+    /**
+     * 占地面积
+     */
+    private String coverArea;
+
+    /**
+     * 法人代表姓名
+     */
+    private String delegateName;
+
+    /**
+     * 火灾危险性
+     */
+    private String fireHazard;
+
+    /**
+     * 单位成立时间
+     */
+    private LocalDateTime foundTime;
+
+    /**
+     * 行政区域
+     */
+    private String administrativeDivision;
+
+    /**
+     * 消防安全责任人姓名
+     */
+    private String fireDutyName;
+
+    /**
+     * 单位主属性
+     */
+    private String mainAttribute;
+
+    /**
+     * 固定资产
+     */
+    private String fixedAssets;
+
+    /**
+     * 建筑面积
+     */
+    private String buildArea;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.BaseCompanyChange;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 单位信息变更表 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-02-23
+ */
+public interface BaseCompanyChangeMapper extends CrudMapper<BaseCompanyChange> {
+
+}

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

@@ -0,0 +1,17 @@
+package com.usky.fire.service;
+
+import com.usky.fire.domain.BaseCompanyChange;
+import com.usky.common.mybatis.core.CrudService;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 单位信息变更表 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-02-23
+ */
+public interface BaseCompanyChangeService extends CrudService<BaseCompanyChange> {
+    void baseCompanyChangeAdd(@Param("baseCompanyChange") BaseCompanyChange baseCompanyChange);
+}

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

@@ -4,6 +4,7 @@ import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.fire.domain.BaseCompany;
 import com.usky.fire.service.vo.BaseCompanyExportVO;
+import com.usky.fire.service.vo.CompanyAddVO;
 import com.usky.fire.service.vo.CompanyDataVo;
 import com.usky.fire.service.vo.CompanyExportVO;
 
@@ -115,4 +116,18 @@ public interface BaseCompanyService extends CrudService<BaseCompany> {
     CommonPage<Map<String, Object>> fireInspectionData(String companyName, String organization, Integer id, Integer pageNum, Integer pageSize);
 
     List<BaseCompanyExportVO> fireInspectionDataExport(String companyName, String organization);
+
+    /**
+     * 单位信息采集-新增
+     *
+     * @param companyAddVO 采集单位数据
+     */
+    void addBaseCompany(CompanyAddVO companyAddVO);
+
+    /**
+     * 单位信息采集-名称模糊查询
+     *
+     * @param companyName 单位名称
+     */
+    List<CompanyDataVo> companyByNameSelect(String companyName);
 }

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

@@ -0,0 +1,23 @@
+package com.usky.fire.service.impl;
+
+import com.usky.fire.domain.BaseCompanyChange;
+import com.usky.fire.mapper.BaseCompanyChangeMapper;
+import com.usky.fire.service.BaseCompanyChangeService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 单位信息变更表 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-02-23
+ */
+@Service
+public class BaseCompanyChangeServiceImpl extends AbstractCrudService<BaseCompanyChangeMapper, BaseCompanyChange> implements BaseCompanyChangeService {
+    @Override
+    public void baseCompanyChangeAdd(BaseCompanyChange baseCompanyChange) {
+        this.save(baseCompanyChange);
+    }
+}

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

@@ -14,20 +14,14 @@ import com.usky.fire.domain.*;
 import com.usky.fire.mapper.BaseCompanyMapper;
 import com.usky.fire.service.*;
 import com.usky.fire.service.util.OnlineMethod;
-import com.usky.fire.service.vo.BaseCompanyExportVO;
-import com.usky.fire.service.vo.CompanyDataVo;
-import com.usky.fire.service.vo.CompanyExportVO;
-import com.usky.fire.service.vo.LocateInfo;
+import com.usky.fire.service.vo.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 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>
@@ -58,6 +52,12 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
     @Autowired
     private DemEnforceReportComplaintService demEnforceReportComplaintService;
 
+    @Autowired
+    private BaseCompanyChangeService baseCompanyChangeService;
+
+    @Autowired
+    private BaseBuildService baseBuildService;
+
     @Override
     public List<BaseCompany> userCompanySelect() {
         List<String> companyIdList = baseUserCompanyService.companyIdList();
@@ -803,6 +803,170 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
 
         return list;
     }
+
+    @Transactional
+    @Override
+    public void addBaseCompany(CompanyAddVO companyAddVO) {
+        BaseCompany baseCompany = companyAddVO.getBaseCompany();
+        BaseCompanyAttach1 baseCompanyAttach1 = companyAddVO.getBaseCompanyAttach1();
+        BaseCompanyPerson baseCompanyPerson = companyAddVO.getBaseCompanyPerson();
+        List<BaseBuild> list;
+        list = companyAddVO.getBaseBuildList();
+        if (StringUtils.isNotBlank(baseCompany.getCompanyId())) {
+            LambdaQueryWrapper<BaseCompany> queryWrapper = Wrappers.lambdaQuery();
+            queryWrapper.select(BaseCompany::getCompanyId,BaseCompany::getOrganization,BaseCompany::getCompanyName,
+                    BaseCompany::getAddress,BaseCompany::getFoundTime)
+                    .eq(BaseCompany::getCompanyId, baseCompany.getCompanyId())
+                    .eq(BaseCompany::getEnable, 0)
+                    .orderByDesc(BaseCompany::getId);
+            List<BaseCompany> list1 = this.list(queryWrapper);
+            if (CollectionUtils.isNotEmpty(list1)) {
+                List<String> companyIdList = new ArrayList<>();
+                for (int i = 0; i < list1.size(); i++) {
+                    companyIdList.add(list1.get(i).getCompanyId());
+                }
+                List<BaseCompanyAttach1> list2 = new ArrayList<>();
+                List<BaseCompanyPerson> list3 = new ArrayList<>();
+                if (CollectionUtils.isNotEmpty(companyIdList)) {
+                    LambdaQueryWrapper<BaseCompanyAttach1> queryWrapper1 = Wrappers.lambdaQuery();
+                    queryWrapper1.select(BaseCompanyAttach1::getId, BaseCompanyAttach1::getEmployeeNum,
+                            BaseCompanyAttach1::getBuildArea, BaseCompanyAttach1::getCoverArea, BaseCompanyAttach1::getFixedAssets,
+                            BaseCompanyAttach1::getCompanyId)
+                            .in(BaseCompanyAttach1::getCompanyId, companyIdList);
+                    list2 = baseCompanyAttach1Service.list(queryWrapper1);
+                    LambdaQueryWrapper<BaseCompanyPerson> queryWrapper2 = Wrappers.lambdaQuery();
+                    queryWrapper2.select(BaseCompanyPerson::getId, BaseCompanyPerson::getDelegateName, BaseCompanyPerson::getFireDutyName,
+                            BaseCompanyPerson::getFireManageName,BaseCompanyPerson::getFireManagePhone,
+                            BaseCompanyPerson::getCompanyId)
+                            .in(BaseCompanyPerson::getCompanyId, companyIdList);
+                    list3 = baseCompanyPersonService.list(queryWrapper2);
+                }
+                for (int i = 0; i < list1.size(); i++) {
+                    BaseCompanyChange baseCompanyChange = new BaseCompanyChange();
+                    baseCompanyChange.setCompanyId(list1.get(i).getCompanyId());
+                    baseCompanyChange.setCompanyName(list1.get(i).getCompanyName());
+                    baseCompanyChange.setOrganization(list1.get(i).getOrganization());
+                    baseCompanyChange.setAddress(list1.get(i).getAddress());
+                    baseCompanyChange.setFoundTime(list1.get(i).getFoundTime());
+                    for (int j = 0; j < list2.size(); j++) {
+                        if (list1.get(i).getCompanyId().equals(list2.get(j).getCompanyId())) {
+                            baseCompanyChange.setEmployeeNum(list2.get(j).getEmployeeNum());
+                            baseCompanyChange.setCoverArea(list2.get(j).getCoverArea());
+                            baseCompanyChange.setBuildArea(list2.get(j).getBuildArea());
+                            baseCompanyChange.setFixedAssets(list2.get(j).getFixedAssets());
+                        }
+                    }
+                    for (int j = 0; j < list3.size(); j++) {
+                        if (list1.get(i).getCompanyId().equals(list3.get(j).getCompanyId())) {
+                            baseCompanyChange.setDelegateName(list3.get(j).getDelegateName());
+                            baseCompanyChange.setFireDutyName(list3.get(j).getFireDutyName());
+                            baseCompanyChange.setFireManageName(list3.get(j).getFireManageName());
+                            baseCompanyChange.setFireManagePhone(list3.get(j).getFireManagePhone());
+                        }
+                    }
+                    baseCompanyChangeService.baseCompanyChangeAdd(baseCompanyChange);
+                }
+            }
+            this.updateById(baseCompany);
+            baseCompanyAttach1Service.updateById(baseCompanyAttach1);
+            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);
+                }
+            }
+        }else {
+            UUID uuid = UUID.randomUUID();
+            String uuidStr = uuid.toString();
+            baseCompany.setCompanyId(uuidStr.replaceAll("-",""));
+            baseCompany.setEnable("0");
+            this.save(baseCompany);
+            baseCompanyAttach1.setCompanyId(uuidStr.replaceAll("-",""));
+            baseCompanyAttach1Service.save(baseCompanyAttach1);
+            baseCompanyPerson.setCompanyId(uuidStr.replaceAll("-",""));
+            baseCompanyPersonService.save(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(uuidStr.replaceAll("-",""));
+                    baseBuild.setDeleteFlag("0");
+                    baseBuildService.save(baseBuild);
+                }
+            }
+        }
+    }
+
+    @Override
+    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)
+                .like(StringUtils.isNotBlank(companyName),BaseCompany::getCompanyName, companyName)
+                .eq(BaseCompany::getEnable, 0)
+                .orderByDesc(BaseCompany::getId);
+        List<BaseCompany> list1 = this.list(queryWrapper);
+        if (CollectionUtils.isNotEmpty(list1)) {
+            List<String> companyIdList = new ArrayList<>();
+            for (int i = 0; i < list1.size(); i++) {
+                companyIdList.add(list1.get(i).getCompanyId());
+            }
+            List<BaseCompanyAttach1> list2 = new ArrayList<>();
+            List<BaseCompanyPerson> list3 = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(companyIdList)) {
+                LambdaQueryWrapper<BaseCompanyAttach1> queryWrapper1 = Wrappers.lambdaQuery();
+                queryWrapper1.select(BaseCompanyAttach1::getId, BaseCompanyAttach1::getEmployeeNum,
+                        BaseCompanyAttach1::getBuildArea, BaseCompanyAttach1::getCoverArea, BaseCompanyAttach1::getFixedAssets,
+                        BaseCompanyAttach1::getCompanyId)
+                        .in(BaseCompanyAttach1::getCompanyId, companyIdList);
+                list2 = baseCompanyAttach1Service.list(queryWrapper1);
+                LambdaQueryWrapper<BaseCompanyPerson> queryWrapper2 = Wrappers.lambdaQuery();
+                queryWrapper2.select(BaseCompanyPerson::getId, BaseCompanyPerson::getDelegateName, BaseCompanyPerson::getFireDutyName,
+                        BaseCompanyPerson::getFireManageName,BaseCompanyPerson::getFireManagePhone,
+                        BaseCompanyPerson::getCompanyId)
+                        .in(BaseCompanyPerson::getCompanyId, companyIdList);
+                list3 = baseCompanyPersonService.list(queryWrapper2);
+            }
+            for (int i = 0; i < list1.size(); i++) {
+                CompanyDataVo companyDataVo = new CompanyDataVo();
+                companyDataVo.setId(list1.get(i).getId());
+                companyDataVo.setCompanyId(list1.get(i).getCompanyId());
+                companyDataVo.setCompanyName(list1.get(i).getCompanyName());
+                companyDataVo.setOrganization(list1.get(i).getOrganization());
+                companyDataVo.setAddress(list1.get(i).getAddress());
+                companyDataVo.setFoundTime(list1.get(i).getFoundTime());
+                for (int j = 0; j < list2.size(); j++) {
+                    if (list1.get(i).getCompanyId().equals(list2.get(j).getCompanyId())) {
+                        companyDataVo.setId1(list2.get(j).getId());
+                        companyDataVo.setEmployeeNum(list2.get(j).getEmployeeNum());
+                        companyDataVo.setCoverArea(list2.get(j).getCoverArea());
+                        companyDataVo.setBuildArea(list2.get(j).getBuildArea());
+                        companyDataVo.setFixedAssets(list2.get(j).getFixedAssets());
+                    }
+                }
+                for (int j = 0; j < list3.size(); j++) {
+                    if (list1.get(i).getCompanyId().equals(list3.get(j).getCompanyId())) {
+                        companyDataVo.setId2(list3.get(j).getId());
+                        companyDataVo.setDelegateName(list3.get(j).getDelegateName());
+                        companyDataVo.setFireDutyName(list3.get(j).getFireDutyName());
+                        companyDataVo.setFireManageName(list3.get(j).getFireManageName());
+                        companyDataVo.setFireManagePhone(list3.get(j).getFireManagePhone());
+                    }
+                }
+                list.add(companyDataVo);
+            }
+        }
+        return list;
+    }
 }
 
 

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

@@ -74,19 +74,30 @@ public class DemInspectListServiceImpl extends AbstractCrudService<DemInspectLis
 
         if(CollectionUtils.isNotEmpty(comoanyList)){
             List<String> companyList = new ArrayList<>();
-            for(int i=0;i<comoanyList.size();i++){
-                companyList.add(comoanyList.get(i).getCompanyId());
-            }
             for(int j=0;j<companyIdList.size();j++){
-                companyList.add(comoanyList.get(j).getCompanyId());
+                companyList.add(companyIdList.get(j).getCompanyId());
             }
 
+
             LambdaQueryWrapper<DemInspectList> QueryWrapper1 = Wrappers.lambdaQuery();
-            QueryWrapper1.in(DemInspectList::getCompanyId,companyList)
-                    .eq(StringUtils.isNotBlank(inspectCode), DemInspectList::getInspectCode, inspectCode)
-                    .eq(StringUtils.isNotBlank(deviceCode), DemInspectList::getDeviceId, deviceCode)
-                    .eq(handlingStatus != null, DemInspectList::getHandlingStatus, handlingStatus);
-            QueryWrapper1.orderByDesc(DemInspectList::getId);
+            if(StringUtils.isNotBlank(companyName)){
+                if(CollectionUtils.isNotEmpty(companyList)){
+
+                }else{
+                    companyList.add(null);
+                }
+                QueryWrapper1.in(DemInspectList::getCompanyId,companyList)
+                        .eq(StringUtils.isNotBlank(inspectCode), DemInspectList::getInspectCode, inspectCode)
+                        .eq(StringUtils.isNotBlank(deviceCode), DemInspectList::getDeviceId, deviceCode)
+                        .eq(handlingStatus != null, DemInspectList::getHandlingStatus, handlingStatus);
+                QueryWrapper1.orderByDesc(DemInspectList::getId);
+            }
+            else{
+                QueryWrapper1.eq(StringUtils.isNotBlank(inspectCode), DemInspectList::getInspectCode, inspectCode)
+                        .eq(StringUtils.isNotBlank(deviceCode), DemInspectList::getDeviceId, deviceCode)
+                        .eq(handlingStatus != null, DemInspectList::getHandlingStatus, handlingStatus);
+                QueryWrapper1.orderByDesc(DemInspectList::getId);
+            }
             page = this.page(page, QueryWrapper1);
             if(page.getTotal() > 0){
                 for(int k=0;k<page.getRecords().size();k++){
@@ -150,19 +161,30 @@ public class DemInspectListServiceImpl extends AbstractCrudService<DemInspectLis
 
         if(CollectionUtils.isNotEmpty(comoanyList)){
             List<String> companyList = new ArrayList<>();
-            for(int i=0;i<comoanyList.size();i++){
-                companyList.add(comoanyList.get(i).getCompanyId());
-            }
             for(int j=0;j<companyIdList.size();j++){
-                companyList.add(comoanyList.get(j).getCompanyId());
+                companyList.add(companyIdList.get(j).getCompanyId());
             }
 
+
             LambdaQueryWrapper<DemInspectList> QueryWrapper1 = Wrappers.lambdaQuery();
-            QueryWrapper1.in(DemInspectList::getCompanyId,companyList)
-                    .eq(StringUtils.isNotBlank(inspectCode), DemInspectList::getInspectCode, inspectCode)
-                    .eq(StringUtils.isNotBlank(deviceCode), DemInspectList::getDeviceId, deviceCode)
-                    .eq(handlingStatus != null, DemInspectList::getHandlingStatus, handlingStatus);
-            QueryWrapper1.orderByDesc(DemInspectList::getId);
+            if(StringUtils.isNotBlank(companyName)){
+                if(CollectionUtils.isNotEmpty(companyList)){
+
+                }else{
+                    companyList.add(null);
+                }
+                QueryWrapper1.in(DemInspectList::getCompanyId,companyList)
+                        .eq(StringUtils.isNotBlank(inspectCode), DemInspectList::getInspectCode, inspectCode)
+                        .eq(StringUtils.isNotBlank(deviceCode), DemInspectList::getDeviceId, deviceCode)
+                        .eq(handlingStatus != null, DemInspectList::getHandlingStatus, handlingStatus);
+                QueryWrapper1.orderByDesc(DemInspectList::getId);
+            }
+            else{
+                QueryWrapper1.eq(StringUtils.isNotBlank(inspectCode), DemInspectList::getInspectCode, inspectCode)
+                        .eq(StringUtils.isNotBlank(deviceCode), DemInspectList::getDeviceId, deviceCode)
+                        .eq(handlingStatus != null, DemInspectList::getHandlingStatus, handlingStatus);
+                QueryWrapper1.orderByDesc(DemInspectList::getId).last("limit 1000");
+            }
             List<DemInspectList> list1 = this.list(QueryWrapper1);
             if(CollectionUtils.isNotEmpty(list1)){
                 for(int k=0;k<list1.size();k++){

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

@@ -0,0 +1,30 @@
+package com.usky.fire.service.vo;
+
+import com.usky.fire.domain.BaseBuild;
+import com.usky.fire.domain.BaseCompany;
+import com.usky.fire.domain.BaseCompanyAttach1;
+import com.usky.fire.domain.BaseCompanyPerson;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author han
+ * @since 2023-02-22
+ */
+@Data
+public class CompanyAddVO {
+
+        private BaseCompany baseCompany;
+
+        private BaseCompanyAttach1 baseCompanyAttach1;
+
+        private BaseCompanyPerson baseCompanyPerson;
+
+        private List<BaseBuild> baseBuildList;
+
+}

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

@@ -78,6 +78,9 @@ public class CompanyDataVo implements Serializable {
      */
     private String administrativeDivision;
 
+    /**
+     * 单位附表1ID
+     */
     private Integer id1;
 
     /**
@@ -110,6 +113,9 @@ public class CompanyDataVo implements Serializable {
      */
     private String governBody;
 
+    /**
+     * 单位关联人员表ID
+     */
     private Integer id2;
 
     /**
@@ -122,6 +128,11 @@ public class CompanyDataVo implements Serializable {
      */
     private String fireManageName;
 
+    /**
+     * 消防安全管理人电话
+     */
+    private String fireManagePhone;
+
     /**
      * 法人代表姓名
      */

service-fire/service-fire-biz/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: usky-cloud-nacos:8848
+        server-addr: 172.16.120.165:8848
       config:
         # 配置中心地址
-        server-addr: usky-cloud-nacos:8848
+        server-addr: 172.16.120.165:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

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

@@ -0,0 +1,33 @@
+<?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.BaseCompanyChangeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.BaseCompanyChange">
+        <id column="id" property="id" />
+        <result column="company_id" property="companyId" />
+        <result column="company_code" property="companyCode" />
+        <result column="organization" property="organization" />
+        <result column="company_name" property="companyName" />
+        <result column="address" property="address" />
+        <result column="company_type" property="companyType" />
+        <result column="link_phone" property="linkPhone" />
+        <result column="company_nature" property="companyNature" />
+        <result column="govern_body" property="governBody" />
+        <result column="fire_manage_phone" property="fireManagePhone" />
+        <result column="fire_manage_name" property="fireManageName" />
+        <result column="employee_num" property="employeeNum" />
+        <result column="cover_area" property="coverArea" />
+        <result column="delegate_name" property="delegateName" />
+        <result column="fire_hazard" property="fireHazard" />
+        <result column="found_time" property="foundTime" />
+        <result column="administrative_division" property="administrativeDivision" />
+        <result column="fire_duty_name" property="fireDutyName" />
+        <result column="main_attribute" property="mainAttribute" />
+        <result column="fixed_assets" property="fixedAssets" />
+        <result column="build_area" property="buildArea" />
+        <result column="creator" property="creator" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+</mapper>