diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalProjectProgressPageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalProjectProgressPageQuery.java index f9622ab..b5520fa 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalProjectProgressPageQuery.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalProjectProgressPageQuery.java @@ -12,11 +12,8 @@ import org.qinan.safetyeval.client.dto.BasePageQuery; @EqualsAndHashCode(callSuper = true) public class EvalProjectProgressPageQuery extends BasePageQuery { - @ApiModelProperty("项目名称") - private String projectName; - - @ApiModelProperty("客户名称") - private String customerName; + @ApiModelProperty("关键字(项目名称/客户名称)") + private String keyword; @ApiModelProperty("项目进度状态:NORMAL正常 NEAR临期 DELAY延期") private String progressStatus; diff --git a/safety-eval-infrastructure/src/main/resources/mapper/EvalProjectMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/EvalProjectMapper.xml index f70448b..8952c52 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/EvalProjectMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/EvalProjectMapper.xml @@ -9,7 +9,7 @@ typeHandler="org.qinan.safetyeval.infrastructure.handler.ProjectNodeListTypeHandler"/> -