监督端-报表导出修改

17 hours ago · 153d26c1c8
10 changed files with 19 additions and 84 deletions
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardCheckRegisterZfajdetailsAreaVo.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardCheckRegisterZfajdetailsAreaVo.java
@ -31,7 +31,6 @@ public class DashboardCheckRegisterZfajdetailsAreaVo implements Serializable {
    /**
     * 主键ID
     */
-    @ExcelProperty(value = "主键ID")
    private String id;

    /**
@ -49,19 +48,16 @@ public class DashboardCheckRegisterZfajdetailsAreaVo implements Serializable {
    /**
     * 地市编码
     */
-    @ExcelProperty(value = "地市编码")
    private String cityCode;

    /**
     * 地市名称
     */
-    @ExcelProperty(value = "地市名称")
    private String cityName;

    /**
     * 区县编码
     */
-    @ExcelProperty(value = "区县编码")
    private String areaCode;

    /**
@ -73,7 +69,6 @@ public class DashboardCheckRegisterZfajdetailsAreaVo implements Serializable {
    /**
     * 级别：1-市 2-区 3-街道
     */
-    @ExcelProperty(value = "级别：1-市 2-区 3-街道")
    private Long level;

    /**
@ -103,31 +98,26 @@ public class DashboardCheckRegisterZfajdetailsAreaVo implements Serializable {
    /**
     * 是否高频检查：0-否 1-是
     */
-    @ExcelProperty(value = "是否高频检查：0-否 1-是")
    private String isHighFreq;

    /**
     * 逻辑删除：0-否 1-是
     */
-    @ExcelProperty(value = "逻辑删除：0-否 1-是")
    private String isDelete;

    /**
     * 局级部门ID
     */
-    @ExcelProperty(value = "局级部门ID")
    private String bureauDeptId;

    /**
     * 部门ID
     */
-    @ExcelProperty(value = "部门ID")
    private String deptId;

    /**
     * 组织单位ID
     */
-    @ExcelProperty(value = "组织单位ID")
    private String organId;


--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardCheckRegisterZfajdetailsDomainVo.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardCheckRegisterZfajdetailsDomainVo.java
@ -31,7 +31,6 @@ public class DashboardCheckRegisterZfajdetailsDomainVo implements Serializable {
    /**
     * 主键ID
     */
-    @ExcelProperty(value = "主键ID")
    private String id;

    /**
@ -61,19 +60,16 @@ public class DashboardCheckRegisterZfajdetailsDomainVo implements Serializable {
    /**
     * 执法单位ID
     */
-    @ExcelProperty(value = "执法单位ID")
    private String zfdwid;

    /**
     * 执法单位名称
     */
-    @ExcelProperty(value = "执法单位名称")
    private String zfdwmc;

    /**
     * 级别：1-市 2-区 3-街道
     */
-    @ExcelProperty(value = "级别：1-市 2-区 3-街道")
    private Long level;

    /**
@ -103,25 +99,21 @@ public class DashboardCheckRegisterZfajdetailsDomainVo implements Serializable {
    /**
     * 逻辑删除：0-否 1-是
     */
-    @ExcelProperty(value = "逻辑删除：0-否 1-是")
    private String isDelete;

    /**
     * 局级部门ID
     */
-    @ExcelProperty(value = "局级部门ID")
    private String bureauDeptId;

    /**
     * 部门ID
     */
-    @ExcelProperty(value = "部门ID")
    private String deptId;

    /**
     * 组织单位ID
     */
-    @ExcelProperty(value = "组织单位ID")
    private String organId;


--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardHighCheckEntdetailsAreaVo.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardHighCheckEntdetailsAreaVo.java
@ -47,13 +47,13 @@ public class DashboardHighCheckEntdetailsAreaVo implements Serializable {
    /**
     * 区
     */
-    @ExcelProperty(value = "区")
+    @ExcelProperty(value = "所属区")
    private String district;

    /**
     * 街道
     */
-    @ExcelProperty(value = "街道")
+    @ExcelProperty(value = "所属街道")
    private String street;


--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardHighCheckEntdetailsDomainVo.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardHighCheckEntdetailsDomainVo.java
@ -31,61 +31,51 @@ public class DashboardHighCheckEntdetailsDomainVo implements Serializable {
    /**
     * 主键ID
     */
-    @ExcelProperty(value = "主键ID")
    private String id;

    /**
     * 年份
     */
-    @ExcelProperty(value = "年份")
    private Long year;

    /**
     * 月份 1-12
     */
-    @ExcelProperty(value = "月份 1-12")
    private Long month;

    /**
     * 地市编码
     */
-    @ExcelProperty(value = "地市编码")
    private String cityCode;

    /**
     * 地市名称
     */
-    @ExcelProperty(value = "地市名称")
    private String cityName;

    /**
     * 区县编码
     */
-    @ExcelProperty(value = "区县编码")
    private String areaCode;

    /**
     * 区县名称
     */
-    @ExcelProperty(value = "区县名称")
    private String areaName;

    /**
     * 单位ID
     */
-    @ExcelProperty(value = "单位ID")
    private String bureauDeptId;

    /**
     * 单位名称
     */
-    @ExcelProperty(value = "单位名称")
    private String bureauDeptName;

    /**
     * 级别：1-市 2-区 3-街道
     */
-    @ExcelProperty(value = "级别：1-市 2-区 3-街道")
    private Long level;

    /**
@ -103,7 +93,6 @@ public class DashboardHighCheckEntdetailsDomainVo implements Serializable {
    /**
     * 领域ID
     */
-    @ExcelProperty(value = "领域ID")
    private String domainId;

    /**
@ -115,7 +104,7 @@ public class DashboardHighCheckEntdetailsDomainVo implements Serializable {
    /**
     * 检查次数
     */
-    @ExcelProperty(value = "检查次数")
+    @ExcelProperty(value = "行政执法次数")
    private Long jccs;

    /**
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardSituationAreaVo.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardSituationAreaVo.java
@ -1,5 +1,6 @@
 package com.zdxt.enforcementcode.domain.vo;

+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
 import com.zdxt.enforcementcode.common.commonenum.ComprehensiveEvaluationEnum;
 import lombok.Data;
@ -13,6 +14,7 @@ import java.io.Serializable;
 * @date 2026-05-28
 */
@Data
+@ExcelIgnoreUnannotated
 public class DashboardSituationAreaVo implements Serializable {

    /**
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardSituationDomainVo.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardSituationDomainVo.java
@ -22,13 +22,11 @@ public class DashboardSituationDomainVo implements Serializable {
    /**
     * 主键ID
     */
-    @NotBlank(message = "主键ID不能为空", groups = { EditGroup.class })
    private String id;

    /**
     * 年份
     */
-    @NotNull(message = "年份不能为空", groups = { AddGroup.class, EditGroup.class })
    private Long year;

    /**
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardTrendStatAreaVo.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardTrendStatAreaVo.java
@ -32,159 +32,137 @@ public class DashboardTrendStatAreaVo implements Serializable {
    /**
     * 主键ID
     */
-    @ExcelProperty(value = "主键ID")
    private Long id;

    /**
     * 年份
     */
-    @ExcelProperty(value = "年份")
    private Long year;

    /**
     * 季度：1-一季度 2-二季度 3-三季度 4-四季度
     */
-    @ExcelProperty(value = "季度：1-一季度 2-二季度 3-三季度 4-四季度")
    private Long quarter;

    /**
     * 区编码
     */
-    @ExcelProperty(value = "区编码")
    private String districtCode;

    /**
     * 区名称
     */
-    @ExcelProperty(value = "区名称")
+    @ExcelProperty(value = "所属区")
    private String districtName;

    /**
     * 一季度
     */
-    @ExcelProperty(value = "一季度")
    private Long firstquarter;
    /**
     * 一季度时间
     */
    @TableField(value = "firstTime")
-    @ExcelProperty(value = "一季度时间")
    private String firstTime;

    /**
     * 二季度
     */
-    @ExcelProperty(value = "二季度")
    private Long secondquarter;

    /**
     * 二季度时间
     */
    @TableField(value = "secondTime")
-    @ExcelProperty(value = "二季度时间")
    private String secondTime;
    /**
     * 三季度
     */
-    @ExcelProperty(value = "三季度")
    private Long thirdquarter;

    /**
     * 三季度时间
     */
    @TableField(value = "thirdTime")
-    @ExcelProperty(value = "三季度时间")
    private String thirdTime;

    /**
     * 四季度
     */
-    @ExcelProperty(value = "四季度")
    private Long fourthquarter;

    /**
     * 四季度时间
     */
    @TableField(value = "fourthTime")
-    @ExcelProperty(value = "四季度时间")
    private String fourthTime;


    /**
     * 检查次数
     */
-    @ExcelProperty(value = "检查次数")
+    @ExcelProperty(value = "行政执法次数")
    private Long jccs;

    /**
     * 评级A+数量
     */
-    @ExcelProperty(value = "评级A+数量")
    private Long djAPlus;

    /**
     * 评级A数量
     */
-    @ExcelProperty(value = "评级A数量")
    private Long djA;

    /**
     * 评级B数量
     */
-    @ExcelProperty(value = "评级B数量")
    private Long djB;

    /**
     * 评级C数量
     */
-    @ExcelProperty(value = "评级C数量")
    private Long djC;

    /**
     * 评级D数量
     */
-    @ExcelProperty(value = "评级D数量")
    private Long djD;

    /**
     * 评级E数量
     */
-    @ExcelProperty(value = "评级E数量")
    private Long djE;

    /**
     * 违规次数
     */
-    @ExcelProperty(value = "违规次数")
    private Long wgcs;

    /**
     * 逻辑删除：0-否 1-是
     */
-    @ExcelProperty(value = "逻辑删除：0-否 1-是")
    private String isDelete;

    /**
     * 局级部门ID
     */
-    @ExcelProperty(value = "局级部门ID")
    private String bureauDeptId;

    /**
     * 部门ID
     */
-    @ExcelProperty(value = "部门ID")
    private String deptId;

    /**
     * 组织单位ID
     */
-    @ExcelProperty(value = "组织单位ID")
    private String organId;

    /**
     * 季度查询
     */
+    @ExcelProperty(value = "年+季度")
    private String quarterTime;

 }
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardTrendStatDomainVo.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardTrendStatDomainVo.java
@ -31,90 +31,80 @@ public class DashboardTrendStatDomainVo implements Serializable {
    /**
     * 主键ID
     */
-    @ExcelProperty(value = "主键ID")
    private Long id;

    /**
     * 年份
     */
-    @ExcelProperty(value = "年份")
    private Long year;

    /**
     * 季度：1-一季度 2-二季度 3-三季度 4-四季度
     */
-    @ExcelProperty(value = "季度：1-一季度 2-二季度 3-三季度 4-四季度")
    private Long quarter;

    /**
     * 领域ID
     */
-    @ExcelProperty(value = "领域ID")
    private String domainId;

    /**
     * 领域名称
     */
-    @ExcelProperty(value = "领域名称")
+    @ExcelProperty(value = "所属领域")
    private String domainName;

    /**
     * 一季度
     */
-    @ExcelProperty(value = "一季度")
    private Long firstquarter;

    /**
     * 二季度
     */
-    @ExcelProperty(value = "二季度")
    private Long secondquarter;

    /**
     * 三季度
     */
-    @ExcelProperty(value = "三季度")
    private Long thirdquarter;

    /**
     * 四季度
     */
-    @ExcelProperty(value = "四季度")
    private Long fourthquarter;

    /**
     * 检查次数
     */
-    @ExcelProperty(value = "检查次数")
+    @ExcelProperty(value = "行政执法次数")
    private Long jccs;

    /**
     * 逻辑删除：0-否 1-是
     */
-    @ExcelProperty(value = "逻辑删除：0-否 1-是")
+
    private String isDelete;

    /**
     * 局级部门ID
     */
-    @ExcelProperty(value = "局级部门ID")
    private String bureauDeptId;

    /**
     * 部门ID
     */
-    @ExcelProperty(value = "部门ID")
    private String deptId;

    /**
     * 组织单位ID
     */
-    @ExcelProperty(value = "组织单位ID")
    private String organId;


    /**
     * 季度时间
     */
+    @ExcelProperty(value = "年+季度")
    private String quarterTime;
 }
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/ScanDataSituationVo.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/ScanDataSituationVo.java
@ -12,49 +12,45 @@ public class ScanDataSituationVo {
    /**
     * 区编码
     */
-    @ExcelProperty(value = "区编码")
    private String districtCode;

    /**
     * 区名称
     */
-    @ExcelProperty(value = "区名称")
+    @ExcelProperty(value = "所属区")
    private String districtName;

    /**
     * 领域id
     */
-    @ExcelProperty(value = "领域id")
    private String domainId;

    /**
     * 领域名称
     */
-    @ExcelProperty(value = "领域名称")
+    @ExcelProperty(value = "所属领域")
    private String domainName;

    /**
     * 街道编码
     */
-    @ExcelProperty(value = "街道编码")
    private String streetCode;

    /**
     * 街道名称
     */
-    @ExcelProperty(value = "街道名称")
    private String streetName;

    /**
     * 商户主体数量
     */
-    @ExcelProperty(value = "商户主体数量")
+    @ExcelProperty(value = "商户主体数量(户)")
    private Long enterpriseCount;

    /**
     * 行政执法数量
     */
-    @ExcelProperty(value = "行政执法数量")
+    @ExcelProperty(value = "行政执法数量(条)")
    private Long xzzfCount;

    /**
@ -66,7 +62,7 @@ public class ScanDataSituationVo {
    /**
     * 行政执法数量占比
     */
-    @ExcelProperty(value = "行政执法数量占比")
+    @ExcelProperty(value = "行政执法数量占比(%)")
    private Double xzzfslzb;

    /**
@ -84,13 +80,12 @@ public class ScanDataSituationVo {
    /**
     * 非行政执法数量占比
     */
-    @ExcelProperty(value = "非行政执法数量占比")
+    @ExcelProperty(value = "非行政执法数量占比(%)")
    private Double fxzzfslzb;

    /**
     * 执法总数
     */
-    @ExcelProperty(value = "执法总数")
    private Long totalCount;

 }
--- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardEnterpriseCheckMapper.xml
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardEnterpriseCheckMapper.xml
@ -49,6 +49,7 @@
    <select id="selectEnterpriseCheckList" resultType="com.zdxt.enforcementcode.domain.vo.report.DashboardEnterpriseCheckListVo">
        SELECT
            t1.enterprise_id,
+            t1.enterprise_number,
            t1.enterprise_name,
            t1.district AS districtName,
            t1.street AS streetName,