行政许可数据接口

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("dem_enforce_report_label_attribute");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        strategy.setInclude("dem_atl_inspect_declare");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         mpg.setStrategy(strategy);
 
         // 关闭默认 xml 生成，调整生成 至 根目录

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemAtlInspectCertificateController.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 JCB
+ * @since 2022-10-08
+ */
+@Controller
+@RequestMapping("/demAtlInspectCertificate")
+public class DemAtlInspectCertificateController {
+
+}
+

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

@@ -0,0 +1,73 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+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.DemAtlInspectDeclare;
+import com.usky.fire.service.DemAtlInspectDeclareService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 消防安检申报总表 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-08
+ */
+@RestController
+@RequestMapping("/demAtlInspectDeclare")
+public class DemAtlInspectDeclareController {
+
+    @Autowired
+    private DemAtlInspectDeclareService demAtlInspectDeclareService;
+
+    /**
+     * 行政许可数据-列表查询
+     *
+     * @param projectCode        项目编号
+     * @param declareCompanyName 申请单位
+     * @param id                 主键ID
+     * @param pageNum            当前页
+     * @param pageSize           每页条数
+     * @return
+     */
+    @GetMapping("atlInspectDeclareList")
+    public ApiResult<CommonPage<Object>> atlInspectDeclareList(@RequestParam(value = "projectCode", required = false) String projectCode,
+                                                               @RequestParam(value = "declareCompanyName", required = false) String declareCompanyName,
+                                                               @RequestParam(value = "id", required = false, defaultValue = "0") Integer id,
+                                                               @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                               @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(demAtlInspectDeclareService.atlInspectDeclareList(projectCode, declareCompanyName, id, pageNum, pageSize));
+    }
+
+    /**
+     * 行政许可数据-修改
+     *
+     * @param demAtlInspectDeclare
+     */
+    @Log(title = "行政许可数据-修改", businessType = BusinessType.UPDATE)
+    @PutMapping("updateLawSituation")
+    public ApiResult<Void> updateAtlInspectCertificate(@RequestBody DemAtlInspectDeclare demAtlInspectDeclare) {
+        demAtlInspectDeclareService.updateAtlInspectCertificate(demAtlInspectDeclare);
+        return ApiResult.success();
+    }
+
+    /**
+     * 行政许可数据-删除
+     *
+     * @param id 主键ID
+     */
+    @Log(title = "行政许可数据-删除", businessType = BusinessType.DELETE)
+    @DeleteMapping("delAtlInspectCertificate")
+    public ApiResult<Void> delAtlInspectCertificate(@RequestParam(value = "id") Integer id,
+                                                    @RequestParam(value = "zid", required = false, defaultValue = "0") Integer zid) {
+        demAtlInspectDeclareService.delAtlInspectCertificate(id, zid);
+        return ApiResult.success();
+    }
+
+}
+

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

