Browse Source

'基础信息管理-行政许可数据管理导出接口和基础信息管理-处罚整改数据管理导出接口'

james 2 years ago
parent
commit
fa0656cf55

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

@@ -1,15 +1,22 @@
 package com.usky.fire.controller.web;
 
 
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
 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 com.usky.fire.service.vo.DemAtlInspectDeclareExportVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 消防安检申报总表 前端控制器
@@ -44,6 +51,26 @@ public class DemAtlInspectDeclareController {
         return ApiResult.success(demAtlInspectDeclareService.atlInspectDeclareList(projectCode, declareCompanyName, id, pageNum, pageSize));
     }
 
+    /**
+     * 行政许可数据-列表查询-导出
+     *
+     * @param projectCode        项目编号
+     * @param declareCompanyName 申请单位
+     * @param id                 主键ID
+     * @param exportTitle        文件名
+     * @throws IOException
+     */
+    @PostMapping("atlInspectDeclareListExport")
+    public void export(HttpServletResponse response,
+                       @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 = "exportTitle") String exportTitle) throws IOException{
+        List<DemAtlInspectDeclareExportVO> list = demAtlInspectDeclareService.atlInspectDeclareListExport(projectCode, declareCompanyName, id);
+        ExcelUtil<DemAtlInspectDeclareExportVO> util = new ExcelUtil<DemAtlInspectDeclareExportVO>(DemAtlInspectDeclareExportVO.class);
+        util.exportExcel(response, list, exportTitle, exportTitle);
+    }
+
     /**
      * 行政许可数据-修改
      *

+ 28 - 0
service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemLawSituationController.java

@@ -1,15 +1,22 @@
 package com.usky.fire.controller.web;
 
 
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
 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.DemLawSituation;
 import com.usky.fire.service.DemLawSituationService;
+import com.usky.fire.service.vo.DemLawSituationExportVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 行政处罚情况表 前端控制器
@@ -44,6 +51,27 @@ public class DemLawSituationController {
         return ApiResult.success(demLawSituationService.lawSituationList(punishedPerson, legalRepresentative, id, pageNum, pageSize));
     }
 
+    /**
+     * 处罚整改数据-列表查询-导出
+     *
+     * @param punishedPerson      被处罚人
+     * @param legalRepresentative 法人代表
+     * @param id                  主键ID
+     * @param exportTitle         文件名
+     * @throws IOException
+     */
+    @PostMapping("lawSituationListExport")
+    public void export(HttpServletResponse response,
+                       @RequestParam(value = "punishedPerson", required = false) String punishedPerson,
+                       @RequestParam(value = "legalRepresentative", required = false) String legalRepresentative,
+                       @RequestParam(value = "id", required = false, defaultValue = "0") Integer id,
+                       @RequestParam(value = "exportTitle") String exportTitle) throws IOException{
+        List<DemLawSituationExportVO> list = demLawSituationService.lawSituationListExport(punishedPerson, legalRepresentative, id);
+        ExcelUtil<DemLawSituationExportVO> util = new ExcelUtil<DemLawSituationExportVO>(DemLawSituationExportVO.class);
+        util.exportExcel(response, list, exportTitle, exportTitle);
+    }
+
+
     /**
      * 处罚整改数据-修改
      *

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

@@ -3,6 +3,9 @@ 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;
+import com.usky.fire.service.vo.DemAtlInspectDeclareExportVO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -16,6 +19,8 @@ public interface DemAtlInspectDeclareService extends CrudService<DemAtlInspectDe
 
     CommonPage<Object> atlInspectDeclareList(String projectCode, String declareCompanyName, Integer id, Integer pageNum, Integer pageSize);
 
+    List<DemAtlInspectDeclareExportVO> atlInspectDeclareListExport(String projectCode, String declareCompanyName, Integer id);
+
     void updateAtlInspectCertificate(DemAtlInspectDeclare demAtlInspectDeclare);
 
     void delAtlInspectCertificate(Integer id, Integer zid);

+ 10 - 0
service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemLawSituationService.java

@@ -3,6 +3,7 @@ package com.usky.fire.service;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.fire.domain.DemLawSituation;
+import com.usky.fire.service.vo.DemLawSituationExportVO;
 
 import java.util.List;
 
@@ -28,6 +29,15 @@ public interface DemLawSituationService extends CrudService<DemLawSituation> {
      */
     CommonPage<Object> lawSituationList(String punishedPerson, String legalRepresentative, Integer id, Integer pageNum, Integer pageSize);
 
