diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/request/QualOnSiteReviewMonitorPageQry.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/request/QualOnSiteReviewMonitorPageQry.java
index 2b566ac4..7ad36ae0 100644
--- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/request/QualOnSiteReviewMonitorPageQry.java
+++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/request/QualOnSiteReviewMonitorPageQry.java
@@ -7,7 +7,6 @@ import org.qinan.safetyeval.client.dto.BasePageQuery;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDate;
-import java.time.LocalDateTime;
/**
* 资质现场核查监管端分页查询Qry
@@ -46,4 +45,7 @@ public class QualOnSiteReviewMonitorPageQry extends BasePageQuery {
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate reviewDateStartEnd;
+ @ApiModelProperty(value = "关键字")
+ private String keyword;
+
}
diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/request/QualOnSiteReviewOrgPageQry.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/request/QualOnSiteReviewOrgPageQry.java
index 352d5592..84db44ee 100644
--- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/request/QualOnSiteReviewOrgPageQry.java
+++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/request/QualOnSiteReviewOrgPageQry.java
@@ -8,7 +8,6 @@ import org.qinan.safetyeval.client.dto.BasePageQuery;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDate;
-import java.time.LocalDateTime;
/**
* 资质现场核查机构端分页查询Qry
@@ -48,4 +47,7 @@ public class QualOnSiteReviewOrgPageQry extends BasePageQuery {
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate reviewDateStartEnd;
+ @ApiModelProperty(value = "关键字")
+ private String keyword;
+
}
diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualOnSiteReviewMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualOnSiteReviewMapper.xml
index 649a8df7..2f14e1ac 100644
--- a/safety-eval-infrastructure/src/main/resources/mapper/QualOnSiteReviewMapper.xml
+++ b/safety-eval-infrastructure/src/main/resources/mapper/QualOnSiteReviewMapper.xml
@@ -67,6 +67,9 @@
and info.unit_name like concat('%', #{query.unitName}, '%')
+
+ and review.id = #{query.keyword}
+
and review.status = #{query.status}
@@ -74,7 +77,7 @@
and review.review_date_start >= #{query.reviewDateStartBegin}
- and review.review_date_start <= #{query.reviewDateStartEnd}
+ and review.review_date_start <= DATE_ADD(#{query.reviewDateStartEnd}, INTERVAL 1 DAY)
order by review.id desc
@@ -95,6 +98,9 @@
from qual_on_site_review review
where review.delete_enum = 'false'
and review.org_id = #{query.orgId}
+
+ and review.id = #{query.keyword}
+
and review.status = #{query.status}
@@ -102,7 +108,7 @@
and review.review_date_start >= #{query.reviewDateStartBegin}
- and review.review_date_start <= #{query.reviewDateStartEnd}
+ and review.review_date_start <= DATE_ADD(#{query.reviewDateStartEnd}, INTERVAL 1 DAY)
order by review.id desc