@@ -0,0 +1,236 @@
+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 JCB
+ * @since 2022-10-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemAtlInspectCertificate implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 法律文书ID
+     */
+    private String legalPaperId;
+
+    /**
+     * 项目编号
+     */
+    private String projectCode;
+
+    /**
+     * 源法律文书ID
+     */
+    private String sourcePaperId;
+
+    /**
+     * 源法律文书类别
+     */
+    private String sourcePaperType;
+
+    /**
+     * 文号1
+     */
+    private String documentNumber1;
+
+    /**
+     * 文号2
+     */
+    private String documentNumber2;
+
+    /**
+     * 文号3
+     */
+    private String documentNumber3;
+
+    /**
+     * 文号4
+     */
+    private String documentNumber4;
+
+    /**
+     * 文号
+     */
+    private String documentNumber;
+
+    /**
+     * 文书抬头
+     */
+    private String paperTitle;
+
+    /**
+     * 场所名称
+     */
+    private String siteName;
+
+    /**
+     * 场所地址
+     */
+    private String siteAddress;
+
+    /**
+     * 消防安全责任人
+     */
+    private String safetyPerson;
+
+    /**
+     * 使用性质
+     */
+    private String useNature;
+
+    /**
+     * 场所所在建筑名称
+     */
+    private String siteBuildName;
+
+    /**
+     * 场所所在层数
+     */
+    private String siteBuildFloor;
+
+    /**
+     * 场所建筑面积
+     */
+    private String siteBuildArea;
+
+    /**
+     * 使用情况
+     */
+    private String useSituation;
+
+    /**
+     * 现有消防设施
+     */
+    private String fireFacilities;
+
+    /**
+     * 填发日期
+     */
+    private LocalDateTime fillingTime;
+
+    /**
+     * 审批人账号
+     */
+    private String approverAccount;
+
+    /**
+     * 审批人姓名
+     */
+    private String approverName;
+
+    /**
+     * 审批时间
+     */
+    private LocalDateTime approvalTime;
+
+    /**
+     * 是否取件送达
+     */
+    private String whetherDeliver;
+
+    /**
+     * 法律文书版本号
+     */
+    private String documentVersion;
+
+    /**
+     * 主管单位ID
+     */
+    private String competentCompanyId;
+
+    /**
+     * 创建人账号
+     */
+    private String creator;
+
+    /**
+     * 创建人姓名
+     */
+    private String creatorName;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 创建IP
+     */
+    private String createIp;
+
+    /**
+     * 修改人账号
+     */
+    private String updatePerson;
+
+    /**
+     * 修改人姓名
+     */
+    private String updateName;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 修改IP
+     */
+    private String updateIp;
+
+    /**
+     * 删除标识
+     */
+    private String deleteFlag;
+
+    /**
+     * Row_Version
+     */
+    private String rowVersion;
+
+    /**
+     * spbId
+     */
+    private String spbId;
+
+    /**
+     * IsRead
+     */
+    private String isRead;
+
+    /**
+     * ReadTime
+     */
+    private LocalDateTime readTime;
+
+    /**
+     * BDP_AUDIT
+     */
+    private LocalDateTime bdpAudit;
+
+    /**
+     * unionKey
+     */
+    private String unionKey;
+
+
+}

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

