修复部分bug
This commit is contained in:
parent
07942c6d90
commit
7c209da2e2
|
|
@ -23,10 +23,11 @@
|
|||
<artifactId>spring-boot-starter-web</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- SpringDoc webmvc -->
|
||||
<!-- Knife4j Spring Boot Starter -->
|
||||
<dependency>
|
||||
<groupId>org.springdoc</groupId>
|
||||
<artifactId>springdoc-openapi-ui</artifactId>
|
||||
<groupId>com.github.xiaoymin</groupId>
|
||||
<artifactId>knife4j-openapi3-spring-boot-starter</artifactId>
|
||||
<version>4.4.0</version>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
|
|
|||
|
|
@ -76,11 +76,11 @@
|
|||
<artifactId>ruoyi-common-redis</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- Springdoc -->
|
||||
<!-- Knife4j Gateway -->
|
||||
<dependency>
|
||||
<groupId>org.springdoc</groupId>
|
||||
<artifactId>springdoc-openapi-webflux-ui</artifactId>
|
||||
<version>${springdoc.version}</version>
|
||||
<groupId>com.github.xiaoymin</groupId>
|
||||
<artifactId>knife4j-gateway-spring-boot-starter</artifactId>
|
||||
<version>4.4.0</version>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,74 @@
|
|||
# 网关配置
|
||||
spring:
|
||||
cloud:
|
||||
gateway:
|
||||
# 全局跨域配置
|
||||
globalcors:
|
||||
cors-configurations:
|
||||
'[/**]':
|
||||
allowedOrigins: "*"
|
||||
allowedMethods: "*"
|
||||
allowedHeaders: "*"
|
||||
allowCredentials: false
|
||||
|
||||
# Knife4j 配置
|
||||
knife4j:
|
||||
gateway:
|
||||
# 是否开启网关聚合模式
|
||||
enabled: true
|
||||
# 服务发现模式
|
||||
strategy: discover
|
||||
# 发现模式配置
|
||||
discover:
|
||||
# 是否开启服务发现
|
||||
enabled: true
|
||||
# 版本号，默认v3
|
||||
version: openapi3
|
||||
# 排除的服务
|
||||
excluded-services:
|
||||
- ruoyi-gateway
|
||||
- ruoyi-auth
|
||||
- ruoyi-file
|
||||
- ruoyi-monitor
|
||||
|
||||
# SpringDoc 配置
|
||||
springdoc:
|
||||
api-docs:
|
||||
enabled: true
|
||||
swagger-ui:
|
||||
enabled: true
|
||||
path: /swagger-ui.html
|
||||
config-url: /v3/api-docs/swagger-config
|
||||
url: /v3/api-docs
|
||||
|
||||
# 安全配置
|
||||
security:
|
||||
ignore:
|
||||
whites:
|
||||
# 认证相关
|
||||
- /auth/captcha
|
||||
- /auth/login
|
||||
- /auth/logout
|
||||
- /auth/register
|
||||
# Knife4j/Swagger 文档相关 - 必须全部放行
|
||||
- /doc.html
|
||||
- /doc.html/**
|
||||
- /webjars/**
|
||||
- /swagger-ui/**
|
||||
- /swagger-ui.html
|
||||
- /swagger-ui.html/**
|
||||
- /swagger-resources/**
|
||||
- /swagger-resources
|
||||
- /v3/api-docs/**
|
||||
- /v3/api-docs
|
||||
- /*/v3/api-docs/**
|
||||
- /*/v3/api-docs
|
||||
- /api-docs/**
|
||||
- /api-docs
|
||||
- /*/api-docs/**
|
||||
- /*/api-docs
|
||||
# 其他
|
||||
- /favicon.ico
|
||||
- /actuator/**
|
||||
- /health
|
||||
- /error
|
||||
|
|
@ -224,11 +224,29 @@
|
|||
ap.status as access_permit_status,
|
||||
'' as property_review_status
|
||||
from work_plan wp
|
||||
left join work_ticket wt on wt.project_id = wp.project_id
|
||||
left join access_permit ap on ap.project_id = wp.project_id
|
||||
left join (
|
||||
select project_id, status, ticket_type, reviewer,
|
||||
row_number() over (partition by project_id order by create_time desc) as rn
|
||||
from work_ticket
|
||||
where del_flag = '0'
|
||||
) wt on wt.project_id = wp.project_id and wt.rn = 1
|
||||
left join (
|
||||
select project_id, permit_number, validity_start_time, validity_end_time, status,
|
||||
row_number() over (partition by project_id order by create_time desc) as rn
|
||||
from access_permit
|
||||
where del_flag = '0'
|
||||
) ap on ap.project_id = wp.project_id and ap.rn = 1
|
||||
where wp.del_flag = '0'
|
||||
<if test="keyword != null and keyword != ''">
|
||||
and (wp.project_name like concat('%', #{keyword}, '%')
|
||||
or wp.project_code like concat('%', #{keyword}, '%')
|
||||
or wp.supervisor_name like concat('%', #{keyword}, '%'))
|
||||
</if>
|
||||
<if test="projectName != null and projectName != ''">
|
||||
and (wp.project_name like concat('%', #{projectName}, '%') or wp.project_code like concat('%', #{projectName}, '%'))
|
||||
and wp.project_name like concat('%', #{projectName}, '%')
|
||||
</if>
|
||||
<if test="projectCode != null and projectCode != ''">
|
||||
and wp.project_code like concat('%', #{projectCode}, '%')
|
||||
</if>
|
||||
<if test="constructionUnitName != null and constructionUnitName != ''">
|
||||
and wp.construction_unit_name like concat('%', #{constructionUnitName}, '%')
|
||||
|
|
@ -242,6 +260,15 @@
|
|||
<if test="projectStatus != null and projectStatus != ''">
|
||||
and wp.project_status = #{projectStatus}
|
||||
</if>
|
||||
<if test="approvalStatus != null and approvalStatus != ''">
|
||||
and wp.approval_status = #{approvalStatus}
|
||||
</if>
|
||||
<if test="startTime != null and startTime != ''">
|
||||
and date(wp.create_time) >= date(#{startTime})
|
||||
</if>
|
||||
<if test="endTime != null and endTime != ''">
|
||||
and date(wp.create_time) <= date(#{endTime})
|
||||
</if>
|
||||
order by wp.create_time desc
|
||||
</select>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue