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

fix bug

dev
luotaiqian 2026-07-29 17:04:42 +08:00
parent d7651344a4
commit d8e181aaf0
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalProjectProgressPageQuery.java
View File

@ -12,11 +12,8 @@ import org.qinan.safetyeval.client.dto.BasePageQuery;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class EvalProjectProgressPageQuery extends BasePageQuery { public class EvalProjectProgressPageQuery extends BasePageQuery {
@ApiModelProperty("项目名称") @ApiModelProperty("关键字（项目名称/客户名称）")
private String projectName; private String keyword;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("项目进度状态：NORMAL正常 NEAR临期 DELAY延期") @ApiModelProperty("项目进度状态：NORMAL正常 NEAR临期 DELAY延期")
private String progressStatus; private String progressStatus;

8
safety-eval-infrastructure/src/main/resources/mapper/EvalProjectMapper.xml
View File

@ -26,11 +26,9 @@
AND c.delete_enum = 'false' AND c.delete_enum = 'false'
WHERE p.delete_enum = 'false' WHERE p.delete_enum = 'false'
AND p.org_id = #{query.orgId} AND p.org_id = #{query.orgId}
<if test="query.projectName != null and query.projectName != ''"> <if test="query.keyword != null and query.keyword != ''">
AND p.project_name LIKE CONCAT('%', #{query.projectName}, '%') AND (p.project_name LIKE CONCAT('%', #{query.keyword}, '%')
</if> OR c.customer_name LIKE CONCAT('%', #{query.keyword}, '%'))
<if test="query.customerName != null and query.customerName != ''">
AND c.customer_name LIKE CONCAT('%', #{query.customerName}, '%')
</if> </if>
<if test="query.progressStatus != null and query.progressStatus == 'DELAY'"> <if test="query.progressStatus != null and query.progressStatus == 'DELAY'">
AND p.plan_end_date &lt; CURDATE() AND p.plan_end_date &lt; CURDATE()