@@ -0,0 +1,434 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 消防安检申报总表
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemAtlInspectDeclare implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * ID
+     */
+    private String declareId;
+
+    /**
+     * 项目编号
+     */
+    private String projectCode;
+
+    /**
+     * 申报单位编号
+     */
+    private String declareCompanyCode;
+
+    /**
+     * 申请单位名称
+     */
+    private String declareCompanyName;
+
+    /**
+     * 申报人
+     */
+    private String declarePerson;
+
+    /**
+     * 填表日期
+     */
+    private LocalDateTime fillTime;
+
+    /**
+     * 场所名称
+     */
+    private String siteName;
+
+    /**
+     * 法定代表人/主要负责人
+     */
+    private String legalRepresentative;
+
+    /**
+     * 场所所在地址
+     */
+    private String siteAddress;
+
+    /**
+     * 场所建筑面积
+     */
+    private String siteArea;
+
+    /**
+     * 场所所在层数（地上/地下）
+     */
+    private String siteFloor;
+
+    /**
+     * 联系人
+     */
+    private String linkPerson;
+
+    /**
+     * 联系电话
+     */
+    private String linkPhone;
+
+    /**
+     * 场所性质一
+     */
+    private String siteNature1;
+
+    /**
+     * 场所性质一详情
+     */
+    private String siteNatureDetails1;
+
+    /**
+     * 场所性质
+     */
+    private String siteNature;
+
+    /**
+     * 场所性质详情
+     */
+    private String siteNatureDetails;
+
+    /**
+     * 场所性质二
+     */
+    private String siteNature2;
+
+    /**
+     * 场所性质二详情
+     */
+    private String siteNatureDetails2;
+
+    /**
+     * 建筑结构编号
+     */
+    private String buildNum;
+
+    /**
+     * 建筑结构名称
+     */
+    private String buildNature;
+
+    /**
+     * 场所所在建筑情况-名称
+     */
+    private String siteBuildName;
+
+    /**
+     * 场所所在建筑情况--建筑面积
+     */
+    private String siteBuildArea;
+
+    /**
+     * 场所所在建筑情况--建筑层数（地上/地下）
+     */
+    private String siteBuildFloor;
+
+    /**
+     * 场所所在建筑情况--建筑高度
+     */
+    private String siteBuildHigh;
+
+    /**
+     * 备案号
+     */
+    private String filingNumber;
+
+    /**
+     * 备案情况说明
+     */
+    private String filingDescription;
+
+    /**
+     * 备案情况
+     */
+    private String filing;
+
+    /**
+     * 文号
+     */
+    private String documentNumber;
+
+    /**
+     * 其他需要说明情况
+     */
+    private String otherDescription;
+
+    /**
+     * 不受理原因
+     */
+    private String rejectionReason;
+
+    /**
+     * 现有消防设施
+     */
+    private String fireFacilities;
+
+    /**
+     * 消防设施类型
+     */
+    private String fireFacilitiesType;
+
+    /**
+     * 是否有其他设施
+     */
+    private String whetherOtherFacilities;
+
+    /**
+     * 其他设施
+     */
+    private String otherFacilities;
+
+    /**
+     * 是否有安全出口
+     */
+    private String whetherExit;
+
+    /**
+     * 安全出口数量
+     */
+    private String exitNumber;
+
+    /**
+     * 是否有灭火器
+     */
+    private String whetherAnnihilator;
+
+    /**
+     * 灭火器数量
+     */
+    private String annihilatorNumber;
+
+    /**
+     * 其他消防设施情况
+     */
+    private String otherFacilitiesSituation;
+
+    /**
+     * 安全出口数量情况
+     */
+    private String exitNumberSituation;
+
+    /**
+     * 灭火器数量情况
+     */
+    private String annihilatorNumberSituation;
+
+    /**
+     * 任务状态
+     */
+    private String taskStatus;
+
+    /**
+     * 受理状态
+     */
+    private String acceptStatus;
+
+    /**
+     * 是否合格
+     */
+    private String whetherQualified;
+
+    /**
+     * 是否取件送达
+     */
+    private String whetherDeliver;
+
+    /**
+     * 受理人账户
+     */
+    private String acceptAccount;
+
+    /**
+     * 受理人姓名
+     */
+    private String acceptName;
+
+    /**
+     * 受理日期
+     */
+    private LocalDateTime acceptTime;
+
+    /**
+     * 截止日期
+     */
+    private LocalDateTime closingTime;
+
+    /**
+     * 决定书审批流程
+     */
+    private String decisionApprovalProcess;
+
+    /**
+     * 法律文书版本号
+     */
+    private String documentVersion;
+
+    /**
+     * 受理单位
+     */
+    private String acceptCompany;
+
+    /**
+     * 主管单位
+     */
+    private String competentCompany;
+
+    /**
+     * 录入人账号
+     */
+    private String enteredAccount;
+
+    /**
+     * 录入人姓名
+     */
+    private String enteredName;
+
+    /**
+     * 录入时间
+     */
+    private LocalDateTime enteredTime;
+
+    /**
+     * 录入人IP
+     */
+    private String enteredIp;
+
+    /**
+     * 修改人账号
+     */
+    private String updateAccount;
+
+    /**
+     * 修改人姓名
+     */
+    private String updateName;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 修改IP
+     */
+    private String updateIp;
+
+    /**
+     * 删除标识
+     */
+    private String deleteFlag;
+
+    /**
+     * 审批人账号
+     */
+    private String approverAccount;
+
+    /**
+     * 审批人姓名
+     */
+    private String approverName;
+
+    /**
+     * 审批时间
+     */
+    private LocalDateTime approvalTime;
+
+    /**
+     * 备用字段1
+     */
+    private String alternateField1;
+
+    /**
+     * 备用字段2
+     */
+    private String alternateField2;
+
+    /**
+     * 备用字段3
+     */
+    private String alternateField3;
+
+    /**
+     * 备用字段4
+     */
+    private String alternateField4;
+
+    /**
+     * 备用字段5
+     */
+    private String alternateField5;
+
+    /**
+     * Row_Version
+     */
+    private String rowVersion;
+
+    /**
+     * Baqtqk
+     */
+    private String baqtqk;
+
+    /**
+     * SFFHBZ
+     */
+    private String sffhbz;
+
+    /**
+     * FHBZQX
+     */
+    private String fhbzqx;
+
+    /**
+     * BDP_AUDIT
+     */
+    private LocalDateTime bdpAudit;
+
+    /**
+     * unionKey
+     */
+    private String unionKey;
+
+
+    /**
+     * 关联表ID
+     */
+    @TableField(exist = false)
+    private Integer id1;
+
+    /**
+     * 消防安全责任人
+     */
+    @TableField(exist = false)
+    private String safetyPerson;
+
+    /**
+     * 使用性质
+     */
+    @TableField(exist = false)
+    private String useNature;
+}

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

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemAtlInspectCertificate;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 安全检查合格证 Mapper 接口
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-08
+ */
+public interface DemAtlInspectCertificateMapper extends CrudMapper<DemAtlInspectCertificate> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemAtlInspectDeclare;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 消防安检申报总表 Mapper 接口
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-08
+ */
+public interface DemAtlInspectDeclareMapper extends CrudMapper<DemAtlInspectDeclare> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.usky.fire.service;
+
+import com.usky.fire.domain.DemAtlInspectCertificate;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 安全检查合格证 服务类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-08
+ */
+public interface DemAtlInspectCertificateService extends CrudService<DemAtlInspectCertificate> {
+
+}

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

