From b0ce501a27cd60e7244bc83386939905c8ae4831 Mon Sep 17 00:00:00 2001 From: ganhao Date: Tue, 28 Apr 2026 15:33:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=86UI=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 + .../dto/EnforcementRegistrationQueryDTO.java | 48 +++++++ .../vo/EnforcementRegistrationListVo.java | 121 ++++++++++++++++++ zdxt-common/zdxt-common-doc/pom.xml | 5 + .../src/main/resources/application.yml | 5 + 5 files changed, 185 insertions(+) create mode 100644 ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/dto/EnforcementRegistrationQueryDTO.java create mode 100644 ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementRegistrationListVo.java diff --git a/pom.xml b/pom.xml index 7b9dbe2e..77710bbd 100644 --- a/pom.xml +++ b/pom.xml @@ -146,6 +146,12 @@ ${springdoc.version} + + org.springdoc + springdoc-openapi-starter-webmvc-ui + ${springdoc.version} + + com.github.therapi therapi-runtime-javadoc diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/dto/EnforcementRegistrationQueryDTO.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/dto/EnforcementRegistrationQueryDTO.java new file mode 100644 index 00000000..24ae9a7e --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/dto/EnforcementRegistrationQueryDTO.java @@ -0,0 +1,48 @@ +package com.zdxt.enforcementcode.domain.dto; + + +import cn.idev.excel.annotation.ExcelProperty; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; + +import java.util.Date; + +/** + * 企业端-查询企业执法登记列表 + * + * @author Lion Li + * @date 2026-04-17 + */ +@Data +public class EnforcementRegistrationQueryDTO { + + /** + * 执法部门 + */ + private String lawEnforcement; + + + /** + * 执法事项 + */ + private String lawEnforcementItem; + + /** + * 是否真联合执法(0:未联合; 1:已经联合) + */ + private Long isRealUnion; + + /** + * 日期类型筛选: 1=本月, 2=本季, 3=本年 + */ + private Integer dateType; + + /** + * 指定月份筛选, 格式: "YYYY-MM" + */ + private String dateSearch; + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementRegistrationListVo.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementRegistrationListVo.java new file mode 100644 index 00000000..11a595ca --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementRegistrationListVo.java @@ -0,0 +1,121 @@ +package com.zdxt.enforcementcode.domain.vo; + +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import com.zdxt.enforcementcode.domain.EnforcementRegistration; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; +import java.util.List; + + +/** + * 企业端-执法登记记录视图对象 enforcement_registration + * + * @author Lion Li + * @date 2026-04-17 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = EnforcementRegistration.class) +public class EnforcementRegistrationListVo implements Serializable { + + + /** + * 主键ID + */ + private String id; + + /** + * 执法部门 + */ + private String lawEnforcement; + + /** + * 执法部门ID + */ + private String lawEnforcementId; + + /** + * 被执法企业ID + */ + private String enterpriseId; + + /** + * 被执法企业 + */ + private String enterpriseName; + + /** + * 被执法企业税号 + */ + private String enterpriseNumber; + + /** + * 执法时间 + */ + private Date enforcementTime; + + /** + * 执法人员姓名 + */ + private String lawEnforcer; + + /** + * 执法人员ID + */ + private String lawEnforcerId; + + /** + * 执法人员联系方式 + */ + private String lawEnforcerTel; + + /** + * 其他执法人员 + */ + private String lawEnforcerTwo; + + /** + * 其他执法人员ID + */ + private String lawEnforcerIdTwo; + + /** + * 执法人员联系方式 + */ + private String lawEnforcerTelTwo; + + /** + * 辅助人员姓名 + */ + private String subsidiaryer; + + /** + * 辅助人员id + */ + private String subsidiaryerId; + + /** + * 辅助人员联系方式 + */ + private String subsidiaryerTel; + + /** + * 执法事项 + */ + private String lawEnforcementItem; + + /** + * 执法依据 + */ + private String lawEnforcementBasis; + + + +} diff --git a/zdxt-common/zdxt-common-doc/pom.xml b/zdxt-common/zdxt-common-doc/pom.xml index a627a7ac..31eae340 100644 --- a/zdxt-common/zdxt-common-doc/pom.xml +++ b/zdxt-common/zdxt-common-doc/pom.xml @@ -26,6 +26,11 @@ springdoc-openapi-starter-webmvc-api + + org.springdoc + springdoc-openapi-starter-webmvc-ui + + com.github.therapi therapi-runtime-javadoc diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application.yml b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application.yml index 37108fdf..2d02e2f5 100644 --- a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application.yml +++ b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application.yml @@ -117,6 +117,11 @@ security: - /error - /*/api-docs - /*/api-docs/** + - /swagger-ui.html + - /swagger-ui/** + - /swagger-resources/** + - /webjars/** + - /v3/api-docs/** - /warm-flow-ui/config # enforcement-code 统计面板（静态HTML页面调用，无token） - /code/statisticalPanel/**