From c864fec5f798a1aabcde877469886dd0dc90d092 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 02 Jan 2023 13:54:18 +0800
Subject: [PATCH] 申请表getAll接口可以根据通行证状态查询
---
src/main/java/org/springblade/modules/application/mapper/ApplicationMapper.xml | 4 ++++
src/main/java/org/springblade/modules/application/vo/ApplicationVO.java | 5 +++++
src/main/resources/application-dev.yml | 2 +-
src/main/java/org/springblade/modules/pass/entity/PassEntity.java | 5 -----
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/application/mapper/ApplicationMapper.xml b/src/main/java/org/springblade/modules/application/mapper/ApplicationMapper.xml
index f0cfe6a..b2f662e 100644
--- a/src/main/java/org/springblade/modules/application/mapper/ApplicationMapper.xml
+++ b/src/main/java/org/springblade/modules/application/mapper/ApplicationMapper.xml
@@ -60,6 +60,7 @@
FROM sys_application app
LEFT JOIN sys_application_basic_info basic ON basic.application_id = app.id
LEFT JOIN sys_application_car car ON car.application_id = app.id AND car.status = 1
+ LEFT JOIN sys_pass pass ON pass.no = app.no AND pass.is_deleted = 0
WHERE app.is_deleted = 0
<if test="application.userId !=null and application.userId !=''">
AND app.user_id = #{application.userId}
@@ -67,6 +68,9 @@
<if test="application.status !=null and application.status !=''">
AND app.status = #{application.status}
</if>
+ <if test="application.passStatus != null and application.passStatus !=''">
+ AND pass.status = #{application.passStatus}
+ </if>
</select>
diff --git a/src/main/java/org/springblade/modules/application/vo/ApplicationVO.java b/src/main/java/org/springblade/modules/application/vo/ApplicationVO.java
index 4ee5185..cad4056 100644
--- a/src/main/java/org/springblade/modules/application/vo/ApplicationVO.java
+++ b/src/main/java/org/springblade/modules/application/vo/ApplicationVO.java
@@ -78,4 +78,9 @@
* 通行结束时间
*/
private String endPassTime;
+
+ /**
+ * 通行证状态
+ */
+ private String passStatus;
}
diff --git a/src/main/java/org/springblade/modules/pass/entity/PassEntity.java b/src/main/java/org/springblade/modules/pass/entity/PassEntity.java
index 192247a..16144c5 100644
--- a/src/main/java/org/springblade/modules/pass/entity/PassEntity.java
+++ b/src/main/java/org/springblade/modules/pass/entity/PassEntity.java
@@ -37,11 +37,6 @@
public class PassEntity extends TenantEntity {
/**
- * 名字
- */
- @ApiModelProperty(value = "名字")
- private String name;
- /**
* 编号
*/
@ApiModelProperty(value = "编号")
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index cc3f40b..fc46f14 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -13,7 +13,7 @@
# commandTimeout: 5000
datasource:
# MySql
- url: jdbc:mysql://192.168.0.116:3306/approval-system?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+ url: jdbc:mysql://localhost:3306/approval-system?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
username: root
password: 123456
# PostgreSQL
--
Gitblit v1.9.3