@@ -0,0 +1,22 @@
+package com.usky.fire.service;
+
+import com.usky.common.core.bean.CommonPage;
+import com.usky.fire.domain.DemAtlInspectDeclare;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 消防安检申报总表 服务类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-08
+ */
+public interface DemAtlInspectDeclareService extends CrudService<DemAtlInspectDeclare> {
+
+    CommonPage<Object> atlInspectDeclareList(String projectCode, String declareCompanyName, Integer id, Integer pageNum, Integer pageSize);
+
+    void updateAtlInspectCertificate(DemAtlInspectDeclare demAtlInspectDeclare);
+
+    void delAtlInspectCertificate(Integer id, Integer zid);
+}

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

@@ -0,0 +1,20 @@
+package com.usky.fire.service.impl;
+
+import com.usky.fire.domain.DemAtlInspectCertificate;
+import com.usky.fire.mapper.DemAtlInspectCertificateMapper;
+import com.usky.fire.service.DemAtlInspectCertificateService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 安全检查合格证 服务实现类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-08
+ */
+@Service
+public class DemAtlInspectCertificateServiceImpl extends AbstractCrudService<DemAtlInspectCertificateMapper, DemAtlInspectCertificate> implements DemAtlInspectCertificateService {
+
+}

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

@@ -0,0 +1,136 @@
+package com.usky.fire.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+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.fire.domain.DemAtlInspectCertificate;
+import com.usky.fire.domain.DemAtlInspectDeclare;
+import com.usky.fire.mapper.DemAtlInspectDeclareMapper;
+import com.usky.fire.service.DemAtlInspectCertificateService;
+import com.usky.fire.service.DemAtlInspectDeclareService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 消防安检申报总表 服务实现类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-08
+ */
+@Service
+public class DemAtlInspectDeclareServiceImpl extends AbstractCrudService<DemAtlInspectDeclareMapper, DemAtlInspectDeclare> implements DemAtlInspectDeclareService {
+
+    @Autowired
+    private DemAtlInspectCertificateService demAtlInspectCertificateService;
+
+    @Override
+    public CommonPage<Object> atlInspectDeclareList(String projectCode, String declareCompanyName, Integer id, Integer pageNum, Integer pageSize) {
+        List<Object> list = new ArrayList<>();
+        IPage<DemAtlInspectDeclare> page = new Page<>(pageNum, pageSize);
+        LambdaQueryWrapper<DemAtlInspectDeclare> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(DemAtlInspectDeclare::getId, DemAtlInspectDeclare::getProjectCode, DemAtlInspectDeclare::getDeclareCompanyName,
+                DemAtlInspectDeclare::getDeclarePerson, DemAtlInspectDeclare::getFillTime, DemAtlInspectDeclare::getSiteName,
+                DemAtlInspectDeclare::getLegalRepresentative, DemAtlInspectDeclare::getSiteArea, DemAtlInspectDeclare::getLinkPerson,
+                DemAtlInspectDeclare::getLinkPhone, DemAtlInspectDeclare::getSiteNature, DemAtlInspectDeclare::getBuildNature,
+                DemAtlInspectDeclare::getAcceptStatus, DemAtlInspectDeclare::getFireFacilities, DemAtlInspectDeclare::getAcceptName,
+                DemAtlInspectDeclare::getAcceptTime)
+                .eq(DemAtlInspectDeclare::getDeleteFlag, 0)
+                .eq(id != null & id != 0, DemAtlInspectDeclare::getId, id)
+                .like(StringUtils.isNotBlank(projectCode), DemAtlInspectDeclare::getProjectCode, projectCode)
+                .like(StringUtils.isNotBlank(declareCompanyName), DemAtlInspectDeclare::getDeclareCompanyName, declareCompanyName)
+                .orderByDesc(DemAtlInspectDeclare::getId);
+        page = this.page(page, queryWrapper);
+        if (page.getTotal() > 0) {
+            List<String> projectCodeList = new ArrayList<>();
+            for (int i = 0; i < page.getRecords().size(); i++) {
+                projectCodeList.add(page.getRecords().get(i).getProjectCode());
+            }
+            List<DemAtlInspectCertificate> list1 = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(projectCodeList)) {
+                LambdaQueryWrapper<DemAtlInspectCertificate> queryWrapper1 = Wrappers.lambdaQuery();
+                queryWrapper1.select(DemAtlInspectCertificate::getId, DemAtlInspectCertificate::getProjectCode,
+                        DemAtlInspectCertificate::getSafetyPerson, DemAtlInspectCertificate::getUseNature,
+                        DemAtlInspectCertificate::getSiteAddress)
+                        .in(DemAtlInspectCertificate::getProjectCode, projectCodeList)
+                        .eq(DemAtlInspectCertificate::getDeleteFlag, 0);
+                list1 = demAtlInspectCertificateService.list(queryWrapper1);
+            }
+            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("projectCode", page.getRecords().get(i).getProjectCode());
+                map.put("declareCompanyName", page.getRecords().get(i).getDeclareCompanyName());
+                map.put("declarePerson", page.getRecords().get(i).getDeclarePerson());
+                map.put("fillTime", page.getRecords().get(i).getFillTime());
+                map.put("siteName", page.getRecords().get(i).getSiteName());
+                map.put("legalRepresentative", page.getRecords().get(i).getLegalRepresentative());
+                map.put("siteArea", page.getRecords().get(i).getSiteArea());
+                map.put("linkPerson", page.getRecords().get(i).getLinkPerson());
+                map.put("linkPhone", page.getRecords().get(i).getLinkPhone());
+                map.put("siteNature", page.getRecords().get(i).getSiteNature());
+                map.put("buildNature", page.getRecords().get(i).getBuildNature());
+                map.put("acceptStatus", page.getRecords().get(i).getAcceptStatus());
+                map.put("fireFacilities", page.getRecords().get(i).getFireFacilities());
+                map.put("acceptName", page.getRecords().get(i).getAcceptName());
+                map.put("acceptTime", page.getRecords().get(i).getAcceptTime());
+                map.put("id1", null);
+                map.put("safetyPerson", null);
+                map.put("useNature", null);
+                map.put("siteAddress", null);
+                for (int j = 0; j < list1.size(); j++) {
+                    if (page.getRecords().get(i).getProjectCode().equals(list1.get(j).getProjectCode())) {
+                        map.put("id1", list1.get(j).getId());
+                        map.put("safetyPerson", list1.get(j).getSafetyPerson());
+                        map.put("useNature", list1.get(j).getUseNature());
+                        map.put("siteAddress", list1.get(j).getSiteAddress());
+                    }
+                }
+                list.add(map);
+            }
+        }
+        return new CommonPage<>(list, page.getTotal(), pageSize, pageNum);
+    }
+
+    @Transactional
+    @Override
+    public void updateAtlInspectCertificate(DemAtlInspectDeclare demAtlInspectDeclare) {
+        this.updateById(demAtlInspectDeclare);
+        if (demAtlInspectDeclare.getId1() != null && demAtlInspectDeclare.getId1() != 0) {
+            DemAtlInspectCertificate demAtlInspectCertificate = new DemAtlInspectCertificate();
+            demAtlInspectCertificate.setId(demAtlInspectDeclare.getId1());
+            demAtlInspectCertificate.setSafetyPerson(demAtlInspectDeclare.getSafetyPerson());
+            demAtlInspectCertificate.setUseNature(demAtlInspectDeclare.getUseNature());
+            demAtlInspectCertificate.setSiteAddress(demAtlInspectDeclare.getSiteAddress());
+            demAtlInspectCertificateService.updateById(demAtlInspectCertificate);
+        }
+    }
+
+    @Transactional
+    @Override
+    public void delAtlInspectCertificate(Integer id, Integer zid) {
+        DemAtlInspectDeclare demAtlInspectDeclare = new DemAtlInspectDeclare();
+        demAtlInspectDeclare.setId(id);
+        demAtlInspectDeclare.setDeleteFlag("1");
+        this.updateById(demAtlInspectDeclare);
+        if (zid != null && zid != 0) {
+            DemAtlInspectCertificate demAtlInspectCertificate = new DemAtlInspectCertificate();
+            demAtlInspectCertificate.setId(zid);
+            demAtlInspectCertificate.setDeleteFlag("1");
+            demAtlInspectCertificateService.updateById(demAtlInspectCertificate);
+        }
+    }
+
+}

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