+    /**
+     * 处罚整改数据-列表查询-导出
+     *
+     * @param punishedPerson      被处罚人
+     * @param legalRepresentative 行政相对人类别
+     * @param id                  主键ID
+     */
+    List<DemLawSituationExportVO> lawSituationListExport(String punishedPerson, String legalRepresentative, Integer id);
+
     /**
      * 罚整改数据-修改
      *

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

@@ -13,10 +13,12 @@ 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 com.usky.fire.service.vo.DemAtlInspectDeclareExportVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -104,6 +106,71 @@ public class DemAtlInspectDeclareServiceImpl extends AbstractCrudService<DemAtlI
         return new CommonPage<>(list, page.getTotal(), pageSize, pageNum);
     }
 
+    @Override
+    public List<DemAtlInspectDeclareExportVO> atlInspectDeclareListExport(String projectCode, String declareCompanyName, Integer id){
+        List<DemAtlInspectDeclareExportVO> list = new ArrayList<>();
+        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);
+        List<DemAtlInspectDeclare> list1= this.list(queryWrapper);
+        if (CollectionUtils.isNotEmpty(list1)) {
+            List<String> projectCodeList = new ArrayList<>();
+            for (int i = 0; i < list1.size(); i++) {
+                projectCodeList.add(list1.get(i).getProjectCode());
+            }
+            List<DemAtlInspectCertificate> list2 = 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);
+                list2 = demAtlInspectCertificateService.list(queryWrapper1);
+            }
+            for (int i = 0; i < list1.size(); i++) {
+                DemAtlInspectDeclareExportVO demAtlInspectDeclareExportVO = new DemAtlInspectDeclareExportVO();
+                demAtlInspectDeclareExportVO.setProjectCode(list1.get(i).getProjectCode());
+                demAtlInspectDeclareExportVO.setDeclareCompanyName(list1.get(i).getDeclareCompanyName());
+                demAtlInspectDeclareExportVO.setDeclarePerson(list1.get(i).getDeclarePerson());
+                demAtlInspectDeclareExportVO.setFillTime((list1.get(i).getFillTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                demAtlInspectDeclareExportVO.setSiteName(list1.get(i).getSiteName());
+                demAtlInspectDeclareExportVO.setLegalRepresentative(list1.get(i).getLegalRepresentative());
+                demAtlInspectDeclareExportVO.setSiteArea(list1.get(i).getSiteArea());
+                demAtlInspectDeclareExportVO.setLinkPerson(list1.get(i).getLinkPerson());
+                demAtlInspectDeclareExportVO.setLinkPhone(list1.get(i).getLinkPhone());
+                demAtlInspectDeclareExportVO.setSiteNature(list1.get(i).getSiteNature());
+                demAtlInspectDeclareExportVO.setBuildNature(list1.get(i).getBuildNature());
+                demAtlInspectDeclareExportVO.setSiteAddress(null);
+                demAtlInspectDeclareExportVO.setUseNature(null);
+                demAtlInspectDeclareExportVO.setSafetyPerson(null);
+                demAtlInspectDeclareExportVO.setFireFacilities(list1.get(i).getFireFacilities());
+                demAtlInspectDeclareExportVO.setAcceptTime((list1.get(i).getAcceptTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                demAtlInspectDeclareExportVO.setAcceptStatus(list1.get(i).getAcceptStatus());
+                demAtlInspectDeclareExportVO.setAcceptName(list1.get(i).getAcceptName());
+                for (int j = 0; j < list2.size(); j++) {
+                    if (list1.get(i).getProjectCode().equals(list2.get(j).getProjectCode())) {
+                        demAtlInspectDeclareExportVO.setSiteAddress(list2.get(j).getSiteAddress());
+                        demAtlInspectDeclareExportVO.setUseNature(list2.get(j).getUseNature());
+                        demAtlInspectDeclareExportVO.setSafetyPerson(list2.get(j).getSafetyPerson());
+                    }
+                }
+                list.add(demAtlInspectDeclareExportVO);
+            }
+        }
+
+        return list;
+    }
+
     @Transactional
     @Override
     public void updateAtlInspectCertificate(DemAtlInspectDeclare demAtlInspectDeclare) {

+ 56 - 0
service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemLawSituationServiceImpl.java

@@ -1,7 +1,9 @@
 package com.usky.fire.service.impl;
 
+import cn.hutool.core.date.LocalDateTimeUtil;
 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;
@@ -10,8 +12,10 @@ import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.fire.domain.DemLawSituation;
 import com.usky.fire.mapper.DemLawSituationMapper;
 import com.usky.fire.service.DemLawSituationService;
+import com.usky.fire.service.vo.DemLawSituationExportVO;
 import org.springframework.stereotype.Service;
 
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -66,6 +70,58 @@ public class DemLawSituationServiceImpl extends AbstractCrudService<DemLawSituat
         return new CommonPage<>(list, page.getTotal(), pageSize, pageNum);
     }
 
+    @Override
+    public List<DemLawSituationExportVO> lawSituationListExport(String punishedPerson, String legalRepresentative, Integer id){
+        List<DemLawSituationExportVO> list = new ArrayList<>();
+        LambdaQueryWrapper<DemLawSituation> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(DemLawSituation::getId, DemLawSituation::getPunishedPerson, DemLawSituation::getCounterpartType,
+                DemLawSituation::getLegalRepresentative, DemLawSituation::getDocumentType, DemLawSituation::getDocumentNumber,
+                DemLawSituation::getPunishmentDecisionNumber, DemLawSituation::getPunishmentBasis, DemLawSituation::getPunishmentType,
+                DemLawSituation::getPunishmentContent, DemLawSituation::getPenaltyAmount, DemLawSituation::getPunishmentDecisionTime,
+                DemLawSituation::getPunishmentValidityDate, DemLawSituation::getPublicityDeadline, DemLawSituation::getPunishmentAuthority)
+                .eq(DemLawSituation::getEnable, 0)
+                .eq(id != null & id != 0, DemLawSituation::getId, id)
+                .like(StringUtils.isNotBlank(punishedPerson), DemLawSituation::getPunishedPerson, punishedPerson)
+                .like(StringUtils.isNotBlank(legalRepresentative), DemLawSituation::getLegalRepresentative, legalRepresentative)
+                .orderByDesc(DemLawSituation::getId);
+        List<DemLawSituation> list1 = this.list(queryWrapper);
+        if(CollectionUtils.isNotEmpty(list1)){
+            for (int i = 0; i < list1.size(); i++) {
+                DemLawSituationExportVO demLawSituationExportVO = new DemLawSituationExportVO();
+                demLawSituationExportVO.setPunishedPerson(list1.get(i).getPunishedPerson());
+                demLawSituationExportVO.setCounterpartType(list1.get(i).getCounterpartType());
+                demLawSituationExportVO.setLegalRepresentative(list1.get(i).getLegalRepresentative());
+                demLawSituationExportVO.setPunishmentDecisionNumber(list1.get(i).getPunishmentDecisionNumber());
+                demLawSituationExportVO.setPunishmentBasis(list1.get(i).getPunishmentBasis());
+                demLawSituationExportVO.setPunishmentType(list1.get(i).getPunishmentType());
+                demLawSituationExportVO.setPunishmentContent(list1.get(i).getPunishmentContent());
+                demLawSituationExportVO.setPenaltyAmount(list1.get(i).getPenaltyAmount());
+                if((list1.get(i).getPunishmentDecisionTime()) != null){
+                    demLawSituationExportVO.setPunishmentDecisionTime((list1.get(i).getPunishmentDecisionTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                }else{
+                    demLawSituationExportVO.setPunishmentDecisionTime(null);
+                }
+                if((list1.get(i).getPunishmentValidityDate()) != null){
+                    demLawSituationExportVO.setPunishmentValidityDate((list1.get(i).getPunishmentValidityDate()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+                }else{
+                    demLawSituationExportVO.setPunishmentValidityDate(null);
+                }
+                if((list1.get(i).getPublicityDeadline()) != null){
+                    demLawSituationExportVO.setPublicityDeadline((list1.get(i).getPublicityDeadline()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+                }else{
+                    demLawSituationExportVO.setPublicityDeadline(null);
+                }
+                demLawSituationExportVO.setPunishmentAuthority(list1.get(i).getPunishmentAuthority());
+                demLawSituationExportVO.setDocumentType(list1.get(i).getDocumentType());
+                demLawSituationExportVO.setDocumentNumber(list1.get(i).getDocumentNumber());
+
+                list.add(demLawSituationExportVO);
+            }
+        }
+
+        return list;
+    }
+
     @Override
     public void updateLawSituation(DemLawSituation demLawSituation) {
         this.updateById(demLawSituation);

+ 143 - 0
service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/DemAtlInspectDeclareExportVO.java

@@ -0,0 +1,143 @@
+package com.usky.fire.service.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.core.annotation.Excel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-02-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+
+public class DemAtlInspectDeclareExportVO {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 项目编号
+     */
+    @Excel(name = "项目编号")
+    private String projectCode;
+
+    /**
+     * 申请单位名称
+     */
+    @Excel(name = "申请单位名称")
+    private String declareCompanyName;
+
+    /**
+     * 申报人
+     */
+    @Excel(name = "申报人")
+    private String declarePerson;
+
+    /**
+     * 填表日期
+     */
+    @Excel(name = "填表日期")
+    private String fillTime;
+
+    /**
+     * 场所名称
+     */
+    @Excel(name = "场所名称")
+    private String siteName;
+
+    /**
+     * 法定代表人
+     */
+    @Excel(name = "法定代表人")
+    private String legalRepresentative;
+
+    /**
+     * 场所建筑面积
+     */
+    @Excel(name = "场所建筑面积")
+    private String siteArea;
+
+    /**
+     * 联系人
+     */
+    @Excel(name = "联系人")
+    private String linkPerson;
+
+    /**
+     * 联系电话
+     */
+    @Excel(name = "联系电话")
+    private String linkPhone;
+
+    /**
+     * 场所性质
+     */
+    @Excel(name = "场所性质")
+    private String siteNature;
+
+    /**
+     * 建筑结构
+     */
+    @Excel(name = "建筑结构")
+    private String buildNature;
+
+    /**
+     * 场所地址
+     */
+    @Excel(name = "场所地址")
+    private String siteAddress;
+
+    /**
+     * 使用性质
+     */
+    @Excel(name = "使用性质")
+    private String useNature;
+
+    /**
+     * 消防安全责任人
+     */
+    @Excel(name = "消防安全责任人")
+    private String safetyPerson;
+
+    /**
+     * 现有消防设施
+     */
+    @Excel(name = "现有消防设施")
+    private String fireFacilities;
+
+    /**
+     * 受理时间
+     */
+    @Excel(name = "受理时间")
+    private String acceptTime;
+
+    /**
+     * 受理状态
+     */
+    @Excel(name = "受理状态")
+    private String acceptStatus;
+
+    /**
+     * 受理人
+     */
+    @Excel(name = "受理人")
+    private String acceptName;
+}
+

