历史执法信息优化

zdxt-common/zdxt-common-doc/pom.xml

@@ -30,10 +30,6 @@
             <groupId>org.springdoc</groupId>
             <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>com.github.therapi</groupId>

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntEnforcementRegistrationController.java

@@ -49,7 +49,7 @@ public class AppEntEnforcementRegistrationController extends BaseController {
      * 企业端-执法登记列表（历史执法信息）
      */
     @GetMapping("/queryEnforcementRegistrationPageList")
-    public TableDataInfo<EnforcementRegistrationListVo> queryEnforcementRegistrationPageList(EnforcementRegistrationQueryBo bo, PageQuery pageQuery) {
+    public TableDataInfo<EnforcementRegistrationListVo> queryEnforcementRegistrationPageList( EnforcementRegistrationQueryBo bo, PageQuery pageQuery) {
         return enforcementRegistrationService.queryEnforcementRegistrationPageList(bo, pageQuery);
     }
 

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnforcementRegistrationController.java

@@ -37,7 +37,7 @@ public class EnforcementRegistrationController extends BaseController {
     private final IEnforcementRegistrationService enforcementRegistrationService;
 
     /**
-     * 查询企业端-执法登记记录列表
+     * 监督端-执法登记记录列表
      */
     @SaCheckPermission("enforcementcode:registration:list")
     @GetMapping("/list")

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationQueryBo.java

@@ -1,6 +1,11 @@
 package com.zdxt.enforcementcode.domain.bo;
 
-public class EnforcementRegistrationQueryBo {
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class EnforcementRegistrationQueryBo implements Serializable {
     /**
      * 执法部门
      */
@@ -52,4 +57,24 @@ public class EnforcementRegistrationQueryBo {
      */
     private String searchText;
 
+    /**
+     * 关键字查询 0|未评价，1已评价
+     */
+    private Integer hasEvaluate;
+
+    /**
+     * 企业名称
+     */
+    private String enterpriseName;
+
+    /**
+     * 企业ID
+     */
+    private String enterpriseId;
+
+    /**
+     * 统一社会信用代码
+     */
+    private String enterpriseNumber;
+
 }

zdxt-web-server/zdxt-admin-web-server/src/main/resources/application.yml

@@ -223,17 +223,45 @@ api-decrypt:
 
 springdoc:
   api-docs:
+    # 是否开启接口文档
     enabled: true
-    path: /v3/api-docs
-  swagger-ui:
-    enabled: true
-    path: /swagger-ui
-  default-flat-param-object: true # 参见 https://doc.xiaominfo.com/docs/faq/v4/knife4j-parameterobject-flat-param 文档
+  components:
+    securitySchemes:
+      Authorization:
+        type: apiKey
+        in: header
+        name: Authorization
+        description: "Bearer Token，格式: Bearer {token}"
+      clientid:
+        type: apiKey
+        in: header
+        name: clientid
+        description: "客户端ID"
+  info:
+    # 标题
+    title: '标题：zdxt-Vue-Plus多租户管理系统_接口文档'
+    # 描述
+    description: '描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...'
+    # 版本
+    version: '版本号: ${project.version}'
+    # 作者信息
+    contact:
+      name: Lion Li
+      email: crazylionli@163.com
+      url: https://gitee.com/dromara/zdxt-Vue-Plus
+  #这里定义了两个分组，可定义多个，也可以不定义
+  group-configs:
+    - group: 1、执法监督码
+      packages-to-scan: com.zdxt.enforcementcode
+#    - group: 2.通用模块
+#      packages-to-scan: org.dromara.web
+    - group: 3.系统模块
+      packages-to-scan: org.dromara.system
+#    - group: 4.代码生成模块
+#      packages-to-scan: org.dromara.generator
+#    - group: 5.工作流模块
+#      packages-to-scan: org.dromara.workflow
 
-knife4j:
-  enable: true
-  setting:
-    language: zh_cn
 # 防止XSS攻击
 xss:
   # 过滤开关