@@ -0,0 +1,51 @@
+<?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.DemAtlInspectCertificateMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemAtlInspectCertificate">
+        <id column="id" property="id" />
+        <result column="legal_paper_id" property="legalPaperId" />
+        <result column="project_code" property="projectCode" />
+        <result column="source_paper_id" property="sourcePaperId" />
+        <result column="source_paper_type" property="sourcePaperType" />
+        <result column="document_number1" property="documentNumber1" />
+        <result column="document_number2" property="documentNumber2" />
+        <result column="document_number3" property="documentNumber3" />
+        <result column="document_number4" property="documentNumber4" />
+        <result column="document_number" property="documentNumber" />
+        <result column="paper_title" property="paperTitle" />
+        <result column="site_name" property="siteName" />
+        <result column="site_address" property="siteAddress" />
+        <result column="safety_person" property="safetyPerson" />
+        <result column="use_nature" property="useNature" />
+        <result column="site_build_name" property="siteBuildName" />
+        <result column="site_build_floor" property="siteBuildFloor" />
+        <result column="site_build_area" property="siteBuildArea" />
+        <result column="use_situation" property="useSituation" />
+        <result column="fire_facilities" property="fireFacilities" />
+        <result column="filling_time" property="fillingTime" />
+        <result column="approver_account" property="approverAccount" />
+        <result column="approver_name" property="approverName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="whether_deliver" property="whetherDeliver" />
+        <result column="document_version" property="documentVersion" />
+        <result column="competent_company_id" property="competentCompanyId" />
+        <result column="creator" property="creator" />
+        <result column="creator_name" property="creatorName" />
+        <result column="create_time" property="createTime" />
+        <result column="create_ip" property="createIp" />
+        <result column="update_person" property="updatePerson" />
+        <result column="update_name" property="updateName" />
+        <result column="update_time" property="updateTime" />
+        <result column="update_ip" property="updateIp" />
+        <result column="delete_flag" property="deleteFlag" />
+        <result column="row_version" property="rowVersion" />
+        <result column="spb_id" property="spbId" />
+        <result column="is_read" property="isRead" />
+        <result column="read_time" property="readTime" />
+        <result column="bdp_audit" property="bdpAudit" />
+        <result column="union_key" property="unionKey" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,87 @@
+<?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.DemAtlInspectDeclareMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemAtlInspectDeclare">
+        <id column="id" property="id" />
+        <result column="declare_id" property="declareId" />
+        <result column="project_code" property="projectCode" />
+        <result column="declare_company_code" property="declareCompanyCode" />
+        <result column="declare_company_name" property="declareCompanyName" />
+        <result column="declare_person" property="declarePerson" />
+        <result column="fill_time" property="fillTime" />
+        <result column="site_name" property="siteName" />
+        <result column="legal_representative" property="legalRepresentative" />
+        <result column="site_address" property="siteAddress" />
+        <result column="site_area" property="siteArea" />
+        <result column="site_floor" property="siteFloor" />
+        <result column="link_person" property="linkPerson" />
+        <result column="link_phone" property="linkPhone" />
+        <result column="site_nature1" property="siteNature1" />
+        <result column="site_nature_details1" property="siteNatureDetails1" />
+        <result column="site_nature" property="siteNature" />
+        <result column="site_nature_details" property="siteNatureDetails" />
+        <result column="site_nature2" property="siteNature2" />
+        <result column="site_nature_details2" property="siteNatureDetails2" />
+        <result column="build_num" property="buildNum" />
+        <result column="build_nature" property="buildNature" />
+        <result column="site_build_name" property="siteBuildName" />
+        <result column="site_build_area" property="siteBuildArea" />
+        <result column="site_build_floor" property="siteBuildFloor" />
+        <result column="site_build_high" property="siteBuildHigh" />
+        <result column="filing_number" property="filingNumber" />
+        <result column="filing_description" property="filingDescription" />
+        <result column="filing" property="filing" />
+        <result column="document_number" property="documentNumber" />
+        <result column="other_description" property="otherDescription" />
+        <result column="rejection_reason" property="rejectionReason" />
+        <result column="fire_facilities" property="fireFacilities" />
+        <result column="fire_facilities_type" property="fireFacilitiesType" />
+        <result column="whether_other_facilities" property="whetherOtherFacilities" />
+        <result column="other_facilities" property="otherFacilities" />
+        <result column="whether_exit" property="whetherExit" />
+        <result column="exit_number" property="exitNumber" />
+        <result column="whether_annihilator" property="whetherAnnihilator" />
+        <result column="annihilator_number" property="annihilatorNumber" />
+        <result column="other_facilities_situation" property="otherFacilitiesSituation" />
+        <result column="exit_number_situation" property="exitNumberSituation" />
+        <result column="annihilator_number_situation" property="annihilatorNumberSituation" />
+        <result column="task_status" property="taskStatus" />
+        <result column="accept_status" property="acceptStatus" />
+        <result column="whether_qualified" property="whetherQualified" />
+        <result column="whether_deliver" property="whetherDeliver" />
+        <result column="accept_account" property="acceptAccount" />
+        <result column="accept_name" property="acceptName" />
+        <result column="accept_time" property="acceptTime" />
+        <result column="closing_time" property="closingTime" />
+        <result column="decision_approval_process" property="decisionApprovalProcess" />
+        <result column="document_version" property="documentVersion" />
+        <result column="accept_company" property="acceptCompany" />
+        <result column="competent_company" property="competentCompany" />
+        <result column="entered_account" property="enteredAccount" />
+        <result column="entered_name" property="enteredName" />
+        <result column="entered_time" property="enteredTime" />
+        <result column="entered_ip" property="enteredIp" />
+        <result column="update_account" property="updateAccount" />
+        <result column="update_name" property="updateName" />
+        <result column="update_time" property="updateTime" />
+        <result column="update_ip" property="updateIp" />
+        <result column="delete_flag" property="deleteFlag" />
+        <result column="approver_account" property="approverAccount" />
+        <result column="approver_name" property="approverName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="alternate_field1" property="alternateField1" />
+        <result column="alternate_field2" property="alternateField2" />
+        <result column="alternate_field3" property="alternateField3" />
+        <result column="alternate_field4" property="alternateField4" />
+        <result column="alternate_field5" property="alternateField5" />
+        <result column="row_version" property="rowVersion" />
+        <result column="baqtqk" property="baqtqk" />
+        <result column="sffhbz" property="sffhbz" />
+        <result column="fhbzqx" property="fhbzqx" />
+        <result column="bdp_audit" property="bdpAudit" />
+        <result column="union_key" property="unionKey" />
+    </resultMap>
+
+</mapper>