cq_anquan
/
safety-eval-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug

dev-tmp1
zhanglei 2026-08-14 15:52:49 +08:00
parent b5799d8cdb
commit 5c759f12ed
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/request/QualOnSiteReviewMonitorPageQry.java
View File

@ -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;
}

4
safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/request/QualOnSiteReviewOrgPageQry.java
View File

@ -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;
}

10
safety-eval-infrastructure/src/main/resources/mapper/QualOnSiteReviewMapper.xml
View File

@ -67,6 +67,9 @@
<if test="query.unitName != null and query.unitName != ''">
and info.unit_name like concat('%', #{query.unitName}, '%')
</if>
<if test="query.keyword != null and query.keyword != ''">
and review.id = #{query.keyword}
</if>
<if test="query.status != null">
and review.status = #{query.status}
</if>
@ -74,7 +77,7 @@
and review.review_date_start &gt;= #{query.reviewDateStartBegin}
</if>
<if test="query.reviewDateStartEnd != null">
and review.review_date_start &lt;= #{query.reviewDateStartEnd}
and review.review_date_start &lt;= DATE_ADD(#{query.reviewDateStartEnd}, INTERVAL 1 DAY)
</if>
order by review.id desc
</select>
@ -95,6 +98,9 @@
from qual_on_site_review review
where review.delete_enum = 'false'
and review.org_id = #{query.orgId}
<if test="query.keyword != null and query.keyword != ''">
and review.id = #{query.keyword}
</if>
<if test="query.status != null">
and review.status = #{query.status}
</if>
@ -102,7 +108,7 @@
and review.review_date_start &gt;= #{query.reviewDateStartBegin}
</if>
<if test="query.reviewDateStartEnd != null">
and review.review_date_start &lt;= #{query.reviewDateStartEnd}
and review.review_date_start &lt;= DATE_ADD(#{query.reviewDateStartEnd}, INTERVAL 1 DAY)
</if>
order by review.id desc
</select>