+ 119 - 0
service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/DemLawSituationExportVO.java

@@ -0,0 +1,119 @@
+package com.usky.fire.service.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.core.annotation.Excel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-02-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+
+public class DemLawSituationExportVO {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 被处罚人
+     */
+    @Excel(name = "被处罚人")
+    private String punishedPerson;
+
+    /**
+     * 性质相对类别
+     */
+    @Excel(name = "性质相对类别")
+    private String counterpartType;
+
+    /**
+     * 法人代表
+     */
+    @Excel(name = "法人代表")
+    private String legalRepresentative;
+
+    /**
+     * 行政处罚决定书文号
+     */
+    @Excel(name = "行政处罚决定书文号")
+    private String punishmentDecisionNumber;
+
+    /**
+     * 处罚依据
+     */
+    @Excel(name = "处罚依据")
+    private String punishmentBasis;
+
+    /**
+     * 处罚类别
+     */
+    @Excel(name = "处罚类别")
+    private String punishmentType;
+
+    /**
+     * 处罚内容
+     */
+    @Excel(name = "处罚内容")
+    private String punishmentContent;
+
+    /**
+     * 罚款金额
+     */
+    @Excel(name = "罚款金额")
+    private String penaltyAmount;
+
+    /**
+     * 处罚决定日期
+     */
+    @Excel(name = "处罚决定日期")
+    private String punishmentDecisionTime;
+
+    /**
+     * 处罚有效期
+     */
+    @Excel(name = "处罚有效期")
+    private String punishmentValidityDate;
+
+    /**
+     * 公示截止期
+     */
+    @Excel(name = "公示截止期")
+    private String publicityDeadline;
+
+    /**
+     * 处罚机关
+     */
+    @Excel(name = "处罚机关")
+    private String punishmentAuthority;
+
+    /**
+     * 证件类型
+     */
+    @Excel(name = "证件类型")
+    private String documentType;
+
+    /**
+     * 证件号码
+     */
+    @Excel(name = "证件号码")
+    private String documentNumber;
+}